mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile UI: only show context menu when viewing a dive

Browse source 
In add and edit mode this is confusing and wrong.

There is a bug in Kirigami that creates lots of bogus error message about
missing mainFlickable. That needs to be patched out.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-02-18 16:12:12 -08:00
parent ef2f65fd27
commit 56db02a685
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
mobile-widgets/qml/DiveDetails.qml
View file

@ -59,6 +59,20 @@ Kirigami.Page {
background: Rectangle { color: subsurfaceTheme.backgroundColor } background: Rectangle { color: subsurfaceTheme.backgroundColor }
width: rootItem.colWidth width: rootItem.colWidth
property QtObject removeDiveFromTripAction: Kirigami.Action { text: qsTr ("Remove dive from trip <TBD>") }
property QtObject addDiveToTripAction: Kirigami.Action { text: qsTr ("Add dive to trip <TBD>") }
property QtObject undoAction: Kirigami.Action {
text: qsTr("Undo") + " " + manager.undoText
enabled: manager.undoText !== ""
onTriggered: manager.undo()
}
property QtObject redoAction: Kirigami.Action {
text: qsTr("Redo") + " " + manager.redoText
enabled: manager.redoText !== ""
onTriggered: manager.redo()
}
property variant contextactions: [ removeDiveFromTripAction, addDiveToTripAction, undoAction, redoAction ]
states: [ states: [
State { State {
name: "view" name: "view"
@ -68,6 +82,7 @@ Kirigami.Page {
right: deleteAction right: deleteAction
left: currentItem ? (currentItem.modelData && currentItem.modelData.gps !== "" ? mapAction : null) : null left: currentItem ? (currentItem.modelData && currentItem.modelData.gps !== "" ? mapAction : null) : null
} }
contextualActions: contextactions
} }
}, },
State { State {
@ -78,6 +93,7 @@ Kirigami.Page {
right: cancelAction right: cancelAction
left: null left: null
} }
contextualActions: []
} }
}, },
State { State {
@ -88,6 +104,7 @@ Kirigami.Page {
right: cancelAction right: cancelAction
left: null left: null
} }
contextualActions: []
} }
} }
] ]
@ -191,20 +208,6 @@ Kirigami.Page {
} }
} }
contextualActions: [
Kirigami.Action {
text: qsTr("Undo") + " " + manager.undoText
enabled: manager.undoText !== ""
onTriggered: manager.undo()
},
Kirigami.Action {
text: qsTr("Redo") + " " + manager.redoText
enabled: manager.redoText !== ""
onTriggered: manager.redo()
}
]
onBackRequested: { onBackRequested: {
if (state === "edit") { if (state === "edit") {
endEditMode() endEditMode()