diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2017-07-20 19:39:55 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-23 03:20:58 +0900 |
| commit | 6655b37add8c1dbee23d734fa6eb8f4c0bec9aae (patch) | |
| tree | 2d94e6de766b5a3b24f45114e342673b574d0c88 /mobile-widgets/qml/main.qml | |
| parent | e80132cdef038fdff253f59979fbb8789e325315 (diff) | |
| download | subsurface-6655b37add8c1dbee23d734fa6eb8f4c0bec9aae.tar.gz | |
Mobile: consolidate settings to one page and menu entry
Addresses: #492
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Had a bit of rebase issue with this one.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Diffstat (limited to 'mobile-widgets/qml/main.qml')
| -rw-r--r-- | mobile-widgets/qml/main.qml | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 0ba47743e..6ff17bc41 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -242,25 +242,9 @@ if you have network connectivity and want to sync your data to cloud storage."), Kirigami.Action { iconName: "icons/ic_settings.svg" 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() - } + onTriggered: { + stackView.push(settingsWindow) + detailsWindow.endEditMode() } }, Kirigami.Action { @@ -438,8 +422,8 @@ if you have network connectivity and want to sync your data to cloud storage."), id: manager } - Preferences { - id: prefsWindow + Settings { + id: settingsWindow visible: false } |