diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2017-08-03 14:55:09 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-09-04 07:38:30 -0700 |
| commit | 9a2d503d3b3d2c0a4631ef6c26dcf1c6785a4e56 (patch) | |
| tree | 31270a689b6d00666553a0cc71ee9bbb27a70a7a /mobile-widgets/qml/main.qml | |
| parent | 7e2803d6dd65016bfd925345adf3abdfbbbe6056 (diff) | |
| download | subsurface-9a2d503d3b3d2c0a4631ef6c26dcf1c6785a4e56.tar.gz | |
Unify credential states
Having two different enums around with more or less the same
definition has lead to unclear code. After removing two not needed
states on the mobile end, the remaining step to one enum for the
credential state becomes almost is simple rename operation.
Unfortunately, I do not know a way to embed a plain C enum
from pref.h into the QMLManager object. So after this, there
are still 2 enums around, but now identical.
This commit is not changing any functionality.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'mobile-widgets/qml/main.qml')
| -rw-r--r-- | mobile-widgets/qml/main.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index e34e89e50..1cf1ea35d 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -117,10 +117,10 @@ Kirigami.ApplicationWindow { text: qsTr("Dive list") onTriggered: { manager.appendTextToLog("requested dive list with credential status " + manager.credentialStatus) - if (manager.credentialStatus == QMLManager.UNKNOWN) { + if (manager.credentialStatus == QMLManager.CS_UNKNOWN) { // the user has asked to change credentials - if the credentials before that // were valid, go back to dive list - if (oldStatus == QMLManager.VALID) { + if (oldStatus == QMLManager.CS_VERIFIED) { manager.credentialStatus = oldStatus } } @@ -134,7 +134,7 @@ Kirigami.ApplicationWindow { Kirigami.Action { iconName: "icons/ic_add.svg" text: qsTr("Add dive manually") - enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.NOCLOUD + enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD onTriggered: { returnTopPage() // otherwise odd things happen with the page stack startAddDive() @@ -159,13 +159,13 @@ Kirigami.ApplicationWindow { Kirigami.Action { iconName: "icons/cloud_sync.svg" text: qsTr("Manual sync with cloud") - enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.NOCLOUD + enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD onTriggered: { - if (manager.credentialStatus === QMLManager.NOCLOUD) { + if (manager.credentialStatus === QMLManager.CS_NOCLOUD) { returnTopPage() oldStatus = manager.credentialStatus manager.startPageText = "Enter valid cloud storage credentials" - manager.credentialStatus = QMLManager.UNKNOWN + manager.credentialStatus = QMLManager.CS_UNKNOWN globalDrawer.close() } else { globalDrawer.close() @@ -178,7 +178,7 @@ Kirigami.ApplicationWindow { Kirigami.Action { iconName: syncToCloud ? "icons/ic_cloud_off.svg" : "icons/ic_cloud_done.svg" text: syncToCloud ? qsTr("Offline mode") : qsTr("Enable auto cloud sync") - enabled: manager.credentialStatus !== QMLManager.NOCLOUD + enabled: manager.credentialStatus !== QMLManager.CS_NOCLOUD onTriggered: { syncToCloud = !syncToCloud if (!syncToCloud) { |