aboutsummaryrefslogtreecommitdiffstats
path: root/mobile-widgets
diff options
context:
space:
mode:
Diffstat (limited to 'mobile-widgets')
-rw-r--r--mobile-widgets/qml/Preferences.qml33
-rw-r--r--mobile-widgets/qml/main.qml57
2 files changed, 52 insertions, 38 deletions
diff --git a/mobile-widgets/qml/Preferences.qml b/mobile-widgets/qml/Preferences.qml
index 14b4ec6c5..ef3395ba8 100644
--- a/mobile-widgets/qml/Preferences.qml
+++ b/mobile-widgets/qml/Preferences.qml
@@ -41,6 +41,39 @@ Kirigami.Page {
}
Kirigami.Heading {
+ text: qsTr("Theme")
+ level: 3
+ Layout.topMargin: Kirigami.Units.largeSpacing
+ Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
+ Layout.columnSpan: 2
+ }
+
+ RadioButton {
+ text: qsTr("Blue")
+ checked: subsurfaceTheme.currentTheme === "Blue"
+ Layout.columnSpan: 2
+ onClicked: {
+ blueTheme()
+ }
+ }
+ RadioButton {
+ text: qsTr("Pink")
+ checked: subsurfaceTheme.currentTheme === "Pink"
+ Layout.columnSpan: 2
+ onClicked: {
+ pinkTheme()
+ }
+ }
+ RadioButton {
+ text: qsTr("Dark")
+ checked: subsurfaceTheme.currentTheme === "Dark"
+ Layout.columnSpan: 2
+ onClicked: {
+ darkTheme()
+ }
+ }
+
+ Kirigami.Heading {
text: qsTr("Subsurface GPS data webservice")
level: 3
Layout.topMargin: Kirigami.Units.largeSpacing
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index b57ff2e2a..bf5354ef6 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -129,17 +129,26 @@ Kirigami.ApplicationWindow {
}
},
Kirigami.Action {
- text: qsTr("Cloud credentials")
- onTriggered: {
- returnTopPage()
- oldStatus = manager.credentialStatus
- if (diveList.numDives > 0) {
- manager.startPageText = "Enter different credentials or return to dive list"
- } else {
- manager.startPageText = "Enter valid cloud storage credentials"
+ text: qsTr("Settings")
+ Kirigami.Action {
+ text: qsTr("Cloud credentials")
+ onTriggered: {
+ returnTopPage()
+ oldStatus = manager.credentialStatus
+ if (diveList.numDives > 0) {
+ manager.startPageText = "Enter different credentials or return to dive list"
+ } else {
+ manager.startPageText = "Enter valid cloud storage credentials"
+ }
+ manager.credentialStatus = QMLManager.UNKNOWN
+ }
+ }
+ Kirigami.Action {
+ text: qsTr("Preferences")
+ onTriggered: {
+ stackView.push(prefsWindow)
+ detailsWindow.endEditMode()
}
-
- manager.credentialStatus = QMLManager.UNKNOWN
}
},
Kirigami.Action {
@@ -235,13 +244,6 @@ Kirigami.ApplicationWindow {
manager.clearGpsData();
}
}
- Kirigami.Action {
- text: qsTr("Preferences")
- onTriggered: {
- stackView.push(prefsWindow)
- detailsWindow.endEditMode()
- }
- }
},
Kirigami.Action {
text: qsTr("Developer")
@@ -253,27 +255,6 @@ Kirigami.ApplicationWindow {
}
Kirigami.Action {
- text: qsTr("Switch to pink theme")
- onTriggered: {
- pinkTheme()
- }
- }
-
- Kirigami.Action {
- text: qsTr("Switch to blue theme")
- onTriggered: {
- blueTheme()
- }
- }
-
- Kirigami.Action {
- text: qsTr("Switch to dark theme")
- onTriggered: {
- darkTheme()
- }
- }
-
- Kirigami.Action {
text: qsTr("Theme information")
onTriggered: {
stackView.push(themetest)