diff options
| author |  jan Iversen <jani@apache.org> | 2018-07-05 20:37:53 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-10 10:30:50 -0700 |
| commit | 8d66633fe798f6c45978ea1b0d47aa04625d4ac5 (patch) | |
| tree | 1a6b63b6720f52f3263fa371e6c9f95ccfacf3e7 /mobile-widgets/qml/DiveList.qml | |
| parent | 7103f36c7c9ed0117a9f600cee6b2565d98a6638 (diff) | |
| download | subsurface-8d66633fe798f6c45978ea1b0d47aa04625d4ac5.tar.gz | |
core: make qPref::cloud_status the only version of the enum
add enum to qPref and remove elsewhere
update source core to reference qPref.
the enum cannot be in pref.h because it is to be used in qml and Q_ENUM
need the enum to be defined as part of the class
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'mobile-widgets/qml/DiveList.qml')
| -rw-r--r-- | mobile-widgets/qml/DiveList.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 36929951a..af7537064 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -23,7 +23,7 @@ Kirigami.ScrollablePage { supportsRefreshing: true onRefreshingChanged: { if (refreshing) { - if (prefs.credentialStatus === QMLPrefs.CS_VERIFIED) { + if (prefs.credentialStatus === SsrfPrefs.CS_VERIFIED) { console.log("User pulled down dive list - syncing with cloud storage") detailsWindow.endEditMode() manager.saveChangesCloud(true) @@ -339,8 +339,8 @@ Kirigami.ScrollablePage { StartPage { id: startPage anchors.fill: parent - opacity: credentialStatus === QMLPrefs.CS_NOCLOUD || - (credentialStatus === QMLPrefs.CS_VERIFIED) ? 0 : 1 + opacity: credentialStatus === SsrfPrefs.CS_NOCLOUD || + (credentialStatus === SsrfPrefs.CS_VERIFIED) ? 0 : 1 visible: opacity > 0 Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } } function setupActions() { @@ -348,8 +348,8 @@ Kirigami.ScrollablePage { page.actions.main = null page.actions.right = null page.title = qsTr("Cloud credentials") - } else if (prefs.credentialStatus === QMLPrefs.CS_VERIFIED || - prefs.credentialStatus === QMLPrefs.CS_NOCLOUD) { + } else if (prefs.credentialStatus === SsrfPrefs.CS_VERIFIED || + prefs.credentialStatus === SsrfPrefs.CS_NOCLOUD) { page.actions.main = page.downloadFromDCAction page.actions.right = page.addDiveAction page.title = qsTr("Dive list") @@ -427,7 +427,7 @@ Kirigami.ScrollablePage { onBackRequested: { if (startPage.visible && diveListView.count > 0 && - prefs.credentialStatus !== QMLPrefs.CS_INCORRECT_USER_PASSWD) { + prefs.credentialStatus !== SsrfPrefs.CS_INCORRECT_USER_PASSWD) { prefs.credentialStatus = oldStatus event.accepted = true; } |