mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: Back buttons for app log and theme info

Browse source 
The app log and theme info had context menus
with a single close item. No need for that.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2016-02-09 20:39:31 +01:00 committed by Dirk Hohndel
parent 8c9883cfcf
commit 98dfc5c770
3 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qt-mobile/qml/GpsList.qml
View file

@ -14,18 +14,6 @@ MobileComponents.Page {
anchors.margins: MobileComponents.Units.gridUnit / 2
objectName: "gpsList"
contextualActions: [
Action {
id: closeLog
text: "Close GPS list"
iconName: "view-readermode"
onTriggered: {
stackView.pop()
contextDrawer.close()
}
}
]
Component {
id: gpsDelegate
MobileComponents.ListItemWithActions {

12
qt-mobile/qml/Log.qml
View file

@ -37,16 +37,4 @@ MobileComponents.Page {
}
}
}
contextualActions: [
Action {
id: closeLog
text: "Close log"
iconName: "view-readermode"
onTriggered: {
stackView.pop()
contextDrawer.close()
}
}
]
}

10
qt-mobile/qml/TopBar.qml
View file

@ -87,7 +87,7 @@ Rectangle {
anchors.top: parent.top
Layout.preferredHeight: editButtonIcon.height
width: editButtonIcon.width
visible: (detailsWindow.state === "view" && detailsWindow.visible)
visible: !backButton.visible && detailsWindow.state === "view" && detailsWindow.visible
Image {
id: editButtonIcon
source: "qrc:/qml/menu-edit.png"
@ -121,7 +121,8 @@ Rectangle {
anchors.top: parent.top
Layout.preferredHeight: backButtonIcon.height
width: backButtonIcon.width
visible: (detailsWindow.state === "edit" && detailsWindow.visible)
visible: logWindow.visible || themetest.visible ||
(detailsWindow.state === "edit" && detailsWindow.visible)
Image {
id: backButtonIcon
source: "qrc:/qml/menu-back.png"
@ -138,7 +139,10 @@ Rectangle {
height: parent.height
width: parent.width
onClicked: {
detailsWindow.endEditMode()
if (logWindow.visible || themetest.visible)
stackView.pop()
else
detailsWindow.endEditMode()
}
}
}