From 619de80dfd1e896bf023ba8c3f8ee3297fcd3abb Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 12 Feb 2020 06:58:47 -0800 Subject: 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 --- mobile-widgets/qml/main.qml | 89 ++++++++++++++++++++++----------------------- 1 file 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 @@ -239,15 +239,6 @@ Kirigami.ApplicationWindow { globalDrawer.close() } }, - Kirigami.Action { - icon { - name: ":/icons/map-globe.svg" - } - text: mapPage.title - onTriggered: { - showMap() - } - }, Kirigami.Action { icon { name: ":/icons/ic_sync.svg" @@ -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" @@ -348,6 +360,15 @@ if you have network connectivity and want to sync your data to cloud storage."), text: qsTr("Back") onTriggered: globalDrawer.scrollViewItem.pop() } + Kirigami.Action { + icon { + name: ":/icons/map-globe.svg" + } + text: mapPage.title + onTriggered: { + showMap() + } + } Kirigami.Action { icon { name:":/icons/ic_gps_fixed.svg" @@ -383,28 +404,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" @@ -418,17 +417,6 @@ if you have network connectivity and want to sync your data to cloud storage."), 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_help_outline.svg" @@ -441,6 +429,17 @@ if you have network connectivity and want to sync your data to cloud storage."), text: qsTr("Back") onTriggered: globalDrawer.scrollViewItem.pop() } + 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" -- cgit v1.2.3-70-g09d2