diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2016-02-12 22:26:47 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-02-12 22:26:47 -0800 |
commit | a91d4164b4e64fcf02dc32c1e3379b3cc15af307 (patch) | |
tree | 1958354a02b69c2701908b26a751a5c65ddbbe78 /qt-mobile/qml | |
parent | 692719f230842b247dad9704e1d2e77d2f724305 (diff) | |
download | subsurface-a91d4164b4e64fcf02dc32c1e3379b3cc15af307.tar.gz |
QML UI: remove the redundant context menus that just close the page
Android users are well used to using the back key for this. I kept the
code in place as things may end up completely different on IOS or other
mobile platforms.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qml')
-rw-r--r-- | qt-mobile/qml/About.qml | 3 | ||||
-rw-r--r-- | qt-mobile/qml/DiveDetails.qml | 4 | ||||
-rw-r--r-- | qt-mobile/qml/DownloadFromDiveComputer.qml | 3 | ||||
-rw-r--r-- | qt-mobile/qml/GpsList.qml | 2 | ||||
-rw-r--r-- | qt-mobile/qml/Log.qml | 3 | ||||
-rw-r--r-- | qt-mobile/qml/Preferences.qml | 3 | ||||
-rw-r--r-- | qt-mobile/qml/ThemeTest.qml | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/qt-mobile/qml/About.qml b/qt-mobile/qml/About.qml index 87d7a0a3e..cc9362901 100644 --- a/qt-mobile/qml/About.qml +++ b/qt-mobile/qml/About.qml @@ -8,6 +8,7 @@ MobileComponents.Page { id: aboutPage property int pageWidth: subsurfaceTheme.columnWidth - MobileComponents.Units.gridUnit +/* this can be done by hitting the back key contextualActions: [ Action { text: "Close About" @@ -18,7 +19,7 @@ MobileComponents.Page { } } ] - + */ ScrollView { anchors.fill: parent diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml index 3f637784e..5a39576e8 100644 --- a/qt-mobile/qml/DiveDetails.qml +++ b/qt-mobile/qml/DiveDetails.qml @@ -52,7 +52,7 @@ MobileComponents.Page { state = "view" Qt.inputMethod.hide() } - +/* this can be done by hitting the back key contextualActions: [ Action { text: state === "view" ? "Back to dive list" : "Cancel" @@ -71,7 +71,7 @@ MobileComponents.Page { } } ] - + */ mainAction: Action { iconName: state !== "view" ? "dialog-cancel" : "document-edit" onTriggered: { diff --git a/qt-mobile/qml/DownloadFromDiveComputer.qml b/qt-mobile/qml/DownloadFromDiveComputer.qml index 529af82eb..2acc508c4 100644 --- a/qt-mobile/qml/DownloadFromDiveComputer.qml +++ b/qt-mobile/qml/DownloadFromDiveComputer.qml @@ -14,6 +14,7 @@ MobileComponents.Page { height: parent.height Layout.fillWidth: true; +/* this can be done by hitting the back key contextualActions: [ Action { text: "Close Preferences" @@ -24,7 +25,7 @@ MobileComponents.Page { } } ] - + */ ColumnLayout { anchors.top: parent.top height: parent.height diff --git a/qt-mobile/qml/GpsList.qml b/qt-mobile/qml/GpsList.qml index 322b2b1a6..97998b3cf 100644 --- a/qt-mobile/qml/GpsList.qml +++ b/qt-mobile/qml/GpsList.qml @@ -14,6 +14,7 @@ MobileComponents.Page { anchors.margins: MobileComponents.Units.gridUnit / 2 objectName: "gpsList" +/* this can be done by hitting the back key contextualActions: [ Action { text: "Close GPS list" @@ -24,6 +25,7 @@ MobileComponents.Page { } } ] + */ Component { id: gpsDelegate MobileComponents.ListItemWithActions { diff --git a/qt-mobile/qml/Log.qml b/qt-mobile/qml/Log.qml index ac4750ac2..8571a52fe 100644 --- a/qt-mobile/qml/Log.qml +++ b/qt-mobile/qml/Log.qml @@ -14,6 +14,7 @@ MobileComponents.Page { anchors.margins: MobileComponents.Units.gridUnit / 2 objectName: "Log" +/* this can be done by hitting the back key contextualActions: [ Action { text: "Close Log" @@ -24,7 +25,7 @@ MobileComponents.Page { } } ] - + */ ScrollView { anchors.fill: parent Flickable { diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml index dbff31027..f20e83467 100644 --- a/qt-mobile/qml/Preferences.qml +++ b/qt-mobile/qml/Preferences.qml @@ -8,6 +8,7 @@ import org.subsurfacedivelog.mobile 1.0 MobileComponents.Page { +/* this can be done by hitting the back key contextualActions: [ Action { text: "Close Preferences" @@ -18,7 +19,7 @@ MobileComponents.Page { } } ] - + */ GridLayout { signal accept diff --git a/qt-mobile/qml/ThemeTest.qml b/qt-mobile/qml/ThemeTest.qml index 478116681..ed6631e46 100644 --- a/qt-mobile/qml/ThemeTest.qml +++ b/qt-mobile/qml/ThemeTest.qml @@ -5,6 +5,7 @@ import org.kde.plasma.mobilecomponents 0.2 as MobileComponents MobileComponents.Page { +/* this can be done by hitting the back key contextualActions: [ Action { text: "Close Theme info" @@ -15,7 +16,7 @@ MobileComponents.Page { } } ] - + */ GridLayout { id: themetest columns: 2 |