diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-12-03 14:06:52 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-03 14:11:30 -0800 |
commit | 7a94360a6da6665ea42de29c39246a5ebc67dada (patch) | |
tree | ecd27cddb5f054476387d34f85d2065442249e4a /qt-mobile/qml/main.qml | |
parent | 9ef475844dbe55540ca4f53932c27ab1ce59c09d (diff) | |
download | subsurface-7a94360a6da6665ea42de29c39246a5ebc67dada.tar.gz |
QML-UI: Split cloud credentials and other preferences
This makes the cloud credential entry page much simpler, separate page. It also
removes the two colums and uses the label of the check box instead of having a
separate label item.
The preferences page of course also gets simpler by doing this. Here I kept the
two columns, though.
Finally the code for the old context menu was removed - not sure why this was
still here.
Next I need to fix the savePreferences() call to do the right thing in each
case.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qml/main.qml')
-rw-r--r-- | qt-mobile/qml/main.qml | 97 |
1 files changed, 12 insertions, 85 deletions
diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml index 46123ddb3..fc237c877 100644 --- a/qt-mobile/qml/main.qml +++ b/qt-mobile/qml/main.qml @@ -32,6 +32,13 @@ MobileComponents.ApplicationWindow { }, Action { + text: "Cloud login credentials" + onTriggered: { + stackView.push(cloudCredWindow) + } + }, + + Action { text: "Load Dives" onTriggered: { manager.loadDives(); @@ -145,91 +152,6 @@ MobileComponents.ApplicationWindow { property color accentTextColor: "#ececec" } - Menu { - id: prefsMenu - title: "Menu" - - MenuItem { - text: "Preferences" - onTriggered: { - stackView.push(prefsWindow) - } - } - - MenuItem { - text: "Load Dives" - onTriggered: { - manager.loadDives(); - } - } - - MenuItem { - text: "Download Dives" - onTriggered: { - stackView.push(downloadDivesWindow) - } - } - - MenuItem { - text: "Add Dive" - onTriggered: { - manager.addDive(); - stackView.push(detailsWindow) - } - } - - MenuItem { - text: "Save Changes" - onTriggered: { - manager.saveChanges(); - } - } - - MenuItem { - text: "Run location service" - checkable: true - checked: manager.locationServiceEnabled - onToggled: { - manager.locationServiceEnabled = checked; - } - } - - MenuItem { - text: "Apply GPS data to dives" - onTriggered: { - manager.applyGpsData(); - } - } - - MenuItem { - text: "Send GPS data to server" - onTriggered: { - manager.sendGpsData(); - } - } - - MenuItem { - text: "Clear stored GPS data" - onTriggered: { - manager.clearGpsData(); - } - } - - MenuItem { - text: "View Log" - onTriggered: { - stackView.push(logWindow) - } - } - - MenuItem { - text: "Theme Information" - onTriggered: { - stackView.push(themetest) - } - } - } - toolBar: TopBar { width: parent.width height: Layout.minimumHeight @@ -250,6 +172,11 @@ MobileComponents.ApplicationWindow { visible: false } + CloudCredentials { + id: cloudCredWindow + visible: false + } + DiveDetails { id: detailsWindow visible: false |