mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
QML UI: rework cloud credentials block
Previously, we could edit the cloud credentials in basically two places. At startup of the app from a fresh install (and no previous data on the device), and from the settings. Issue #515 proposes only one way. However, we need a way to access the new credential UI pages, so that the pages at a fresh install of the app can be reused, for example for account switching. This commit replaces the settings cloud credentials block by a simple (not editable) display of the current credentials, and a button to access the initial pages, for all management tasks on the credentials. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
parent
0af64e4986
commit
81eb8466b2
1 changed files with 52 additions and 6 deletions
|
@ -13,16 +13,62 @@ Kirigami.ScrollablePage {
|
||||||
title: qsTr("Settings")
|
title: qsTr("Settings")
|
||||||
|
|
||||||
property real gridWidth: settingsPage.width - Kirigami.Units.gridUnit
|
property real gridWidth: settingsPage.width - Kirigami.Units.gridUnit
|
||||||
|
property var describe: [qsTr("Undefined"),
|
||||||
|
qsTr("Incorrect username/password combination"),
|
||||||
|
qsTr("Credentials need to be verified"),
|
||||||
|
qsTr("Credentials verified"),
|
||||||
|
qsTr("No cloud mode")]
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
width: gridWidth
|
width: gridWidth
|
||||||
CloudCredentials {
|
GridLayout {
|
||||||
id: cloudCredentials
|
id: cloudSetting
|
||||||
Layout.fillWidth: true
|
columns: 3
|
||||||
Layout.rightMargin: Kirigami.Units.smallSpacing
|
Layout.bottomMargin: Kirigami.Units.gridUnit
|
||||||
Layout.topMargin: - Kirigami.Units.gridUnit
|
|
||||||
property int headingLevel: 4
|
Kirigami.Heading {
|
||||||
|
text: qsTr("Cloud status")
|
||||||
|
color: subsurfaceTheme.textColor
|
||||||
|
level: 4
|
||||||
|
Layout.topMargin: Kirigami.Units.largeSpacing
|
||||||
|
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
|
||||||
|
Layout.columnSpan: 3
|
||||||
|
}
|
||||||
|
Kirigami.Label {
|
||||||
|
text: qsTr("Email")
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
Layout.preferredWidth:gridWidth * 0.15
|
||||||
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
|
||||||
|
}
|
||||||
|
Kirigami.Label {
|
||||||
|
text: manager.credentialStatus === QMLManager.CS_NOCLOUD?qsTr("Not applicable"):manager.cloudUserName
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
Layout.preferredWidth:gridWidth * 0.60
|
||||||
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
|
||||||
|
}
|
||||||
|
SsrfButton {
|
||||||
|
id:changeCloudSettings
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
text: qsTr("Change")
|
||||||
|
onClicked: {
|
||||||
|
manager.cancelCredentialsPinSetup()
|
||||||
|
rootItem.returnTopPage()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Kirigami.Label {
|
||||||
|
text: qsTr("Status")
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
Layout.preferredWidth:gridWidth * 0.15
|
||||||
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
|
||||||
|
}
|
||||||
|
Kirigami.Label {
|
||||||
|
text: describe[manager.credentialStatus]
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
Layout.preferredWidth:gridWidth * 0.60
|
||||||
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
color: subsurfaceTheme.darkerPrimaryColor
|
color: subsurfaceTheme.darkerPrimaryColor
|
||||||
height: 1
|
height: 1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue