Build all main branches

App icon refresh


(cherry picked from commit ef48914e0b)

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
 
     - name: Prepare
       run: mkdir output
@@ -42,7 +42,7 @@ jobs:
         arch: aarch64
 
     - name: Upload build result
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: rpms
         path: RPMS

Papocchio.pro

@@ -39,4 +39,4 @@ TRANSLATIONS += \
     translations/harbour-papocchio-sv.ts \
     translations/harbour-papocchio-tr.ts \
     translations/harbour-papocchio-tzm.ts \
-    translations/harbour-papocchio-zgh.ts
+    translations/harbour-papocchio-zh_Hant.ts

qml/pages/MainPage.qml

@@ -90,7 +90,7 @@ Page {
                 stepSize: 1
                 value: defaultStrokeSize
                 valueText: value
-                width: parent.width - edit.width - save.width - clearBtn.width - quit.width - (Theme.paddingMedium * 4)
+                width: parent.width - edit.width - save.width - clearBtn.width - (Theme.paddingMedium * 4)
                 anchors.verticalCenter: parent.verticalCenter
 
                 // Don't waste space
@@ -118,23 +118,6 @@ Page {
                     id: remorseClear
                 }
             }
-
-            IconButton {
-                id: quit
-                icon.source: "image://theme/icon-m-close"
-                anchors.verticalCenter: parent.verticalCenter
-                width: 50
-
-                onClicked: {
-                    remorseQuit.execute(menu, qsTr("Quitting…"), function() {
-                        Qt.quit();
-                    }, 1000);
-                }
-
-                RemorseItem {
-                    id: remorseQuit
-                }
-            }
         }
 
         Rectangle {

rpm/harbour-papocchio.changes

@@ -1,16 +1,13 @@
-* Fri Nov 25 2022 Andrea Scarpino <andrea@scarpino.dev> 1.4.3-1
+* Fri Nov 25 2022 Andrea Scarpino <andrea@scarpino.dev> 1.3.4-1
 - Add SailJail permissions.
 - Update icons.
 - Add Lithuanian translation.
 
-* Fri Aug 6 2021 Andrea Scarpino <andrea@scarpino.dev> 1.4.2-1
+* Sat Jun 5 2021 Andrea Scarpino <andrea@scarpino.dev> 1.3.3-1
-- New icon by Jorren `jsehv` Schauwaert
-
-* Sat Jun 5 2021 Andrea Scarpino <andrea@scarpino.dev> 1.4.1-1
 - Add several translations.
 
-* Thu Jul 21 2016 Andrea Scarpino <me@andreascarpino.it> 1.4-1
+* Thu Jul 21 2016 Andrea Scarpino <me@andreascarpino.it> 1.3.2-1
-- Restore Czech translation.
+- Restore gestures.
 
 * Wed Jul 13 2016 Andrea Scarpino <me@andreascarpino.it> 1.3.1-1
 - Add Serbian and Dutch translations.

rpm/harbour-papocchio.spec

@@ -13,7 +13,7 @@ Name:       harbour-papocchio
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Paint using your finger
-Version:    1.4.3
+Version:    1.3.4
 Release:    1
 Group:      Qt/Qt
 License:    GPLv3

rpm/harbour-papocchio.yaml

@@ -1,6 +1,6 @@
 Name: harbour-papocchio
 Summary: Paint using your finger
-Version: 1.4.3
+Version: 1.3.4
 Release: 1
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS

src/main.cpp

@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
     QScopedPointer<QQuickView> view(SailfishApp::createView());
 
     QCoreApplication::setApplicationName(QStringLiteral("harbour-papocchio"));
-    QCoreApplication::setOrganizationName(QStringLiteral("andreascarpino.it"));
+    QCoreApplication::setOrganizationDomain(QStringLiteral("andreascarpino.it"));
 
     view->setSource(SailfishApp::pathTo("qml/Papocchio.qml"));
 
@@ -39,12 +39,6 @@ int main(int argc, char *argv[])
     view->setPersistentOpenGLContext(true);
     view->setPersistentSceneGraph(true);
 
-    // Disable swipe gestures in proper way
-    view->setFlags(view->flags()|Qt::WindowOverridesSystemGestures);
-
-    // Make Qt.quit() work from QML
-    QObject::connect(view->engine(), &QQmlEngine::quit, app.data(), &QCoreApplication::quit);
-
     view->rootContext()->setContextProperty("papocchioDir", papocchioDir());
 
     view->show();

translations/harbour-papocchio-ber.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ber">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>ⵙⵙⵓⵏⵖ!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>ⴰⵣⵎⵎⴻⵎ ⵏ ⵓⵀⴷⵓⵎ…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>ⵙⵙⵉⵔⴷ ⴰⵀⴷⵓⵎ…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>ⵜⵓⴼⵖⴰ…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-cs.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Vyprazdňuje se plátno…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-de.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Löschen der Leinwand …</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Beenden …</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-el.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Εκκαθάριση του καμβά…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Τερματισμός…</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-eo.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="eo">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Desegnu!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Konservante la kanvason…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Forviŝante la kanvason…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Forlasante…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-et.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="et">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Joonista!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Lõuendit salvestatakse…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Lõuendit puhastatakse…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Väljumine…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-fi.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fi">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Piirrä!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Tallennetaan kangas…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Tyhjennetään kangas…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Suljetaan…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-fr.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fr">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Dessinez !</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Enregistrement de la toile…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Nettoyage de la toile…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Sortie…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-hr.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="hr">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Crtaj!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Spremanje platna …</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Brisanje platna …</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Prekidanje …</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-hu.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-it.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Sto cancellando l&apos;immagine…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Sto uscendo…</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-nb_NO.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Tømmer lerretet…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Avslutter…</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-nl.ts

@@ -6,7 +6,7 @@
     <message>
         <location filename="../qml/cover/CoverPage.qml" line="25"/>
         <source>Draw!</source>
-        <translation>Teken!</translation>
+        <translation>Tekenen!</translation>
     </message>
 </context>
 <context>
@@ -14,17 +14,12 @@
     <message>
         <location filename="../qml/pages/MainPage.qml" line="76"/>
         <source>Saving the canvas…</source>
-        <translation>Bezig met opslaan van canvas…</translation>
+        <translation>Opslaan canvas…</translation>
     </message>
     <message>
         <location filename="../qml/pages/MainPage.qml" line="112"/>
         <source>Clearing the canvas…</source>
-        <translation>Bezig met wissen van canvas…</translation>
+        <translation>Leegmaken canvas…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Bezig met afsluiten…</translation>
     </message>
 </context>
 </TS>

translations/harbour-papocchio-nl_BE.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="nl_BE">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Tekent!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Bezig met opslaan van canvas…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Bezig met wissen van canvas…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Bezig met afsluiten…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-ru_RU.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Очищаю холст…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Выход…</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-sr.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Брисање платна…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Одустајање…</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-sv.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation>Rensar ytan…</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Avslutar…</translation>
-    </message>
 </context>
 </TS>

translations/harbour-papocchio-tr.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="tr">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>Çiz!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Tuval kaydediliyor…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Tuval temizleniyor…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>Çıkılıyor…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-tzm.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="tzm">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>ssunɣ!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>Azemmem n tifest…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>Sfeḍ tifesin…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>ufuɣa…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio-zgh.ts

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="zgh">
-<context>
-    <name>CoverPage</name>
-    <message>
-        <location filename="../qml/cover/CoverPage.qml" line="25"/>
-        <source>Draw!</source>
-        <translation>ⵙⵙⵓⵏⵖ!</translation>
-    </message>
-</context>
-<context>
-    <name>MainPage</name>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="76"/>
-        <source>Saving the canvas…</source>
-        <translation>ⴰⵣⵎⵎⴻⵎ ⵏ ⵜⵉⴼⵙⵜ…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="112"/>
-        <source>Clearing the canvas…</source>
-        <translation>ⴽⴽⵙ ⵜⵉⴼⵙⵜ…</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation>ⵓⴼⵓⵖ…</translation>
-    </message>
-</context>
-</TS>

translations/harbour-papocchio.ts

@@ -21,10 +21,5 @@
         <source>Clearing the canvas…</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="129"/>
-        <source>Quitting…</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>