devel→master: Beautification commits (#41)

* Update filecase.ts (#37) * [build-on-pull_req.yml] Add `master` branch * [build-on-pull_req.yml] Optimise * [build-on-pull_req.yml] Try scope of ENV variables * [filecase.spec] Alter git-tag format & add category Qt * [translations/README.md] Remove stray space character * [build-on-pull_req.yml] Rectify comment * [build-on-pull_req.yml] Fix ENV variable not inside scope * [build-on-pull_req.yml] Fix variable reference * [filecase.rpmlintrc] Add concluding newline * [filecase.changes] Add concluding newline * [filecase.spec] Add concluding newline * [help-template.mdC * [bug-template.md] Add concluding newline * [suggestion-template.md] Add concluding newline * Translations e1ea38f26d7f78652b2b1cfbfece6d7b de (#40, also #36) Updates for file translations/filecase.ts in de on branch master (#36) * Translate translations/filecase.ts in de 100% translated source file: 'translations/filecase.ts' on 'de'. --------- Co-authored-by: olf <Olf0@users.noreply.github.com> and transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * [LICENSE.txt] Grammar: comma * [.gitignore] Unify formatting * Translate translations/filecase.ts in de (#39) 100% translated source file: 'translations/filecase.ts' on 'de'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> Co-authored-by: olf <Olf0@users.noreply.github.com> * Update README.md * [README.md] Center "align" table content * [README.md] Insert linebreak * [README.md] Enhance formatting --------- Co-authored-by: olf <Olf0@users.noreply.github.com> and transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
sailfishos-applications · Sep 27, 2023 · f7106d0 · f7106d0
2 parents 674c045 + ffde0cc
commit f7106d0
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-template.md b/.github/ISSUE_TEMPLATE/bug-template.md
@@ -21,3 +21,4 @@ assignees: ''
 #### ADDITIONAL INFORMATION
 
 <Please consider which other pieces of information may be relevant: Denote if this is not always reproducible, if this is a regression (then name to which older version), attach relevant data such as log files or the systemd journal, provide screenshots etc.>
+
diff --git a/.github/ISSUE_TEMPLATE/help-template.md b/.github/ISSUE_TEMPLATE/help-template.md
@@ -21,3 +21,4 @@ assignees: ''
 #### ADDITIONAL INFORMATION
 
 <Please consider which other pieces of information may be relevant: Denote if this is not always reproducible, if this is a regression (then name to which older version), attach relevant data such as log files or the systemd journal, provide screenshots etc.>
+
diff --git a/.github/ISSUE_TEMPLATE/suggestion-template.md b/.github/ISSUE_TEMPLATE/suggestion-template.md
@@ -13,3 +13,4 @@ assignees: ''
 #### ADDITIONAL INFORMATION
 
 <Please consider which other pieces of information may be relevant: Attach relevant data, provide screenshots etc.>
+
diff --git a/.github/workflows/build-on-pull_req.yml b/.github/workflows/build-on-pull_req.yml
@@ -2,11 +2,15 @@ name: CI on PRs with SDK for 2.2.0 (i486)
 
 env:
   RELEASE: 2.2.0.29
+  ARCH: i486
+  # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes.
+  SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
 
 on:
   pull_request:
     branches:
       - devel
+      - master
   # Allows to run this workflow manually from the Actions tab.
   workflow_dispatch:
 
@@ -26,9 +30,6 @@ defaults:
 jobs:
   build:
     runs-on: ubuntu-22.04
-    env:
-      # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes.
-      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
     steps:
 
     - name: Checkout
@@ -46,16 +47,16 @@ jobs:
     - name: Prepare
       run: mkdir RPMS
 
-    - name: Build i486
+    - name: Build ${{ env.ARCH }}
       uses: coderus/github-sfos-build@old-stable
       with:
-        # Solely builds for i486 on 3.3.0, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003
+        # Solely builds for i486 on 2.2.0, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003
         release: ${{ env.RELEASE }}
-        arch: i486
+        arch: ${{ env.ARCH }}
 
     - name: Upload build result
       uses: actions/upload-artifact@v3
       with:
-        name: RPM-build-results_devel-i486-SFOS2.2.0+
+        name: RPM-build-results_${{ github.base_ref }}-${{ env.ARCH }}-SFOS2.2.0+
         path: RPMS/
 
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 # C++ objects and libs
-
 *.slo
 *.lo
 *.o
@@ -11,7 +10,6 @@
 *.dylib
 
 # Qt-es
-
 /.qmake.cache
 /.qmake.stash
 *.pro.user
@@ -26,7 +24,6 @@ Makefile*
 *-build-*
 
 # QtCreator
-
 *.autosave
 *.list
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -368,7 +368,7 @@ file, then You may include the notice in a location (such as a LICENSE
 file in a relevant directory) where a recipient would be likely to look
 for such a notice.
 
-Additional accurate notices of copyright ownership:
+Additional, accurate notices of copyright ownership:
 - (C) 2015-2016 Matias Perez (CepiPerez) <cepiperez@gmail.com>
 - (C) 2022 David Llewellyn-Jones (llewelld / flypig) <david@flypig.co.uk>
 - (C) 2022-2023 olf (Olf0) <Olf0@users.noreply.github.com>

diff --git a/README.md b/README.md
@@ -1,18 +1,55 @@
+# FileCase for SailfishOS
+
+**FileCase is an advanced, feature-rich file-manager.**
+
+Features:
+- Copy, move and rename files
+- Custom clipboard (for copy, move and create symlinks actions)
+- Search files by filename with wildcards
+- Open files via `xdg-open` action (uses [MIME-handlers](https://github.com/llelectronics/mimer))
+- Show hidden files and folders
+- Show thumbnails of images
+- View text files
+- Edit text files with a built-in, simple text editor
+- Create archives (`.zip`, `.tar`, `.tar.gz`, `.tar.bz2`)
+- View archive content (aforementioned formats, plus more, e.g., `.apk`) 
+- Extraxt archives (aforementioned formats, `.apk` etc.)
+- Install packages (`.rpm`, `.apk`)
+- Share files (to Android programs, Bluetooth etc.)
+- Supports Box, Dropbox, Google Drive, OneDrive and WebDAV cloud storage services
+
+<sup>Note that the ability to access cloud storage providers may be broken (this is [known for Dropbox](https://github.com/sailfishos-applications/filecase/issues/4)) due to API changes on their side; the same may apply to file sharing via Bluetooth on recent SailfishOS releases.</sup><br />
+Pull requests with fixes, improvements and enhancements are welcome!
+
 ## Translating FileCase (l10n / i18n)
 
 If you want to translate FileCase to a language it does not support yet or improve an extant translation, please [read the translations-README](./translations#readme).
 
 ## Screenshots of FileCase
 
-|     |     |     |     |     |
-| --- | --- | --- | --- | --- |
-| ![View files and directories](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-001.jpg) | ![Select files and directories](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-002.jpg) | ![View file properties with media preview](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-003.jpg) | ![Locations](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-004.jpg) | ![Cloud locations](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-005.jpg) |
+|       |       |       |       |       |
+| :---: | :---: | :---: | :---: | :---: |
+|       |       |       |       |       |
+| ![View files and directories](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-001.jpg) | ![Select files and directories](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-002.jpg) | ![View file properties with media preview](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-003.jpg) | ![Storage locations](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-004.jpg) | ![Cloud storage locations](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-005.jpg) |
+| <sub>View files and directories</sub> | <sub>Select files and directories</sub>  | <sub>View file properties with media preview</sub> | <sub>Storage locations</sub> | <sub>Cloud storage locations</sub> |
+|       |       |       |       |       |
+|       |       |       |       |       |
 | ![Settings page](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-006.jpg) | ![Share page](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-007.jpg) | ![Creating archive files](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-008.jpg) | ![Extracting archive files](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-009.jpg) | ![Transfers page](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-010.jpg) |
+| <sub>Settings page</sub> | <sub>Share page</sub>  | <sub>Creating archive files</sub> | <sub>Extracting archive files</sub> | <sub>Transfers page</sub> |
+|       |       |       |       |       |
+
+## History of FileCase
+
+The original [FileCase for SailfishOS (2015 - 2016)](https://openrepos.net/content/cepiperez/filecase-0#content) started as a port of [FileCase for MeeGo-Harmattan (2014)](https://openrepos.net/content/cepiperez/filecase#content) (on the Nokia N9), which in turn is an overhauled [FileBox (2013)](https://openrepos.net/content/cepiperez/filebox#content).  All three appllications were written by [Matias Perez (CepiPerez)](https://github.com/CepiPerez).  In 2021 Matias [released the source code of FileCase](https://github.com/sailfishos-applications/filecase/commit/d4294bbc5e854bb1a32481201f556ba453fbaef6) by creating this git repository at GitHub.
+
+In 2022 [David Llewellyn-Jones (flypig)](https://github.com/llewelld) cleaned up [the source code repository and adapted FileCase](https://github.com/sailfishos-applications/filecase/compare/0.1-9...0.2.1) to run on recent releases of SailfishOS.
+
+In 2022 and 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/filecase#content), the [Transifex integration](https://github.com/sailfishos-applications/filecase/pull/34), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://build.sailfishos.org/project/show/sailfishos:chum) etc.
 
 ## Credits
 #### Original author
 [Matias Perez (CepiPerez)](https://github.com/CepiPerez)
 #### Contributors
-- [David Llewellyn-Jones (llewelld / flypig)](https://github.com/llewelld)
+- [David Llewellyn-Jones (flypig)](https://github.com/llewelld)
 - [olf (Olf0)](https://github.com/Olf0)
 
diff --git a/rpm/filecase.changes b/rpm/filecase.changes
@@ -54,3 +54,4 @@
 - Initial release
 
 # Changelog format: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/SF4VVE4NBEDQJDJZ4DJ6YW2DTGMWP23E/#6O6DFC6GDOLCU7QC3QJKJ3VCUGAOTD24
+
diff --git a/rpm/filecase.rpmlintrc b/rpm/filecase.rpmlintrc
@@ -24,3 +24,4 @@ setBadness('description-line-too-long', 0)
 # On our own behalf:
 # - Foo
 # - Bar
+
diff --git a/rpm/filecase.spec b/rpm/filecase.spec
@@ -11,8 +11,8 @@ Summary:    An advanced file-manager for SailfishOS
 # The <version> tag must adhere to semantic versioning: Among multiple other
 # reasons due to its use for `qmake5` in line 107.  See https://semver.org/
 Version:    0.4.2
-# 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
+# The <release> tag *may* comprise 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
 # number chosen by her (e.g., "rc2+jane4").  `{alpha|beta|rc|release}`
 # indicates the expected status of the software.  No other identifiers shall be
@@ -31,10 +31,10 @@ URL:        https://github.com/sailfishos-applications/%{name}
 # https://en.opensuse.org/SDB:Vendor_change_update#Disabling_Vendor_stickiness
 Vendor:     meego
 # The "Source0:" line below requires that the value of %%{name} is also the
-# project name at GitHub and the value of `%%{release}/%%{version}` is also
+# project name at GitHub and the value of `%%{version}-%%{release}` is also
 # the name of a correspondingly set Git tag.  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Source0:    %{url}/archive/%{release}/%{version}/%{name}-%{version}.tar.gz
+Source0:    %{url}/archive/%{version}-%{release}/%{name}-%{version}.tar.gz
 # Note that the rpmlintrc file MUST be named exactly so according to
 # https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors
 Source99:   %{name}.rpmlintrc
@@ -62,6 +62,7 @@ Categories:
  - Filesystem
  - FileTools
  - FileTransfer
+ - Qt
  - TextEditor
  - Viewer
 DeveloperName: Matias Perez (CepiPerez), olf (Olf0), David L.-J. (llewelld / flypig)
@@ -109,3 +110,4 @@ desktop-file-install --delete-original --dir %{buildroot}%{_datadir}/application
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/86x86/apps/%{name}.png
+
diff --git a/translations/README.md b/translations/README.md
@@ -10,7 +10,7 @@ If you do not want to use Atlassian's Transifex, alternatives are [Qt Linguist](
 
 ### Testing translations
 
-To compile a translation file for testing, use the `lrelease` command to convert the translation files (`.ts` files) into Qt message files (`.qm` files) , 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):
+To compile a translation file for testing, use the `lrelease` command to convert the translation files (`.ts` files) into Qt message files (`.qm` files), 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):
 ```
 lrelease filecase.ts
 ```

diff --git a/translations/de.ts b/translations/de.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="109"/>
-        <source>You can support the original author of Filecase by donating:</source>
+        <source>You can support the original author of FileCase by donating:</source>
         <translation>Du kannst den ursprünglichen Autor von FileCase durch eine Spende unterstützen:</translation>
     </message>
 </context>

diff --git a/translations/filecase.ts b/translations/filecase.ts
@@ -25,8 +25,8 @@
     </message>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="109"/>
-        <source>You can support the original author of Filecase by donating:</source>
-        <translation>You can support the original author of Filecase by donating:</translation>
+        <source>You can support the original author of FileCase by donating:</source>
+        <translation>You can support the original author of FileCase by donating:</translation>
     </message>
 </context>
 <context>