mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: when chosing 'no cloud', switch to dive list

Browse source 
Currently we don't remember that we picked 'no cloud' across restarts.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-22 05:19:34 -07:00
parent 6b43b3015d
commit 27fccbbe4e
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mobile-widgets/qml/DiveList.qml
View file

@ -211,7 +211,7 @@ Kirigami.ScrollablePage {
ScrollView { ScrollView {
id: startPageWrapper id: startPageWrapper
anchors.fill: parent anchors.fill: parent
opacity: (diveListView.count > 0 && (credentialStatus == QMLManager.VALID || credentialStatus == QMLManager.VALID_EMAIL)) ? 0 : 1 opacity: credentialStatus === QMLManager.NOCLOUD || (diveListView.count > 0 && (credentialStatus == QMLManager.VALID || credentialStatus == QMLManager.VALID_EMAIL)) ? 0 : 1
visible: opacity > 0 visible: opacity > 0
Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } } Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } }
onVisibleChanged: { onVisibleChanged: {
@ -219,10 +219,12 @@ Kirigami.ScrollablePage {
page.actions.main = page.saveAction page.actions.main = page.saveAction
page.actions.right = page.offlineAction page.actions.right = page.offlineAction
title = "Cloud credentials" title = "Cloud credentials"
} else if(manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL) { } else if(manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL || manager.credentialStatus === QMLManager.NOCLOUD) {
page.actions.main = page.addDiveAction page.actions.main = page.addDiveAction
page.actions.right = null page.actions.right = null
title = "Dive list" title = "Dive list"
if (diveListView.count === 0)
showPassiveNotification(qsTr("Please tap the '+' button to add a dive"), 3000)
} else { } else {
page.actions.main = null page.actions.main = null
page.actions.right = null page.actions.right = null
@ -283,6 +285,7 @@ Kirigami.ScrollablePage {
iconName: "qrc:/qml/nocloud.svg" iconName: "qrc:/qml/nocloud.svg"
onTriggered: { onTriggered: {
manager.syncToCloud = false manager.syncToCloud = false
manager.credentialStatus = QMLManager.NOCLOUD
} }
} }

3
mobile-widgets/qmlmanager.h
View file

@ -39,7 +39,8 @@ public:
UNKNOWN, UNKNOWN,
INVALID, INVALID,
VALID_EMAIL, VALID_EMAIL,
VALID VALID,
NOCLOUD
}; };
static QMLManager *instance(); static QMLManager *instance();