mobile UI: restructure menu

This changes the 'GPS' entry to be called 'Location', moves the 'Map' entry
below that, and reuses the map icon for both the map inside this submenu and
for the main menu item.

It moves the 'About' entry under 'Help' and both 'Export' and 'Dive summary'
under 'Dive management'.

This way we have only five (or with 'Developer' enabled, six) entries in the
main menu making it much more appropriate for really tiny screens.

Additionally, the entrieis moved into sub-menus are ones that are not all that
commonly used.

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

1 files changed, 44 insertions, 45 deletions

diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 679e54131..cd740685b 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -241,15 +241,6 @@ Kirigami.ApplicationWindow {
 			},
 			Kirigami.Action {
 				icon {
-					name: ":/icons/map-globe.svg"
-				}
-				text: mapPage.title
-				onTriggered: {
-					showMap()
-				}
-			},
-			Kirigami.Action {
-				icon {
 					name: ":/icons/ic_sync.svg"
 				}
 				text: qsTr("Dive management")
@@ -333,14 +324,35 @@ if you have network connectivity and want to sync your data to cloud storage."),
 						}
 					}
 				}
+				Kirigami.Action {
+					icon {
+						name: ":/icons/sigma.svg"
+					}
+					text: qsTr("Dive summary")
+					onTriggered: {
+						globalDrawer.close()
+						pageStack.push(diveSummaryWindow)
+						detailsWindow.endEditMode()
+					}
+				}
+				Kirigami.Action {
+					icon {
+						name: ":/icons/ic_cloud_upload.svg"
+					}
+					text: qsTr("Export")
+					onTriggered: {
+						globalDrawer.close()
+						pageStack.push(exportWindow)
+						detailsWindow.endEditMode()
+					}
+				}
 			},
 			Kirigami.Action {
 				icon {
-					name: ":/icons/ic_place.svg"
+					name: ":/icons/map-globe.svg"
 				}
-				text: qsTr("GPS")
+				text: qsTr("Location")
 				visible: true
-
 				Kirigami.Action {
 					icon {
 						name: ":/go-previous-symbolic"
@@ -350,6 +362,15 @@ if you have network connectivity and want to sync your data to cloud storage."),
 				}
 				Kirigami.Action {
 					icon {
+						name: ":/icons/map-globe.svg"
+					}
+					text: mapPage.title
+					onTriggered: {
+						showMap()
+					}
+				}
+				Kirigami.Action {
+					icon {
 						name:":/icons/ic_gps_fixed.svg"
 					}
 					text: qsTr("Show GPS fixes")
@@ -385,28 +406,6 @@ if you have network connectivity and want to sync your data to cloud storage."),
 			},
 			Kirigami.Action {
 				icon {
-					name: ":/icons/sigma.svg"
-				}
-				text: qsTr("Dive summary")
-				onTriggered: {
-					globalDrawer.close()
-					pageStack.push(diveSummaryWindow)
-					detailsWindow.endEditMode()
-				}
-			},
-			Kirigami.Action {
-				icon {
-					name: ":/icons/ic_info_outline.svg"
-				}
-				text: qsTr("About")
-				onTriggered: {
-					globalDrawer.close()
-					pageStack.push(aboutWindow)
-					detailsWindow.endEditMode()
-				}
-			},
-			Kirigami.Action {
-				icon {
 					name: ":/icons/ic_settings.svg"
 				}
 				text: qsTr("Settings")
@@ -420,17 +419,6 @@ if you have network connectivity and want to sync your data to cloud storage."),
 			},
 			Kirigami.Action {
 				icon {
-					name: ":/icons/ic_cloud_upload.svg"
-				}
-				text: qsTr("Export")
-				onTriggered: {
-					globalDrawer.close()
-					pageStack.push(exportWindow)
-					detailsWindow.endEditMode()
-				}
-			},
-			Kirigami.Action {
-				icon {
 					name: ":/icons/ic_help_outline.svg"
 				}
 				text: qsTr("Help")
@@ -443,6 +431,17 @@ if you have network connectivity and want to sync your data to cloud storage."),
 				}
 				Kirigami.Action {
 					icon {
+						name: ":/icons/ic_info_outline.svg"
+					}
+					text: qsTr("About")
+					onTriggered: {
+						globalDrawer.close()
+						pageStack.push(aboutWindow)
+						detailsWindow.endEditMode()
+					}
+				}
+				Kirigami.Action {
+					icon {
 						name: ":/icons/ic_help_outline.svg"
 					}
 					text: qsTr("Show user manual")