diff options
| author |  jan Iversen <jan@casacondor.com> | 2019-12-28 17:30:14 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-12-29 12:20:19 -0800 |
| commit | 783332561a433e8ff8be8b0bceb25a051967d3cf (patch) | |
| tree | 54789d3fb2fe49aa9af081c54413d07834f78015 /mobile-widgets/qml | |
| parent | beacc00f2df2c76b82f398ff839a18a9b404e1a5 (diff) | |
| download | subsurface-783332561a433e8ff8be8b0bceb25a051967d3cf.tar.gz | |
mobile-widgets: credentialStatus() -> cloud_verification_status()
Replace all credentialStatus() with cloud_verification_status()
Where both prefs.credentialStatus and
PrefCloudStorage.cloud_verification_status are being set, remove
prefs.credentialStatus.
These replacements are valid since credentialStatus() is a simple
envelope over cloud_verification_status().
Also remove qmlPrefs::credentialStatus() from qmlPrefs (mostly to ensure no
replacements was forgotten).
Signed-off-by: Jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/CloudCredentials.qml | 4 | ||||
| -rw-r--r-- | mobile-widgets/qml/Settings.qml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index 12f8a53d1..6bed7b1f7 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -110,7 +110,6 @@ Item { text: qsTr("Cancel") onClicked: { PrefCloudStorage.cloud_verification_status = CloudStatus.CS_UNKNOWN - prefs.cloudCredentials = CloudStatus.CS_UNKNOWN manager.startPageText = qsTr("Check credentials..."); prefs.showPin = false; } @@ -140,7 +139,8 @@ Item { onClicked: { manager.setGitLocalOnly(true) PrefCloudStorage.cloud_auto_sync = false - prefs.credentialStatus = CloudStatus.CS_NOCLOUD + prefs.oldStatus = PrefCloudStorage.cloud_verification_status + PrefCloudStorage.cloud_verification_status = CloudStatus.CS_NOCLOUD manager.saveCloudCredentials("", "", "") manager.openNoCloudRepo() } diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index ae5f95751..03ffa13a9 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -55,7 +55,6 @@ Kirigami.ScrollablePage { text: qsTr("Change") onClicked: { PrefCloudStorage.cloud_verification_status = CloudStatus.CS_UNKNOWN - prefs.credentialStatus = CloudStatus.CS_UNKNOWN manager.startPageText = qsTr("Starting..."); prefs.showPin = false; } @@ -68,7 +67,7 @@ Kirigami.ScrollablePage { color: subsurfaceTheme.textColor } Controls.Label { - text: describe[prefs.credentialStatus] + text: describe[PrefCloudStorage.cloud_verification_status] font.pointSize: subsurfaceTheme.regularPointSize Layout.preferredWidth: gridWidth * 0.60 Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 |