mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: only assign actions in a declarative way

Browse source 
Assigning actions in an imperative way on component complete,
seems to cause a crash on some devices, assign declaratively
the whole list instead, hiding the gps related actions on
iOS as they are not supported on that platform.

Signed-off-by: Marco Martin <notmart@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Marco Martin 2017-04-13 19:57:22 +02:00 committed by Dirk Hohndel
parent a0c6cf5c89
commit 71191f1294
1 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mobile-widgets/qml/main.qml
View file

@ -106,7 +106,7 @@ Kirigami.ApplicationWindow {
bannerImageSource: "dive.jpg" bannerImageSource: "dive.jpg"
property list<QtObject> topActions: [ actions: [
Kirigami.Action { Kirigami.Action {
text: qsTr("Dive list") text: qsTr("Dive list")
onTriggered: { onTriggered: {
@ -180,13 +180,11 @@ Kirigami.ApplicationWindow {
} }
} }
} }
} },
] // end topActions
property list<QtObject> gpsActions: [
Kirigami.Action { Kirigami.Action {
text: qsTr("GPS") text: qsTr("GPS")
enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL enabled: manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL
visible: (Qt.platform.os !== "ios")
Kirigami.Action { Kirigami.Action {
text: qsTr("GPS-tag dives") text: qsTr("GPS-tag dives")
onTriggered: { onTriggered: {
@ -230,10 +228,7 @@ Kirigami.ApplicationWindow {
detailsWindow.endEditMode() detailsWindow.endEditMode()
} }
} }
} },
] // end gpsActions
property list<QtObject> bottomActions: [
Kirigami.Action { Kirigami.Action {
text: qsTr("Developer") text: qsTr("Developer")
Kirigami.Action { Kirigami.Action {
@ -263,21 +258,7 @@ Kirigami.ApplicationWindow {
detailsWindow.endEditMode() detailsWindow.endEditMode()
} }
} }
] // end bottonActions ] // end actions
Component.onCompleted: {
var createActions = new Array(0)
for (var i = 0; i < topActions.length; i++)
createActions.push(topActions[i])
if (Qt.platform.os !== "ios") {
for (var i = 0; i < gpsActions.length; i++)
createActions.push(gpsActions[i])
}
for (var i = 0; i < bottomActions.length; i++)
createActions.push(bottomActions[i])
actions = createActions
print(actions)
}
MouseArea { MouseArea {
height: childrenRect.height height: childrenRect.height