From 8813f13bfdf8269c6933d43c871a6660ce8ed35c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 27 Jan 2016 19:05:13 -0800 Subject: [PATCH] QML UI: end edit mode when switching to different page Fixes #997 Signed-off-by: Dirk Hohndel --- qt-mobile/qml/main.qml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml index 4422d5b07..6762676f9 100644 --- a/qt-mobile/qml/main.qml +++ b/qt-mobile/qml/main.qml @@ -20,6 +20,11 @@ MobileComponents.ApplicationWindow { visible: false opacity: 0 + function endEditMode() { + detailsWindow.state = "view" + // somehow also should deal with the icon for the Action Button + } + globalDrawer: MobileComponents.GlobalDrawer { title: "Subsurface" titleIcon: "qrc:/qml/subsurface-mobile-icon.png" @@ -32,18 +37,21 @@ MobileComponents.ApplicationWindow { for (var i=stackView.depth; i>1; i--) { stackView.pop() } + endEditMode() } }, Action { text: "Cloud credentials" onTriggered: { stackView.push(cloudCredWindow) + endEditMode() } }, Action { text: "Preferences" onTriggered: { stackView.push(prefsWindow) + endEditMode() } }, MobileComponents.ActionGroup { @@ -51,6 +59,7 @@ MobileComponents.ApplicationWindow { Action { text: "Download from computer" onTriggered: { + endEditMode() stackView.push(downloadDivesWindow) } } @@ -77,12 +86,14 @@ MobileComponents.ApplicationWindow { Action { text: "Refresh" onTriggered: { + endEditMode() manager.loadDives(); } } Action { text: "Upload to cloud" onTriggered: { + endEditMode() manager.saveChanges(); } }