From 0eef27376a7f0f17ef0225d33db7bfe61f52d8f9 Mon Sep 17 00:00:00 2001
From: Joakim Bygdell <j.bygdell@gmail.com>
Date: Wed, 19 Jul 2017 16:39:43 +0200
Subject: QML UI: reorder the items of the global drawer

Change the order of the items in the global drawer and change the name of some of them.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
---
 mobile-widgets/qml/main.qml | 76 ++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'mobile-widgets')

diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 5fc9adc7a..5b0c67db3 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -130,30 +130,7 @@ Kirigami.ApplicationWindow {
 				}
 			},
 			Kirigami.Action {
-				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()
-					}
-				}
-			},
-			Kirigami.Action {
-				text: qsTr("Manage dives")
+				text: qsTr("Dive managment")
 				Kirigami.Action {
 					text: qsTr("Add dive manually")
 					enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL || manager.credentialStatus === QMLManager.NOCLOUD
@@ -170,6 +147,12 @@ Kirigami.ApplicationWindow {
 						stackView.push(downloadFromDc)
 					}
 				}
+				Kirigami.Action {
+					text: qsTr("Apply GPS Fixes")
+					onTriggered: {
+						manager.applyGpsData();
+					}
+				}
 				Kirigami.Action {
 					text: qsTr("Manual sync with cloud")
 					enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL || manager.credentialStatus === QMLManager.NOCLOUD
@@ -205,12 +188,6 @@ if you have network connectivity and want to sync your data to cloud storage."),
 				text: qsTr("GPS")
 				enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL
 				visible: (Qt.platform.os !== "ios")
-				Kirigami.Action {
-					text: qsTr("GPS-tag dives")
-					onTriggered: {
-						manager.applyGpsData();
-					}
-				}
 
 				Kirigami.Action {
 					text: qsTr("Upload GPS data")
@@ -242,6 +219,36 @@ if you have network connectivity and want to sync your data to cloud storage."),
 					}
 				}
 			},
+			Kirigami.Action {
+				text: qsTr("About")
+				onTriggered: {
+					stackView.push(aboutWindow)
+					detailsWindow.endEditMode()
+				}
+			},
+			Kirigami.Action {
+				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()
+					}
+				}
+			},
 			Kirigami.Action {
 				text: qsTr("Developer")
 				Kirigami.Action {
@@ -259,17 +266,10 @@ if you have network connectivity and want to sync your data to cloud storage."),
 				}
 			},
 			Kirigami.Action {
-				text: qsTr("User manual")
+				text: qsTr("Help")
 				onTriggered: {
 					Qt.openUrlExternally("https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual/")
 				}
-			},
-			Kirigami.Action {
-				text: qsTr("About")
-				onTriggered: {
-					stackView.push(aboutWindow)
-					detailsWindow.endEditMode()
-				}
 			}
 		] // end actions
 
-- 
cgit v1.2.3-70-g09d2