diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2017-07-19 16:39:43 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-23 03:20:58 +0900 |
| commit | 0eef27376a7f0f17ef0225d33db7bfe61f52d8f9 (patch) | |
| tree | 0fc7a47395bd426ed686f3b230791a282b15e563 | |
| parent | 342391e0d189032e127d64d60f2b827be5a0412e (diff) | |
| download | subsurface-0eef27376a7f0f17ef0225d33db7bfe61f52d8f9.tar.gz | |
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>
| -rw-r--r-- | mobile-widgets/qml/main.qml | 76 |
1 files changed, 38 insertions, 38 deletions
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 @@ -171,6 +148,12 @@ Kirigami.ApplicationWindow { } } 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 onTriggered: { @@ -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") @@ -243,6 +220,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 { text: qsTr("App log") @@ -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 |