Restore gestures, disabling is not allowed on Harbour

This commit is contained in:
Andrea Scarpino 2016-07-21 20:41:50 +02:00
parent a2d6012aab
commit 035e3e68f2
10 changed files with 7 additions and 77 deletions

View file

@ -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 {

View file

@ -1,5 +1,8 @@
* Thu Jul 21 2016 Andrea Scarpino <me@andreascarpino.it> 1.3.2-1
- Restore gestures.
* Wed Jul 13 2016 Andrea Scarpino <me@andreascarpino.it> 1.3.1-1
* Add Serbian and Dutch translations.
- Add Serbian and Dutch translations.
* Fri Jun 03 2016 Andrea Scarpino <me@andreascarpino.it> 1.3-1
- Disable gestures.

View file

@ -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

View file

@ -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

View file

@ -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();

View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>CoverPage</name>
<message>
<location filename="../qml/cover/CoverPage.qml" line="25"/>
<source>Draw!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainPage</name>
<message>
<location filename="../qml/pages/MainPage.qml" line="76"/>
<source>Saving the canvas...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/MainPage.qml" line="112"/>
<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>

View file

@ -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>

View file

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

View file

@ -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>

View file

@ -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>