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>
This commit is contained in:
Joakim Bygdell 2017-07-20 19:39:55 +02:00 committed by Dirk Hohndel
parent e80132cdef
commit 6655b37add
5 changed files with 43 additions and 51 deletions

View file

@ -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
}