diff options
| -rw-r--r-- | mobile-widgets/qml/CloudCredentials.qml | 14 | ||||
| -rw-r--r-- | mobile-widgets/qml/StartPage.qml | 4 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 8 |
3 files changed, 12 insertions, 14 deletions
diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index 69c1d85c7..198e2605c 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -53,7 +53,7 @@ Item { Controls.Label { text: qsTr("Email") - visible: !rootItem.showPin + visible: !prefs.showPin font.pointSize: subsurfaceTheme.smallPointSize color: subsurfaceTheme.secondaryTextColor } @@ -61,7 +61,7 @@ Item { Controls.TextField { id: login text: prefs.cloudUserName - visible: !rootItem.showPin + visible: !prefs.showPin Layout.fillWidth: true inputMethodHints: Qt.ImhEmailCharactersOnly | Qt.ImhNoAutoUppercase @@ -69,7 +69,7 @@ Item { Controls.Label { text: qsTr("Password") - visible: !rootItem.showPin + visible: !prefs.showPin font.pointSize: subsurfaceTheme.smallPointSize color: subsurfaceTheme.secondaryTextColor } @@ -87,20 +87,20 @@ Item { Controls.Label { text: qsTr("PIN") - visible: rootItem.showPin + visible: prefs.showPin } Controls.TextField { id: pin text: "" Layout.fillWidth: true - visible: rootItem.showPin + visible: prefs.showPin } RowLayout { Layout.fillWidth: true Layout.margins: Kirigami.Units.smallSpacing spacing: Kirigami.Units.smallSpacing - visible: rootItem.showPin + visible: prefs.showPin SsrfButton { id: registerpin text: qsTr("Register") @@ -126,7 +126,7 @@ Item { Layout.fillWidth: true Layout.margins: Kirigami.Units.smallSpacing spacing: Kirigami.Units.smallSpacing - visible: !rootItem.showPin + visible: !prefs.showPin SsrfButton { id: signin_register_normal diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml index 16fa7cc3a..9c5e1a22c 100644 --- a/mobile-widgets/qml/StartPage.qml +++ b/mobile-widgets/qml/StartPage.qml @@ -28,7 +28,7 @@ Kirigami.ScrollablePage { } Controls.Label { id: explanationTextBasic - visible: !showPin + visible: !prefs.showPin Layout.fillWidth: true Layout.margins: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.gridUnit * 3 @@ -41,7 +41,7 @@ Kirigami.ScrollablePage { } Controls.Label { id: explanationTextPin - visible: showPin + visible: prefs.showPin Layout.fillWidth: true Layout.margins: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.gridUnit * 3 diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 16643e5dc..10ea9bb16 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -26,11 +26,9 @@ Kirigami.ApplicationWindow { pageStack.globalToolBar.preferredHeight: Math.round(Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1.5)) pageStack.globalToolBar.maximumHeight: Kirigami.Units.gridUnit * 2 - property alias oldStatus: prefs.oldStatus property alias notificationText: manager.notificationText property alias locationServiceEnabled: manager.locationServiceEnabled property alias pluggedInDeviceName: manager.pluggedInDeviceName - property alias showPin: prefs.showPin property alias defaultCylinderIndex: settingsWindow.defaultCylinderIndex property bool filterToggle: false property string filterPattern: "" @@ -249,8 +247,8 @@ Kirigami.ApplicationWindow { if (prefs.credentialStatus == CloudStatus.CS_UNKNOWN) { // the user has asked to change credentials - if the credentials before that // were valid, go back to dive list - if (oldStatus == CloudStatus.CS_VERIFIED) { - prefs.credentialStatus = oldStatus + if (prefs.oldStatus == CloudStatus.CS_VERIFIED) { + prefs.credentialStatus = prefs.oldStatus } } returnTopPage() @@ -334,7 +332,7 @@ Kirigami.ApplicationWindow { onTriggered: { if (prefs.credentialStatus === CloudStatus.CS_NOCLOUD) { returnTopPage() - oldStatus = prefs.credentialStatus + prefs.oldStatus = prefs.credentialStatus manager.startPageText = "Enter valid cloud storage credentials" prefs.credentialStatus = CloudStatus.CS_UNKNOWN globalDrawer.close() |