QML UI: move theme setting into preferences

And reorganize settings and preferences a bit.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

mobile-widgets/qml/Preferences.qml

@@ -40,6 +40,39 @@ Kirigami.Page {
 			Layout.columnSpan: 2
 		}
 
+		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

mobile-widgets/qml/main.qml

@@ -128,6 +128,8 @@ Kirigami.ApplicationWindow {
 					globalDrawer.close()
 				}
 			},
+			Kirigami.Action {
+				text: qsTr("Settings")
 				Kirigami.Action {
 					text: qsTr("Cloud credentials")
 					onTriggered: {
@@ -138,9 +140,16 @@ Kirigami.ApplicationWindow {
 						} else {
 							manager.startPageText = "Enter valid cloud storage credentials"
 						}
-
 						manager.credentialStatus = QMLManager.UNKNOWN
 					}
+				}
+				Kirigami.Action {
+					text: qsTr("Preferences")
+					onTriggered: {
+						stackView.push(prefsWindow)
+						detailsWindow.endEditMode()
+					}
+				}
 			},
 			Kirigami.Action {
 				text: qsTr("Manage dives")
@@ -235,13 +244,6 @@ Kirigami.ApplicationWindow {
 						manager.clearGpsData();
 					}
 				}
-				Kirigami.Action {
-					text: qsTr("Preferences")
-					onTriggered: {
-						stackView.push(prefsWindow)
-						detailsWindow.endEditMode()
-					}
-				}
 			},
 			Kirigami.Action {
 				text: qsTr("Developer")
@@ -252,27 +254,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: {