[AboutPage.qml] Revert #238 (#239)

* [AboutPage.qml] Revert #238 * [sailfishos-chum-gui.ts] Align with source code file
sailfishos-chum · Oct 18, 2023 · 434a0a2 · 434a0a2
1 parent f2fe397
commit 434a0a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -20,7 +20,6 @@ Page {
             }
 
             Image {
-                id: chumGUIicon
                 source: Qt.resolvedUrl("../../icons/sailfishos-chum-gui.svg")
                 width: Math.min(page.width, page.height) / 3
                 height: width
@@ -33,9 +32,10 @@ Page {
             // Thus halving the margin: width: parent.width - Theme.horizontalPageMargin
             // The long text of the last label emphasises this issue by using much space
             // vertically when rendered with such big horizontal margin(s).
+            // This seems to work correctly when using IDs for each element, but then the
+            // Vspace also has to be defined for each element.
 
             Label {
-                id: subTitle
                 //% "A graphical client application for the SailfishOS:Chum community repository"
                 text: qsTrId("chum-about-store")
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -45,7 +45,6 @@ Page {
             }
 
             Label {
-                id: versionInfo
                 //% "Version: %1"
                 text: qsTrId("chum-about-version").arg(Qt.application.version)
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -55,7 +54,6 @@ Page {
             }
 
             Label {
-                id: sourceCode
                 //% "Source code repository"
                 text: '<a href="https://github.com/sailfishos-chum/sailfishos-chum-gui">' + qsTrId("chum-about-home") + '</a>'
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -67,7 +65,6 @@ Page {
             }
 
             Label {
-                id: license
                 //% "License: %1"
                 text: qsTrId("chum-about-license").arg("MIT")
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -77,7 +74,6 @@ Page {
             }
 
             Label {
-                id: issueTracker
                 //% "Issue tracker for bug reports, feature suggestions and help requests"
                 text: '<a href="https://github.com/sailfishos-chum/sailfishos-chum-gui/issues">' + qsTrId("chum-about-issues") + '</a>'
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -92,10 +88,11 @@ Page {
             // two consequtive line-breaks (`<br /><br />`).
             // Reference: https://doc.qt.io/qt-5/richtext-html-subset.html#supported-tags
             // But either way is not the "proper" one for achiving some vertical space atop
-            // the text: The Qt5 Rich Text engine eliminates any such space, one should use
-            // the Qt text `anchors` attributes `top:` and `topMargin:` to achieve that.
+            // the text: One should use the Qt text `anchors` attributes `top:` and
+            // `topMargin:` to achieve that, but that requires IDs and Vspace definitions
+            // for each element: Too much hassle for now.
             Label {
-                //% "<p>"
+                //% "<p>&nbsp;<br />"
                 //% "The SailfishOS:Chum community repository provides a collection of "
                 //% "applications, tools and libraries compiled for various hardware "
                 //% "architectures and Sailfish&nbsp;OS release versions."
@@ -133,11 +130,7 @@ Page {
                 text: qsTrId("chum-about-description")
                 textFormat: Text.StyledText
                 font.pixelSize: Theme.fontSizeSmall
-                anchors {
-                    top: issueTracker.bottom
-                    topMargin: Theme.paddingLarge
-                    horizontalCenter: parent.horizontalCenter
-                }
+                anchors.horizontalCenter: parent.horizontalCenter
                 horizontalAlignment: Text.AlignHCenter
                 width: parent.width - Theme.horizontalPageMargin
                 wrapMode: Text.WordWrap

diff --git a/translations/sailfishos-chum-gui.ts b/translations/sailfishos-chum-gui.ts
@@ -537,7 +537,7 @@
     </message>
     <message id="chum-about-description">
         <location filename="../qml/pages/AboutPage.qml" line="98"/>
-        <source>&lt;p&gt;The SailfishOS:Chum community repository provides a collection of applications, tools and libraries compiled for various hardware architectures and Sailfish&amp;nbsp;OS release versions.&lt;/p&gt;&lt;p&gt;In contrast to the software distribution model of the Jolla Store or OpenRepos, to which binary packages are uploaded by developers, at SailfishOS:Chum software is compiled and packaged into RPMs in a reproducible manner directly from its source code. The source code used for compiling and packaging is submitted by developers to OBS (Open Build Service), which generates multiple RPM files for different combinations of hardware architectures and Sailfish&amp;nbsp;OS release versions.&lt;/p&gt;&lt;p&gt;This scheme ensures that the complete source code of all packages at SailfishOS:Chum is available and inspectable there, and that all packages are generated solely from this source code. Hence all software packages at SailfishOS:Chum are created in a transparent and fully traceable manner.&lt;/p&gt;&lt;p&gt;By collecting software for Sailfish&amp;nbsp;OS in a single automated build system, collaboration between developers through common packaging of shared libraries etc. is fostered, duplication of work for keeping these common packages up-to-date is eliminated, and it becomes much easier to determine which pieces of software exist and which are missing at the Sailfish&amp;nbsp;OS OBS. Additionally this eases tracing multiple and potentially layered dependencies (&amp;quot;dependency chains&amp;quot;) which is crucial for keeping the software supply chains of complex packages up-to-date.&lt;/p&gt;&lt;p&gt;The SailfishOS:Chum repository is located at the Sailfish&amp;nbsp;OS OBS:&lt;br /&gt;&lt;a href=&apos;https://build.merproject.org/project/show/sailfishos:chum&apos;&gt;build.merproject.org/project/show/sailfishos:chum&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For the etymological origin and meanings of the word &amp;quot;chum&amp;quot;, see &lt;a href=&apos;https://en.wikipedia.org/wiki/Chumming&apos;&gt;en.wikipedia.org:Chumming&lt;/a&gt; and &lt;a href=&apos;https://en.wiktionary.org/wiki/chum&apos;&gt;en.wiktionary.org:chum&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>&lt;p&gt;&amp;nbsp;&lt;br /&gt;The SailfishOS:Chum community repository provides a collection of applications, tools and libraries compiled for various hardware architectures and Sailfish&amp;nbsp;OS release versions.&lt;/p&gt;&lt;p&gt;In contrast to the software distribution model of the Jolla Store or OpenRepos, to which binary packages are uploaded by developers, at SailfishOS:Chum software is compiled and packaged into RPMs in a reproducible manner directly from its source code. The source code used for compiling and packaging is submitted by developers to OBS (Open Build Service), which generates multiple RPM files for different combinations of hardware architectures and Sailfish&amp;nbsp;OS release versions.&lt;/p&gt;&lt;p&gt;This scheme ensures that the complete source code of all packages at SailfishOS:Chum is available and inspectable there, and that all packages are generated solely from this source code. Hence all software packages at SailfishOS:Chum are created in a transparent and fully traceable manner.&lt;/p&gt;&lt;p&gt;By collecting software for Sailfish&amp;nbsp;OS in a single automated build system, collaboration between developers through common packaging of shared libraries etc. is fostered, duplication of work for keeping these common packages up-to-date is eliminated, and it becomes much easier to determine which pieces of software exist and which are missing at the Sailfish&amp;nbsp;OS OBS. Additionally this eases tracing multiple and potentially layered dependencies (&amp;quot;dependency chains&amp;quot;) which is crucial for keeping the software supply chains of complex packages up-to-date.&lt;/p&gt;&lt;p&gt;The SailfishOS:Chum repository is located at the Sailfish&amp;nbsp;OS OBS:&lt;br /&gt;&lt;a href=&apos;https://build.merproject.org/project/show/sailfishos:chum&apos;&gt;build.merproject.org/project/show/sailfishos:chum&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For the etymological origin and meanings of the word &amp;quot;chum&amp;quot;, see &lt;a href=&apos;https://en.wikipedia.org/wiki/Chumming&apos;&gt;en.wikipedia.org:Chumming&lt;/a&gt; and &lt;a href=&apos;https://en.wiktionary.org/wiki/chum&apos;&gt;en.wiktionary.org:chum&lt;/a&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="chum-desc-library">