QML UI: move theme setting into preferences

And reorganize settings and preferences a bit.

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

1 files changed, 19 insertions, 38 deletions

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)