diff options
author | jan Iversen <jan@casacondor.com> | 2020-01-15 19:26:56 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-01-19 11:52:47 -0800 |
commit | bf7464788ec6f1efef0a7ea491bc12d849715398 (patch) | |
tree | e9407bf45c6bc84839a70fb451ca74b69ce87442 | |
parent | 12631ef2bbd07f95536f22195bab003ced864afa (diff) | |
download | subsurface-bf7464788ec6f1efef0a7ea491bc12d849715398.tar.gz |
mobile-widgets/qml: move cloudSettings to general section.
move gridlayout cloudSettings to TemplateSection general, without changing
anything (apart from adding a visible: attribute and removing the rectangle
used to create a line).
Signed-off-by: jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | mobile-widgets/qml/Settings.qml | 84 |
1 files changed, 39 insertions, 45 deletions
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index a976a1711..b8f6b02bc 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -28,55 +28,49 @@ Kirigami.ScrollablePage { title: qsTr("General settings") isExpanded: true - } - - GridLayout { - id: cloudSetting - columns: 3 - - TemplateLabel { - text: qsTr("Cloud status") - font.pointSize: subsurfaceTheme.headingPointSize - font.weight: Font.Light - Layout.topMargin: Kirigami.Units.largeSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 - Layout.columnSpan: 3 - } - TemplateLabel { - text: qsTr("Email") - Layout.preferredWidth: gridWidth * 0.15 - } - TemplateLabel { - text: Backend.cloud_verification_status === Enums.CS_NOCLOUD ? qsTr("Not applicable") : PrefCloudStorage.cloud_storage_email - font.pointSize: subsurfaceTheme.regularPointSize - Layout.preferredWidth: gridWidth * 0.60 - } - SsrfButton { - id: changeCloudSettings - text: qsTr("Change") - onClicked: { - Backend.cloud_verification_status = Enums.CS_UNKNOWN - manager.startPageText = qsTr("Starting..."); + GridLayout { + id: cloudSetting + visible: sectionGeneral.isExpanded + columns: 3 + + TemplateLabel { + text: qsTr("Cloud status") + font.pointSize: subsurfaceTheme.headingPointSize + font.weight: Font.Light + Layout.topMargin: Kirigami.Units.largeSpacing + Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 + Layout.columnSpan: 3 + } + TemplateLabel { + text: qsTr("Email") + Layout.preferredWidth: gridWidth * 0.15 + } + TemplateLabel { + text: Backend.cloud_verification_status === Enums.CS_NOCLOUD ? qsTr("Not applicable") : PrefCloudStorage.cloud_storage_email + Layout.preferredWidth: gridWidth * 0.60 + } + SsrfButton { + id: changeCloudSettings + text: qsTr("Change") + onClicked: { + Backend.cloud_verification_status = Enums.CS_UNKNOWN + manager.startPageText = qsTr("Starting..."); + } + } + TemplateLabel { + text: qsTr("Status") + Layout.preferredWidth: gridWidth * 0.15 + Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 + } + TemplateLabel { + text: describe[Backend.cloud_verification_status] + Layout.preferredWidth: gridWidth * 0.60 + Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 } - } - TemplateLabel { - text: qsTr("Status") - Layout.preferredWidth: gridWidth * 0.15 - Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 - } - TemplateLabel { - text: describe[Backend.cloud_verification_status] - Layout.preferredWidth: gridWidth * 0.60 - Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 } } - Rectangle { - color: subsurfaceTheme.darkerPrimaryColor - height: 1 - opacity: 0.5 - Layout.fillWidth: true - } + GridLayout { id: themeSettings columns: 3 |