diff options
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/CloudCredentials.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveList.qml | 12 | ||||
| -rw-r--r-- | mobile-widgets/qml/Settings.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 18 |
4 files changed, 17 insertions, 17 deletions
diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index f148e9922..7869303e7 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -144,7 +144,7 @@ Item { text: qsTr("No cloud mode") onClicked: { manager.syncToCloud = false - prefs.credentialStatus = QMLPrefs.CS_NOCLOUD + prefs.credentialStatus = SsrfPrefs.CS_NOCLOUD manager.saveCloudCredentials() manager.openNoCloudRepo() } 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; } diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index cb268f423..d7a857f6f 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -42,7 +42,7 @@ Kirigami.ScrollablePage { Layout.preferredHeight: Kirigami.Units.gridUnit * 2 } Controls.Label { - text: prefs.credentialStatus === QMLPrefs.CS_NOCLOUD ? qsTr("Not applicable") : prefs.cloudUserName + text: prefs.credentialStatus === SsrfPrefs.CS_NOCLOUD ? qsTr("Not applicable") : prefs.cloudUserName Layout.alignment: Qt.AlignRight Layout.preferredWidth: gridWidth * 0.60 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 1ccab80e5..03d7238c3 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -186,10 +186,10 @@ Kirigami.ApplicationWindow { text: qsTr("Dive list") onTriggered: { manager.appendTextToLog("requested dive list with credential status " + prefs.credentialStatus) - if (prefs.credentialStatus == QMLPrefs.CS_UNKNOWN) { + if (prefs.credentialStatus == SsrfPrefs.CS_UNKNOWN) { // the user has asked to change credentials - if the credentials before that // were valid, go back to dive list - if (oldStatus == QMLPrefs.CS_VERIFIED) { + if (oldStatus == SsrfPrefs.CS_VERIFIED) { prefs.credentialStatus = oldStatus } } @@ -216,8 +216,8 @@ Kirigami.ApplicationWindow { name: ":/icons/ic_add.svg" } text: qsTr("Add dive manually") - enabled: prefs.credentialStatus === QMLPrefs.CS_VERIFIED || - prefs.credentialStatus === QMLPrefs.CS_NOCLOUD + enabled: prefs.credentialStatus === SsrfPrefs.CS_VERIFIED || + prefs.credentialStatus === SsrfPrefs.CS_NOCLOUD onTriggered: { globalDrawer.close() returnTopPage() // otherwise odd things happen with the page stack @@ -251,14 +251,14 @@ Kirigami.ApplicationWindow { name: ":/icons/cloud_sync.svg" } text: qsTr("Manual sync with cloud") - enabled: prefs.credentialStatus === QMLPrefs.CS_VERIFIED || - prefs.credentialStatus === QMLPrefs.CS_NOCLOUD + enabled: prefs.credentialStatus === SsrfPrefs.CS_VERIFIED || + prefs.credentialStatus === SsrfPrefs.CS_NOCLOUD onTriggered: { - if (prefs.credentialStatus === QMLPrefs.CS_NOCLOUD) { + if (prefs.credentialStatus === SsrfPrefs.CS_NOCLOUD) { returnTopPage() oldStatus = prefs.credentialStatus manager.startPageText = "Enter valid cloud storage credentials" - prefs.credentialStatus = QMLPrefs.CS_UNKNOWN + prefs.credentialStatus = SsrfPrefs.CS_UNKNOWN globalDrawer.close() } else { globalDrawer.close() @@ -273,7 +273,7 @@ Kirigami.ApplicationWindow { name: syncToCloud ? ":/icons/ic_cloud_off.svg" : ":/icons/ic_cloud_done.svg" } text: syncToCloud ? qsTr("Disable auto cloud sync") : qsTr("Enable auto cloud sync") - enabled: prefs.credentialStatus !== QMLPrefs.CS_NOCLOUD + enabled: prefs.credentialStatus !== SsrfPrefs.CS_NOCLOUD onTriggered: { syncToCloud = !syncToCloud if (!syncToCloud) { |