mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
0eebfb284e
A dive would linger in edit mode when following these steps: start mobile. show theme info. click on dive in dive list. click edit. click back in topbar, again click back in the topbar. click on dive in dive list, still in edit mode. Not anymore. Also enable back button when viewing a dive. Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
169 lines
4.5 KiB
QML
169 lines
4.5 KiB
QML
import QtQuick 2.3
|
|
import QtQuick.Controls 1.2
|
|
import QtQuick.Controls.Styles 1.2
|
|
import QtQuick.Window 2.2
|
|
import QtQuick.Dialogs 1.2
|
|
import QtQuick.Layouts 1.1
|
|
import QtQuick.Window 2.2
|
|
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
|
|
Rectangle {
|
|
id: topPart
|
|
|
|
property bool goBack: (stackView.depth > 1)
|
|
|
|
color: subsurfaceTheme.accentColor
|
|
Layout.minimumHeight: Math.round(MobileComponents.Units.gridUnit * 2.5)
|
|
Layout.fillWidth: true
|
|
Layout.margins: 0
|
|
RowLayout {
|
|
anchors.bottom: topPart.bottom
|
|
anchors.bottomMargin: MobileComponents.Units.smallSpacing
|
|
anchors.left: topPart.left
|
|
anchors.leftMargin: MobileComponents.Units.smallSpacing
|
|
anchors.right: topPart.right
|
|
anchors.rightMargin: MobileComponents.Units.smallSpacing
|
|
Item {
|
|
id: mainMenu
|
|
anchors.left: parent.left
|
|
Layout.preferredHeight: mainMenuIcon.height
|
|
width: mainMenuIcon.width
|
|
Image {
|
|
id: mainMenuIcon
|
|
source: "qrc:/qml/main-menu.png"
|
|
width: Math.round(MobileComponents.Units.gridUnit * 1.5)
|
|
height: width
|
|
anchors {
|
|
top: parent.top
|
|
topMargin: MobileComponents.Units.smallSpacing * -1
|
|
leftMargin: MobileComponents.Units.smallSpacing
|
|
|
|
}
|
|
}
|
|
MouseArea {
|
|
height: parent.height
|
|
width: parent.width
|
|
onClicked: {
|
|
globalDrawer.open()
|
|
}
|
|
}
|
|
}
|
|
Item {
|
|
Layout.preferredHeight: subsurfaceLogo.height
|
|
Rectangle { color: "green"; anchors.fill: parent; }
|
|
Image {
|
|
id: subsurfaceLogo
|
|
source: "qrc:/qml/subsurface-mobile-icon.png"
|
|
anchors {
|
|
top: parent.top
|
|
topMargin: MobileComponents.Units.smallSpacing * -1
|
|
left: parent.left
|
|
}
|
|
width: Math.round(MobileComponents.Units.gridUnit * 1.7)
|
|
height: width
|
|
}
|
|
MobileComponents.Label {
|
|
text: qsTr("Subsurface-mobile")
|
|
font.pointSize: Math.round(MobileComponents.Theme.defaultFont.pointSize * 1.3)
|
|
height: subsurfaceLogo.height * 2
|
|
anchors {
|
|
left: subsurfaceLogo.right
|
|
bottom: subsurfaceLogo.bottom
|
|
leftMargin: Math.round(MobileComponents.Units.gridUnit / 2)
|
|
}
|
|
font.weight: Font.Light
|
|
verticalAlignment: Text.AlignBottom
|
|
Layout.fillWidth: false
|
|
color: subsurfaceTheme.accentTextColor
|
|
}
|
|
}
|
|
Item {
|
|
Layout.fillWidth: true
|
|
}
|
|
Item {
|
|
id: editButton
|
|
anchors.right: backButton.visible ? backButton.left : contextDrawer.enabled ? contextMenu.left : parent.right
|
|
anchors.top: parent.top
|
|
Layout.preferredHeight: editButtonIcon.height
|
|
width: editButtonIcon.width
|
|
visible: detailsWindow.state === "view" && detailsWindow.visible
|
|
Image {
|
|
id: editButtonIcon
|
|
source: "qrc:/qml/menu-edit.png"
|
|
anchors {
|
|
top: parent.top
|
|
right: parent.right
|
|
topMargin: MobileComponents.Units.smallSpacing * -1
|
|
rightMargin: MobileComponents.Units.smallSpacing
|
|
}
|
|
width: Math.round(MobileComponents.Units.gridUnit * 1.7)
|
|
height: width
|
|
}
|
|
MouseArea {
|
|
height: parent.height
|
|
width: parent.width
|
|
onClicked: {
|
|
detailsWindow.startEditMode()
|
|
}
|
|
}
|
|
}
|
|
Item {
|
|
id: backButton
|
|
anchors.right: contextDrawer.enabled ? contextMenu.left : parent.right
|
|
anchors.top: parent.top
|
|
Layout.preferredHeight: backButtonIcon.height
|
|
width: backButtonIcon.width
|
|
visible: logWindow.visible || themetest.visible || detailsWindow.visible
|
|
Image {
|
|
id: backButtonIcon
|
|
source: "qrc:/qml/menu-back.png"
|
|
anchors {
|
|
top: parent.top
|
|
right: parent.right
|
|
topMargin: MobileComponents.Units.smallSpacing * -1
|
|
rightMargin: MobileComponents.Units.smallSpacing
|
|
}
|
|
width: Math.round(MobileComponents.Units.gridUnit * 1.7)
|
|
height: width
|
|
}
|
|
MouseArea {
|
|
height: parent.height
|
|
width: parent.width
|
|
onClicked: {
|
|
if (detailsWindow.state === "view" || logWindow.visible || themetest.visible)
|
|
stackView.pop()
|
|
if (detailsWindow.state === "edit")
|
|
detailsWindow.endEditMode()
|
|
}
|
|
}
|
|
}
|
|
Item {
|
|
id: contextMenu
|
|
visible: contextDrawer.enabled
|
|
anchors.right: parent.right
|
|
anchors.top: parent.top
|
|
Layout.preferredHeight: contextMenuIcon.height
|
|
width: contextMenuIcon.width
|
|
Image {
|
|
id: contextMenuIcon
|
|
source: "qrc:/qml/context-menu.png"
|
|
width: Math.round(MobileComponents.Units.gridUnit * 1.5)
|
|
height: width
|
|
anchors {
|
|
top: parent.top
|
|
right: parent.right
|
|
topMargin: MobileComponents.Units.smallSpacing * -1
|
|
rightMargin: MobileComponents.Units.smallSpacing
|
|
}
|
|
}
|
|
MouseArea {
|
|
height: parent.height
|
|
width: parent.width
|
|
onClicked: {
|
|
contextDrawer.open()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|