Merge pull request #78 from sailfishos-applications/devel

`master`→`devel`: Final commits for v0.4.4

LICENSE.txt

@@ -368,10 +368,10 @@ 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:
+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>
+- (C) 2021 David Llewellyn-Jones (llewelld / flypig) <david@flypig.co.uk>
+- (C) 2022-2024 olf (Olf0) <Olf0@users.noreply.github.com>
 
 Exhibit B - "Incompatible With Secondary Licenses" Notice
 ---------------------------------------------------------

README.md

@@ -12,7 +12,7 @@ Features:
 - 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`) 
+- 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.)
@@ -44,14 +44,15 @@ The original [FileCase for SailfishOS (2015 - 2016)](https://openrepos.net/conte
 
 In 2021 [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.
+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), a [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 (flypig)](https://github.com/llewelld)
+- [David Llewellyn-Jones (llewelld / flypig)](https://github.com/llewelld)
 - [olf (Olf0)](https://github.com/Olf0)
+- [Simon Schmeisser (simonschmeisser)](https://github.com/simonschmeisser)
 <br />
 
 ### License: [MPL 2.0](https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html)

filecase.pro

@@ -1,22 +1,24 @@
 # NOTICE:
 #
 # Application name defined in TARGET has a corresponding QML filename.
-# If name defined in TARGET is changed, the following needs to be done
-# to match new name:
-#   - corresponding QML filename must be changed
-#   - desktop icon filename must be changed
-#   - desktop filename must be changed
-#   - icon definition filename in desktop file must be changed
-#   - translation filenames have to be changed
+# If the name defined in TARGET is changed, the following must be done
+# to match the new name:
+#   - the corresponding QML filename must be adapted
+#   - the desktop icon filename must be adapted
+#   - the name of the `.desktop` file must be adapted
+#   - the icon definition filename in `.desktop` file must be adapted
+#   - the original translation strings `.ts` filename has to be adapted
 
-# The name of your application
+# The name of your application; should default to the name of the project file,
+# see https://doc.qt.io/qt-5/qmake-common-projects.html#building-an-application
 TARGET = filecase
 
 CONFIG += sailfishapp
 
 QT += core xml
 
 DEFINES += QWEBDAVITEM_EXTENDED_PROPERTIES DEBUG_WEBDAV
+DEFINES += VERSION=\\\"$${VERSION}\\\"
 
 SOURCES += src/filecase.cpp \
     src/browser.cpp \
@@ -159,6 +161,6 @@ HEADERS += \
     src/boxthumbnailer.h
 
 icons.files = icons
-icons.path = /usr/share/filecase/
+icons.path = /usr/share/$$TARGET
 
 INSTALLS += icons

qml/filecase.qml

@@ -7,8 +7,6 @@ ApplicationWindow
 {
     id: appWindow
 
-    property string appVersion: "0.4.2"
-
     property string savedorientation: config.readConfig("Orientation", "auto")
 
     property int pagesOrientations: savedorientation==="auto"? (Orientation.Portrait | Orientation.Landscape) :

qml/pages/AboutPage.qml

@@ -33,7 +33,7 @@ Page {
                 spacing: Theme.paddingLarge
 
                 Image {
-                    source: "file://usr/share/icons/hicolor/86x86/apps/filecase.png"
+                    source: "file:///usr/share/icons/hicolor/86x86/apps/filecase.png"
                 }
 
                 Column {
@@ -80,8 +80,9 @@ Page {
 
             Label {
                 color: Theme.secondaryColor
-                text: "(C) 2022 David Llewellyn-Jones (llewelld / flypig)" + "<br />" +
-                      "(C) 2022-2023 olf (Olf0)"
+                text: "(C) 2021 David Llewellyn-Jones (llewelld / flypig)" + "<br />" +
+                      "(C) 2022-2024 olf (Olf0)" + "<br />" +
+                      "(C) 2023 Simon Schmeisser (simonschmeisser)"
                 font.pixelSize: Theme.fontSizeSmall
             }
 

rpm/filecase.changes

@@ -1,11 +1,23 @@
+* Sat Feb 24 2024 olf <Olf0@users.noreply.github.com> - 0.4.4
+- Slightly enhance `About.qml` page (#65 etc.)
+- Setting `appVersion` for QML from `Version:` in spec-file (#66)
+- Fix issue #68: `TS`→`QM` files does not work on OBS (#74)
+
 * Fri Nov 24 2023 olf <Olf0@users.noreply.github.com> - 0.4.3
-- Fix for issue #54 "Building on SFOS-OBS fails" by @nephros (#55)
+- Update Swedish translation (#47) by @eson57
+- Introduce a quick & dirty workaround for issue #15 (#46) by @simonschmeisser
+- Minor documentation improvements by @Olf0
+- Fix: Building on SFOS-OBS fails (#55) by @nephros, closes issue #54
 - Set `Vendor:` to `meego` (#57)
 
-* Thu Nov 16 2023 olf <Olf0@users.noreply.github.com> - 0.4.2
-- Update Swedish translation (PR #47) by @eson57
-- Introduce a quick & dirty workaround for issue #15 (PR #46) by @simonschmeisser
-- Minor documentation improvements by @Olf0
+* Sun Oct 29 2023 olf <Olf0@users.noreply.github.com> - 0.4.2
+- Fully overhaul README
+- Create Translations-README
+- Add Transifex configuration
+- Add three issue templates
+- Implement and overhaul GitHub CI workflows
+- Trivially bail out of SailJail
+- Clean up and rectify some code changes made in 2022
 
 * Sun Mar 06 2022 olf <Olf0@users.noreply.github.com> - 0.4.1
 - Add checks for recent SD card paths: `/run/media/nemo` and `/run/media/defaultuser`

rpm/filecase.spec

@@ -10,7 +10,7 @@ Name:       filecase
 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.3
+Version:    0.4.4
 # 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.4.3
 # 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:    rc4
+Release:    release1
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/File
@@ -44,6 +44,7 @@ BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  qt5-qttools-linguist
 BuildRequires:  desktop-file-utils
 
 # This description section includes metadata for SailfishOS:Chum, see
@@ -66,7 +67,7 @@ Categories:
  - Qt
  - TextEditor
  - Viewer
-DeveloperName: Matias Perez (CepiPerez), olf (Olf0), David L.-J. (llewelld / flypig)
+DeveloperName: CepiPerez, olf, flypig, simonschmeisser
 Custom:
   Repo: %{url}
 PackageIcon: %{url}/raw/master/icons/filecase3.png

src/filecase.cpp

@@ -65,6 +65,7 @@ int main(int argc, char *argv[])
 
     //window->rootContext()->setContextProperty("view", window.data());
     //window->rootContext()->setContextProperty("app", app.data());
+    window->rootContext()->setContextProperty("appVersion", VERSION);
     window->engine()->addImportPath("/usr/share/filecase/qml");
 
     qmlRegisterType<Config>("FileCase", 1, 0, "Config");