From 15cd417cd7e108982121eb9fde114d6489bb32ed Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Mon, 12 Feb 2024 21:30:28 +0100
Subject: [PATCH] Rectify `AboutPage.qml` (#58)

* [README.md] Add smokku to contributors

* [AboutPage.qml] Fix path of Paypal icon
  Correct absolute path would have been `file:///usr/share/flowplayer/qml/paypal.png` (instead of `file:///usr/share/flowplayer/icon/paypal.png`), but reverting back to relative path `file://../paypal.png`.

* [AboutPage.qml] Make icon path relative
  As a consequence of the preceding [commit f002ccb](https://github.com/sailfishos-applications/flowplayer/pull/58/commits/f002ccb12afbf4737bb3fc4ed2340390d8934971), the other icon path here should also be a relative one, due to [`rpm/flowplayer.spec` lines 116-118](https://github.com/sailfishos-applications/flowplayer/blob/master/rpm/flowplayer.spec#L116-L118): All these paths reside in `%{datadir}`.

* [AboutPage.qml] Trying to enhance formatting

* [flowplayer.ts] Adopt line numbers from `AboutPage.qml`

* [AboutPage.qml] "at" --> @
---
 README.md                  |  1 +
 qml/pages/AboutPage.qml    | 27 ++++++++++++++++++---------
 translations/flowplayer.ts |  6 +++---
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index f4c4200..d7691ed 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects,
 #### Contributors
 - [Damien Caliste (dcaliste)](https://github.com/dcaliste)
 - [olf (Olf0)](https://github.com/Olf0)
+- [Tomasz Sterna (smokku)](https://github.com/smokku)
 <br />
 
 ### License: [MPL 2.0](https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html)
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index a65765e..39054e5 100644
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@@ -34,7 +34,7 @@ Page {
                 spacing: Theme.paddingLarge
 
                 Image {
-                    source: "file:///usr/share/icons/hicolor/86x86/apps/flowplayer.png"
+                    source: "file://../../icons/hicolor/86x86/apps/flowplayer.png"
                 }
 
                 Column {
@@ -49,7 +49,7 @@ Page {
 
                     Label {
                         color: Theme.secondaryHighlightColor
-                        text: "version " + appVersion
+                        text: "Version " + appVersion
                         font.pixelSize: Theme.fontSizeSmall
                     }
                 }
@@ -68,9 +68,10 @@ Page {
                 font.pixelSize: Theme.fontSizeSmall
             }
 
-            Separator {
-                width: parent.width
+            Label {
                 color: Theme.secondaryColor
+                text: "&nbsp;"
+                font.pixelSize: Theme.fontSizeSmall
             }
 
             Label {
@@ -82,7 +83,8 @@ Page {
             Label {
                 color: Theme.secondaryColor
                 text: "(C) 2022-2024 olf (Olf0)" + "<br />" +
-                      "(C) 2023-2024 Damien Caliste (dcaliste)"
+                      "(C) 2023, 2024 Damien Caliste (dcaliste)" + "<br />" +
+                      "(C) 2024 Tomasz Sterna (smokku)"
                 font.pixelSize: Theme.fontSizeSmall
             }
 
@@ -92,15 +94,22 @@ Page {
             }
 
             Label {
-                text: colored + qsTr("If you want to create a new translation or improve an extant one:") + "<br>" +
-                      "<a href='https://app.transifex.com/olf/flowplayer/'>" + "Transifex - FlowPlayer</a>"
-                onLinkActivated: Qt.openUrlExternally(link)
+                text: colored + qsTr("If you want to create a new translation or improve an extant one:")
                 font.pixelSize: Theme.fontSizeSmall
                 textFormat: Text.RichText
                 wrapMode: Text.WordWrap
                 width: parent.width
             }
 
+            Label {
+                text: colored + "<a href='https://app.transifex.com/olf/flowplayer/'>" + "FlowPlayer@Transifex</a>"
+                onLinkActivated: Qt.openUrlExternally(link)
+                font.pixelSize: Theme.fontSizeLarge
+                textFormat: Text.RichText
+                wrapMode: Text.WordWrap
+                width: parent.width
+            }
+
             Separator {
                 width: parent.width
                 color: Theme.secondaryColor
@@ -115,7 +124,7 @@ Page {
             }
 
             Image {
-                source: "file:///usr/share/flowplayer/icons/paypal.png"
+                source: "file://../paypal.png"
                 height: Theme.itemSizeMedium
                 fillMode: Image.PreserveAspectFit
                 smooth: true
diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts
index 4fc4858..de81ea5 100644
--- a/translations/flowplayer.ts
+++ b/translations/flowplayer.ts
@@ -14,17 +14,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="78"/>
+        <location filename="../qml/pages/AboutPage.qml" line="79"/>
         <source>Contributors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="95"/>
+        <location filename="../qml/pages/AboutPage.qml" line="97"/>
         <source>If you want to create a new translation or improve an extant one:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="110"/>
+        <location filename="../qml/pages/AboutPage.qml" line="119"/>
         <source>You can support the original author of FlowPlayer by donating:</source>
         <translation type="unfinished"></translation>
     </message>