From 164cafe5d33e32ddd05a4a66673f37f7725cdb1d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 12 Jul 2015 10:56:48 -0700 Subject: QML UI: use stackView to show sub windows QML on Android doesn't support multiple windows, so dialogs that work on the desktop are not a good solution on Android. A much more natural way to present sub windows is a stackView. In order to do this Preferences needs to be an item and the structure of the ApplicationWindow needs to change a bit. This also removes the hard coded sizes and instead tries to design this in a resolution independent manner. The diff appears larger than the actual change because of an increase of indentation for the ApplicationWindow content. Signed-off-by: Dirk Hohndel --- qt-mobile/Preferences.qml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'qt-mobile/Preferences.qml') diff --git a/qt-mobile/Preferences.qml b/qt-mobile/Preferences.qml index 5f089b496..a628384d9 100644 --- a/qt-mobile/Preferences.qml +++ b/qt-mobile/Preferences.qml @@ -5,7 +5,7 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import org.subsurfacedivelog.mobile 1.0 -Window { +Item { id: loginWindow signal accept @@ -14,8 +14,6 @@ Window { property string password: password.text; property bool issave: savePassword.checked; - flags: Qt.Dialog - modality: Qt.WindowModal GridLayout { columns: 2 anchors.centerIn: parent @@ -66,8 +64,7 @@ Window { manager.cloudUserName = login.text manager.cloudPassword = password.text manager.savePreferences() - loginWindow.close(); - loginWindow.accept(); + stackView.pop() } } } @@ -80,7 +77,7 @@ Window { text: "Cancel" onClicked: { - loginWindow.close(); + stackView.pop(); } } } -- cgit v1.2.3-70-g09d2