mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
2b70b76133
This change streamlines the navigation across the pages to be in line with the stackview organization. The top bar becomes a static element with the title and a button that either opens the preferences or shows the back arrow. This makes it a bit more efficient, since we load the title bar only one, and there are no strange animations in the title. The stackview gets the role of content container, the "chrome" around it is laid out in main.qml. Most of the churn in this patch comes from moving large blocks of code between files with different indentation levels. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
74 lines
1.8 KiB
QML
74 lines
1.8 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.subsurfacedivelog.mobile 1.0
|
|
|
|
Rectangle {
|
|
id: topPart
|
|
|
|
property bool goBack: (stackView.depth > 1)
|
|
|
|
color: theme.accentColor
|
|
Layout.minimumHeight: units.gridUnit * 2 + units.smallSpacing * 2
|
|
Layout.fillWidth: true
|
|
Layout.margins: 0
|
|
RowLayout {
|
|
anchors.bottom: topPart.bottom
|
|
anchors.bottomMargin: units.smallSpacing
|
|
anchors.left: topPart.left
|
|
anchors.leftMargin: units.smallSpacing
|
|
anchors.right: topPart.right
|
|
anchors.rightMargin: units.smallSpacing
|
|
Image {
|
|
source: "qrc:/qml/subsurface-mobile-icon.png"
|
|
Layout.maximumWidth: units.gridUnit * 2
|
|
Layout.preferredWidth: units.gridUnit * 2
|
|
Layout.preferredHeight: units.gridUnit * 2
|
|
}
|
|
Text {
|
|
text: qsTr("Subsurface")
|
|
font.pointSize: units.fontMetrics.font.pointSize * 2
|
|
Layout.fillWidth: false
|
|
color: theme.accentTextColor
|
|
}
|
|
Item {
|
|
Layout.fillWidth: true
|
|
}
|
|
Button {
|
|
id: prefsButton
|
|
// Display back arrow or menu button
|
|
text: topPart.goBack ? "\u2190" : "\u22ee"
|
|
anchors.right: parent.right
|
|
Layout.preferredWidth: units.gridUnit * 2
|
|
Layout.preferredHeight: parent.height
|
|
style: ButtonStyle {
|
|
background: Rectangle {
|
|
implicitWidth: units.gridUnit * 2
|
|
color: theme.accentColor
|
|
}
|
|
label: Text {
|
|
id: txt
|
|
color: theme.accentTextColor
|
|
font.pointSize: units.fontMetrics.font.pointSize * 2
|
|
font.bold: true
|
|
text: control.text
|
|
horizontalAlignment: Text.AlignHCenter
|
|
verticalAlignment: Text.AlignVCenter
|
|
}
|
|
}
|
|
onClicked: {
|
|
if (topPart.goBack) {
|
|
stackView.pop()
|
|
} else {
|
|
prefsMenu.popup()
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
}
|