Merge pull request #61 from sailfishos-applications/devel

`devel`→`master`: first round of commits for v0.3.3
sailfishos-applications · Feb 13, 2024 · eae9782 · eae9782
2 parents 753fea4 + ae7d46e
commit eae9782
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 23 deletions.
diff --git a/.github/workflows/manual-aarch64-430.yml b/.github/workflows/manual-aarch64-430.yml
@@ -0,0 +1,67 @@
+name: Manual CI ([email protected])
+
+on:
+  # Allows to run this workflow manually from the Actions tab.
+  workflow_dispatch:
+
+defaults:
+  run:
+    # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+    # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
+    shell: sh
+
+# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
+concurrency:
+  group: ci-${{ github.ref_name }}
+  # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple.
+  cancel-in-progress: true
+
+jobs:
+  SDK-430:
+    runs-on: ubuntu-22.04
+    env:
+      # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
+      RELEASE: 4.3.0.12
+      # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    # Caching Docker images is not ready yet, see 
+    # https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
+    #- name: Cache Docker images of the Sailfish-SDK
+    #  id: cache-sdk
+    #  uses: actions/cache@v3
+    #  with:
+    #    path: $GITHUB_WORKSPACE/…
+    #    key: cache
+
+    - name: Prepare
+      run: mkdir RPMS
+
+    - name: Build aarch64 on ${{ env.RELEASE }}
+      uses: coderus/github-sfos-build@master
+      with:
+        release: ${{ env.RELEASE }}
+        arch: aarch64
+
+    #- name: Build armv7hl on ${{ env.RELEASE }}
+    #  uses: coderus/github-sfos-build@master
+    #  with:
+    #    release: ${{ env.RELEASE }}
+    #    arch: armv7hl
+
+    #- name: Build i486 on ${{ env.RELEASE }}
+    #  uses: coderus/github-sfos-build@master
+    #  with:
+    #    release: ${{ env.RELEASE }}
+    #    arch: i486
+
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
+      with:
+        name: RPM-build-results_SFOS${{ env.RELEASE }}+
+        path: RPMS/
+
diff --git a/.github/workflows/manual-armv7hl-302.yml b/.github/workflows/manual-armv7hl-302.yml
@@ -0,0 +1,55 @@
+name: Manual CI ([email protected])
+
+on:
+  # Allows to run this workflow manually from the Actions tab.
+  workflow_dispatch:
+
+defaults:
+  run:
+    # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+    # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
+    shell: sh
+
+# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
+concurrency:
+  group: ci-${{ github.ref_name }}
+  # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple.
+  cancel-in-progress: true
+
+jobs:
+  SDK-302:
+    runs-on: ubuntu-22.04
+    env:
+      # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
+      RELEASE: 3.0.2.8
+      # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    # Caching Docker images is not ready yet, see 
+    # https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
+    #- name: Cache Docker images of the Sailfish-SDK
+    #  id: cache-sdk
+    #  uses: actions/cache@v3
+    #  with:
+    #    path: $GITHUB_WORKSPACE/…
+    #    key: cache
+
+    - name: Prepare
+      run: mkdir RPMS
+
+    - name: Build armv7hl on ${{ env.RELEASE }}
+      uses: coderus/github-sfos-build@old-stable
+      with:
+        release: ${{ env.RELEASE }}
+        arch: armv7hl
+
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
+      with:
+        name: RPM-build-results_SFOS${{ env.RELEASE }}+
+        path: RPMS/
+
diff --git 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
@@ -34,7 +34,7 @@ Page {
                 spacing: Theme.paddingLarge
 
                 Image {
-                    source: "file:///usr/share/icons/hicolor/86x86/apps/flowplayer.png"
+                    source: "../../../icons/hicolor/86x86/apps/flowplayer.png"
                 }
 
                 Column {
@@ -44,12 +44,14 @@ Page {
                     Label {
                         id: main
                         color: Theme.highlightColor
-                        text: "FlowPlayer"
+                        text: "<b>FlowPlayer</b>"
+                        font.pixelSize: Theme.fontSizeMedium
+                        textFormat: Text.RichText
                     }
 
                     Label {
                         color: Theme.secondaryHighlightColor
-                        text: "version " + appVersion
+                        text: "Version " + appVersion
                         font.pixelSize: Theme.fontSizeSmall
                     }
                 }
@@ -68,11 +70,6 @@ Page {
                 font.pixelSize: Theme.fontSizeSmall
             }
 
-            Separator {
-                width: parent.width
-                color: Theme.secondaryColor
-            }
-
             Label {
                 color: Theme.secondaryColor
                 text: qsTr("Contributors:")
@@ -82,7 +79,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 +90,23 @@ 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://github.com/sailfishos-applications/flowplayer/blob/master/translations/README.md#translations-l10n--i18n'>" + 
+                      "<b>Translations README</b></a>"
+                onLinkActivated: Qt.openUrlExternally(link)
+                font.pixelSize: Theme.fontSizeLarge
+                textFormat: Text.RichText
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
             Separator {
                 width: parent.width
                 color: Theme.secondaryColor
@@ -115,10 +121,11 @@ Page {
             }
 
             Image {
-                source: "file:///usr/share/flowplayer/icons/paypal.png"
-                height: Theme.itemSizeMedium
+                source: "../paypal.png"
+                height: Theme.itemSizeHuge
                 fillMode: Image.PreserveAspectFit
                 smooth: true
+                anchors.horizontalCenter: parent.horizontalCenter
 
                 MouseArea {
                     anchors.fill: parent

diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes
@@ -1,3 +1,7 @@
+* Sat Feb 10 2024 olf <[email protected]> - 0.3.3
+- Slightly overhaul `AboutPage.qml` (#58, #59)
+- 
+
 * Thu Feb 08 2024 olf <[email protected]> - 0.3.2
 - Use Sailfish.Pickers.FolderPickerPage to configure music directories (#33) by @smokku
 - Enhance AboutPage.qml (#37, #44)

diff --git a/rpm/flowplayer.spec b/rpm/flowplayer.spec
@@ -10,7 +10,7 @@ Name:       flowplayer
 Summary:    Music Player for SailfishOS
 # The <version> tag must adhere to semantic versioning: Among multiple other
 # reasons due to its use for `qmake5` in line 104.  See https://semver.org/
-Version:    0.3.2
+Version:    0.3.3
 # The <release> tag comprises one of {alpha,beta,rc,release} postfixed with a
 # natural number greater or equal to 1 (e.g., "beta3") and may additionally be
 # postfixed with a plus character ("+"), the name of the packager and a release
@@ -21,7 +21,7 @@ Version:    0.3.2
 # build at GitHub and OBS, when configured accordingly; mind the sorting
 # (`adud` < `alpha`).  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Release:    rc5
+Release:    1
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/Multimedia

diff --git a/translations/README.md b/translations/README.md
@@ -2,7 +2,7 @@
 
 You can help localising FlowPlayer to your language using [Transifex](https://app.transifex.com/olf/flowplayer-1) or [Qt Linguist](https://doc.qt.io/qt-5/qtlinguist-index.html).
 
-Note that for FlowPlayer principally translations designated with a country code only (e.g., `pt`) shall be created and maintained.  Only if a complete and well maintained translation for the sole country code exists, a country specific variant with a locale will be accepted (e.g., `nl_BE`).
+Note that for FlowPlayer principally translations designated with a country code only (e.g. `pt`) shall be created and maintained.  Only if a complete and well maintained translation for the sole country code exists, a country specific variant with a locale will be accepted (e.g. `nl_BE`).
 
 [Transifex](https://app.transifex.com/olf/flowplayer-1) is the preferred way of submitting translations.  Please do not send pull requests (PRs) with translations directly to GitHub, if you have a Transifex account.
 
@@ -14,7 +14,7 @@ To compile a translation file for testing, use the `lrelease` command to convert
 ```
 lrelease flowplayer.ts
 ```
-If you want to test your translation before publishing, you should compile it and copy the resulting `qm` file(s) to (requires root privileges)
+If you want to test your translation before publishing, you should compile it and copy the resulting `.qm` file(s) to (requires root privileges):
 ```
  /usr/share/flowplayer/translations
 ```
@@ -25,5 +25,5 @@ export LANG=sv; flowplayer
 
 ### Updating the source `.ts` file with source strings from source code 
 
-Developers and release managers can use the `lupdate` process, either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html) (mind to [include all files with translatable strings](https://github.com/storeman-developers/harbour-storeman/pull/431#issuecomment-1659024529), e.g., by `lupdate qml/ src/ *.desktop -ts translations/flowplayer.ts`), or tediously perform this manually, which hence is only suitable for small changes.
+Developers and release managers can use the `lupdate` process, either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html) (mind to [include all files with translatable strings](https://github.com/storeman-developers/harbour-storeman/pull/431#issuecomment-1659024529), e.g. by `lupdate qml/ src/ *.desktop -ts translations/flowplayer.ts`), or tediously perform this manually, which hence is only suitable for small changes.
 
diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts
@@ -9,22 +9,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="61"/>
+        <location filename="../qml/pages/AboutPage.qml" line="63"/>
         <source>Original author:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="78"/>
+        <location filename="../qml/pages/AboutPage.qml" line="75"/>
         <source>Contributors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="95"/>
+        <location filename="../qml/pages/AboutPage.qml" line="93"/>
         <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="116"/>
         <source>You can support the original author of FlowPlayer by donating:</source>
         <translation type="unfinished"></translation>
     </message>