mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile-widgets/qml: settings Control.label -> TemplateLabel

Browse source 
Replace Control.label with TemplateLabel, in order to use
common font/color scheme.

Signed-off-by: jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2020-01-15 14:45:22 +01:00 • committed by Dirk Hohndel
parent da25b107a5
commit 2ce32277db
1 changed files with 27 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

97
mobile-widgets/qml/Settings.qml
View file

@ -29,26 +29,22 @@ Kirigami.ScrollablePage {
id: cloudSetting id: cloudSetting
columns: 3 columns: 3
Controls.Label { TemplateLabel {
text: qsTr("Cloud status") text: qsTr("Cloud status")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3 Layout.columnSpan: 3
} }
Controls.Label { TemplateLabel {
text: qsTr("Email") text: qsTr("Email")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.15 Layout.preferredWidth: gridWidth * 0.15
color: subsurfaceTheme.textColor
} }
Controls.Label { TemplateLabel {
text: Backend.cloud_verification_status === Enums.CS_NOCLOUD ? qsTr("Not applicable") : PrefCloudStorage.cloud_storage_email text: Backend.cloud_verification_status === Enums.CS_NOCLOUD ? qsTr("Not applicable") : PrefCloudStorage.cloud_storage_email
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.60 Layout.preferredWidth: gridWidth * 0.60
color: subsurfaceTheme.textColor
} }
SsrfButton { SsrfButton {
id: changeCloudSettings id: changeCloudSettings
@ -58,19 +54,15 @@ Kirigami.ScrollablePage {
manager.startPageText = qsTr("Starting..."); manager.startPageText = qsTr("Starting...");
} }
} }
Controls.Label { TemplateLabel {
text: qsTr("Status") text: qsTr("Status")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.15 Layout.preferredWidth: gridWidth * 0.15
Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
color: subsurfaceTheme.textColor
} }
Controls.Label { TemplateLabel {
text: describe[Backend.cloud_verification_status] text: describe[Backend.cloud_verification_status]
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.60 Layout.preferredWidth: gridWidth * 0.60
Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5 Layout.preferredHeight: Kirigami.Units.gridUnit * 1.5
color: subsurfaceTheme.textColor
} }
} }
@ -84,19 +76,16 @@ Kirigami.ScrollablePage {
id: themeSettings id: themeSettings
columns: 3 columns: 3
Controls.Label { TemplateLabel {
text: qsTr("Theme") text: qsTr("Theme")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3 Layout.columnSpan: 3
} }
Controls.Label { TemplateLabel {
text: qsTr("Blue") text: qsTr("Blue")
font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.textColor
rightPadding: Kirigami.Units.gridUnit rightPadding: Kirigami.Units.gridUnit
Layout.preferredWidth: gridWidth * 0.15 Layout.preferredWidth: gridWidth * 0.15
} }
@ -147,13 +136,11 @@ Kirigami.ScrollablePage {
} }
} }
Controls.Label { TemplateLabel {
id: pinkLabel id: pinkLabel
text: qsTr("Pink") text: qsTr("Pink")
font.pointSize: subsurfaceTheme.regularPointSize
rightPadding: Kirigami.Units.gridUnit rightPadding: Kirigami.Units.gridUnit
Layout.preferredWidth: gridWidth * 0.15 Layout.preferredWidth: gridWidth * 0.15
color: subsurfaceTheme.textColor
} }
Row { Row {
Layout.preferredWidth: gridWidth * 0.6 Layout.preferredWidth: gridWidth * 0.6
@ -203,10 +190,8 @@ Kirigami.ScrollablePage {
} }
} }
Controls.Label { TemplateLabel {
text: qsTr("Dark") text: qsTr("Dark")
font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.textColor
rightPadding: Kirigami.Units.gridUnit rightPadding: Kirigami.Units.gridUnit
Layout.preferredWidth: gridWidth * 0.15 Layout.preferredWidth: gridWidth * 0.15
} }
@ -256,11 +241,10 @@ Kirigami.ScrollablePage {
PrefDisplay.theme = subsurfaceTheme.currentTheme PrefDisplay.theme = subsurfaceTheme.currentTheme
} }
} }
Controls.Label { TemplateLabel {
text: qsTr("Scaling") text: qsTr("Scaling")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3 Layout.columnSpan: 3
@ -307,21 +291,18 @@ Kirigami.ScrollablePage {
id: gpsPrefs id: gpsPrefs
columns: 2 columns: 2
Controls.Label { TemplateLabel {
text: qsTr("GPS location service") text: qsTr("GPS location service")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Distance threshold (meters)") text: qsTr("Distance threshold (meters)")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
Controls.TextField { Controls.TextField {
@ -335,11 +316,9 @@ Kirigami.ScrollablePage {
} }
} }
Controls.Label { TemplateLabel {
text: qsTr("Time threshold (minutes)") text: qsTr("Time threshold (minutes)")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
Controls.TextField { Controls.TextField {
@ -366,19 +345,16 @@ Kirigami.ScrollablePage {
columns: 2 columns: 2
Layout.rightMargin: Kirigami.Units.gridUnit * 1.5 Layout.rightMargin: Kirigami.Units.gridUnit * 1.5
Controls.Label { TemplateLabel {
text: qsTr("Default Cylinder") text: qsTr("Default Cylinder")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Cylinder:") text: qsTr("Cylinder:")
font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.textColor
} }
Controls.ComboBox { Controls.ComboBox {
id: defaultCylinderBox id: defaultCylinderBox
@ -401,20 +377,17 @@ Kirigami.ScrollablePage {
GridLayout { GridLayout {
id: divecomputers id: divecomputers
columns: 2 columns: 2
Controls.Label { TemplateLabel {
text: qsTr("Dive computers") text: qsTr("Dive computers")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Forget remembered dive computers") text: qsTr("Forget remembered dive computers")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfButton { SsrfButton {
id: forgetDCButton id: forgetDCButton
@ -439,21 +412,18 @@ Kirigami.ScrollablePage {
GridLayout { GridLayout {
id: unit_system id: unit_system
columns: 2 columns: 2
Controls.Label { TemplateLabel {
text: qsTr("Units") text: qsTr("Units")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Use Imperial Units") text: qsTr("Use Imperial Units")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfSwitch { SsrfSwitch {
id: imperialButton id: imperialButton
@ -466,11 +436,9 @@ Kirigami.ScrollablePage {
manager.refreshDiveList() manager.refreshDiveList()
} }
} }
Controls.Label { TemplateLabel {
text: qsTr("Use Metric Units") text: qsTr("Use Metric Units")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfSwitch { SsrfSwitch {
id: metricButtton id: metricButtton
@ -495,20 +463,17 @@ Kirigami.ScrollablePage {
id: filterPrefs id: filterPrefs
columns: 2 columns: 2
Controls.Label { TemplateLabel {
text: qsTr("Filter preferences") text: qsTr("Filter preferences")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Include notes in full text filtering") text: qsTr("Include notes in full text filtering")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfSwitch { SsrfSwitch {
@ -520,11 +485,9 @@ Kirigami.ScrollablePage {
} }
} }
Controls.Label { TemplateLabel {
text: qsTr("Match filter case sensitive") text: qsTr("Match filter case sensitive")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfSwitch { SsrfSwitch {
@ -548,21 +511,18 @@ Kirigami.ScrollablePage {
GridLayout { GridLayout {
id: whichBluetoothDevices id: whichBluetoothDevices
columns: 2 columns: 2
Controls.Label { TemplateLabel {
text: qsTr("Bluetooth") text: qsTr("Bluetooth")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Temporarily show all bluetooth devices \neven if not recognized as dive computers.\nPlease report DCs that need this setting") text: qsTr("Temporarily show all bluetooth devices \neven if not recognized as dive computers.\nPlease report DCs that need this setting")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfSwitch { SsrfSwitch {
id: nonDCButton id: nonDCButton
@ -584,21 +544,18 @@ Kirigami.ScrollablePage {
GridLayout { GridLayout {
id: developer id: developer
columns: 2 columns: 2
Controls.Label { TemplateLabel {
text: qsTr("Developer") text: qsTr("Developer")
font.pointSize: subsurfaceTheme.headingPointSize font.pointSize: subsurfaceTheme.headingPointSize
font.weight: Font.Light font.weight: Font.Light
color: subsurfaceTheme.textColor
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2 Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
Controls.Label { TemplateLabel {
text: qsTr("Display Developer menu") text: qsTr("Display Developer menu")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75 Layout.preferredWidth: gridWidth * 0.75
color: subsurfaceTheme.textColor
} }
SsrfSwitch { SsrfSwitch {
id: developerButton id: developerButton