From 36b089dc8c54916b6f9e1e8a9dfaaa6254afd071 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 10 Feb 2016 21:47:09 -0800 Subject: QML UI: close all other pages when switching cloud credentials Signed-off-by: Dirk Hohndel --- qt-mobile/qml/main.qml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml index 657158068..2c066e242 100644 --- a/qt-mobile/qml/main.qml +++ b/qt-mobile/qml/main.qml @@ -21,6 +21,13 @@ MobileComponents.ApplicationWindow { visible: false opacity: 0 + function returnTopPage() { + for (var i=stackView.depth; i>1; i--) { + stackView.pop() + } + detailsWindow.endEditMode() + } + globalDrawer: MobileComponents.GlobalDrawer { title: "Subsurface" titleIcon: "qrc:/qml/subsurface-mobile-icon.png" @@ -30,16 +37,13 @@ MobileComponents.ApplicationWindow { Action { text: "Dive list" onTriggered: { - for (var i=stackView.depth; i>1; i--) { - stackView.pop() - } - detailsWindow.endEditMode() + returnTopPage() } }, Action { text: "Cloud credentials" onTriggered: { - detailsWindow.endEditMode() + returnTopPage() oldStatus = manager.credentialStatus if (diveList.numDives > 0) { manager.startPageText = "Enter different credentials or return to dive list" -- cgit v1.2.3-70-g09d2