From 035e3e68f27a5dcb833bbb8cc3e6ff9081f85f24 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Thu, 21 Jul 2016 20:41:50 +0200 Subject: [PATCH] Restore gestures, disabling is not allowed on Harbour --- qml/pages/MainPage.qml | 19 +----------------- rpm/harbour-papocchio.changes | 5 ++++- rpm/harbour-papocchio.spec | 2 +- rpm/harbour-papocchio.yaml | 2 +- src/main.cpp | 6 ------ translations/harbour-lyrics-it.ts | 30 ---------------------------- translations/harbour-papocchio-it.ts | 5 ----- translations/harbour-papocchio-nl.ts | 5 ----- translations/harbour-papocchio-sr.ts | 5 ----- translations/harbour-papocchio.ts | 5 ----- 10 files changed, 7 insertions(+), 77 deletions(-) delete mode 100644 translations/harbour-lyrics-it.ts diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index f930115..6adc9bb 100644 --- a/qml/pages/MainPage.qml +++ b/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 { diff --git a/rpm/harbour-papocchio.changes b/rpm/harbour-papocchio.changes index 40a6bad..fcddc7d 100644 --- a/rpm/harbour-papocchio.changes +++ b/rpm/harbour-papocchio.changes @@ -1,5 +1,8 @@ +* Thu Jul 21 2016 Andrea Scarpino 1.3.2-1 +- Restore gestures. + * Wed Jul 13 2016 Andrea Scarpino 1.3.1-1 -* Add Serbian and Dutch translations. +- Add Serbian and Dutch translations. * Fri Jun 03 2016 Andrea Scarpino 1.3-1 - Disable gestures. diff --git a/rpm/harbour-papocchio.spec b/rpm/harbour-papocchio.spec index 97db892..f622cb8 100644 --- a/rpm/harbour-papocchio.spec +++ b/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.3.1 +Version: 1.3.2 Release: 1 Group: Qt/Qt License: GPLv3 diff --git a/rpm/harbour-papocchio.yaml b/rpm/harbour-papocchio.yaml index 0a27269..27f50cf 100644 --- a/rpm/harbour-papocchio.yaml +++ b/rpm/harbour-papocchio.yaml @@ -1,6 +1,6 @@ Name: harbour-papocchio Summary: Paint using your finger -Version: 1.3.1 +Version: 1.3.2 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 diff --git a/src/main.cpp b/src/main.cpp index 4808116..17e9c3c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,12 +38,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(); diff --git a/translations/harbour-lyrics-it.ts b/translations/harbour-lyrics-it.ts deleted file mode 100644 index a742209..0000000 --- a/translations/harbour-lyrics-it.ts +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CoverPage - - - Draw! - - - - - MainPage - - - Saving the canvas... - - - - - Clearing the canvas... - - - - - Quitting... - - - - diff --git a/translations/harbour-papocchio-it.ts b/translations/harbour-papocchio-it.ts index 7413897..a4b0ac2 100644 --- a/translations/harbour-papocchio-it.ts +++ b/translations/harbour-papocchio-it.ts @@ -21,10 +21,5 @@ Clearing the canvas... Sto cancellando l'immagine... - - - Quitting... - Sto uscendo... - diff --git a/translations/harbour-papocchio-nl.ts b/translations/harbour-papocchio-nl.ts index 428e4de..a840572 100644 --- a/translations/harbour-papocchio-nl.ts +++ b/translations/harbour-papocchio-nl.ts @@ -21,10 +21,5 @@ Clearing the canvas... Leegmaken canvas... - - - Quitting... - Afsluiten... - diff --git a/translations/harbour-papocchio-sr.ts b/translations/harbour-papocchio-sr.ts index 3cbbb2c..abf4067 100644 --- a/translations/harbour-papocchio-sr.ts +++ b/translations/harbour-papocchio-sr.ts @@ -21,10 +21,5 @@ Clearing the canvas... Брисање платна... - - - Quitting... - Одустајање... - diff --git a/translations/harbour-papocchio.ts b/translations/harbour-papocchio.ts index a742209..6b3d831 100644 --- a/translations/harbour-papocchio.ts +++ b/translations/harbour-papocchio.ts @@ -21,10 +21,5 @@ Clearing the canvas... - - - Quitting... - -