Merge branch 'master' into recover-failures

rpm/patchmanager.spec

@@ -1,4 +1,3 @@
-%global theme sailfish-default
 
 # These macros should already be defined in the RPMbuild environment, see: rpm --showrc
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
@@ -291,7 +290,13 @@ exit 0
 %{_datadir}/jolla-settings/entries/%{name}.json
 %{_datadir}/%{name}/icons/icon-m-patchmanager.png
 
-%{_datadir}/themes/%{theme}/meegotouch/*/icons/*.png
+# pre 4.6:
+# /usr/share/themes/sailfish-default/meegotouch/zX.Y/icons/*.png
+# 4.6 and higher:
+# /usr/share/themes/sailfish-default/silica/zX.Y/icons/*.png
+# /usr/share/themes/sailfish-default/silica/zX.Y/icons-monochrome/*.png
+%{_datadir}/themes/sailfish-default/*/*/*/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
 * Thu Sep  9 1999 SailfishOS Patches <[email protected]> - 99.99.99

src/bin/patchmanager-daemon/patchmanagerobject.cpp

@@ -275,7 +275,7 @@ void PatchManagerObject::notify(const QString &patch, NotifyAction action)
     switch (action) {
     case NotifyActionSuccessApply:
         summary = qApp->translate("", "Patch activated");
-        body = qApp->translate("", "Patch %1 activated.").arg(patch);
+        body = qApp->translate("", "Patch %1 activated").arg(patch);
         if (getToggleServices()) {
             body.append( ", " );
             body.append( qApp->translate("", "some service(s) should be restarted.") );

src/icons/README.md

@@ -0,0 +1,12 @@
+sailfish-svg2png:
+
+For all SailfishOS versions up to v4.6 (and possible also Meego):
+
+ - svg files must be in svgs/
+ - png files will be in /usr/share/sailfish-default/meegotouch/zX.Y/icons
+
+For SailishOS 4.6 and higher
+
+ - svg files must be in svgs/icons and svgs/icons-monochrome
+ - png files will be in /usr/share/sailfish-default/silica/zX.Y/icons and /usr/share/sailfish-default/silica/zX.Y/icons-monochrome
+

src/icons/icons.pro

@@ -1,29 +1,11 @@
 TEMPLATE = aux
+
 # Configures svg to png
 THEMENAME=sailfish-default
 
-load(sailfish-svg2png-sizes)
-
-theme.path = /usr/share/themes/$${THEMENAME}/
-themeDirectory.path = /usr/share/themes/$${THEMENAME}/meegotouch
-themeDirectory.files += $${OUT_PWD}/icons
-
-for(profile, SAILFISH_SVG2PNG.profiles) {
-    # a work-around for installing directories that do not exist yet
-    system(mkdir -p $${OUT_PWD}/z$${profile})
-
-    exists( $${OUT_PWD}/symlinks ): svg2png.commands += cp -r symlinks/icons z$${profile} &&
-
-    svg2png.commands += /usr/bin/sailfish_svg2png \
-        -z $$eval(SAILFISH_SVG2PNG.scales.$${profile}) \
-        $$eval(SAILFISH_SVG2PNG.extra.$${profile}) \
-         $${_PRO_FILE_PWD_}/svgs \
-         z$${profile}/icons &&
-
-    svg2png.files += $${OUT_PWD}/z$${profile}
-}
-
-svg2png.commands += true
-svg2png.path = $${themeDirectory.path}
+CONFIG += sailfish-svg2png
 
-INSTALLS += svg2png theme themeDirectory
+# also install SVG:
+svg.path = /usr/share/icons/hicolor/scalable/apps
+svg.files = svgs/icon-m-patchmanager2.svg
+INSTALLS += svg