Commit 954612a7 authored by Judit Bartha's avatar Judit Bartha

Added Layer Options to side panel for Public Transportation and Outdoor Activities options

parent b864f035
......@@ -125,11 +125,21 @@ Kirigami.ApplicationWindow {
source = ""
app.pageStack.push("qrc:///AboutDialog.qml")
}
},
Kirigami.Action {
text: "Layer Options"
iconName: "qrc:///settings.png"
onTriggered: {
app.state = "options"
sidePanel.close()
app.pageStack.push("qrc:///Options.qml")
}
}
]
}
pageStack.initialPage: page
pageStack.interactive: false
Kirigami.Page {
id: page
......@@ -547,6 +557,10 @@ Kirigami.ApplicationWindow {
State {
name: "developer"
PropertyChanges { target: dialogLoader; source: "DeveloperDialog.qml" }
},
State {
name: "options"
PropertyChanges { target: dialogLoader; source: "" }
}
]
}
......
......@@ -30,6 +30,7 @@
<file>SidePanel.qml</file>
<file>PublicTransport.qml</file>
<file>OutdoorActivities.qml</file>
<file>Options.qml</file>
<file>drawer.svg</file>
<file alias="search.png">../../../data/android/drawable-xxxhdpi/search.png</file>
<file alias="menu.png">../../../data/android/drawable-xxxhdpi/ic_menu_black_48dp.png</file>
......
//
// This file is part of the Marble Virtual Globe.
//
// This program is free software licensed under the GNU LGPL. You can
// find a copy of this license in LICENSE.txt in the top directory of
// the source code.
//
// Copyright 2016 Dennis Nienhüser <nienhueser@kde.org>
//
import QtQuick 2.8
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.0 as Kirigami
import org.kde.marble 0.20
Kirigami.ScrollablePage {
id: optionsPage
padding: 0
topPadding: 0
leftPadding: 0
rightPadding: 0
bottomPadding: 0
signal backTriggered()
Column {
anchors {
fill: parent
margins: Kirigami.Units.gridUnit
}
Label {
text: qsTr("<h3>Layer Options</h3>")
}
Label {
text: qsTr("<h4>Public Transport Layers</h4>")
}
Item{
implicitHeight: publicTransportLoader.height + Kirigami.Units.gridUnit * 4
width: parent.width
Loader {
anchors.fill: parent
id: publicTransportLoader
source: "PublicTransport.qml"
onLoaded: {
item.implicitWidth = parent.width
item.marbleMaps = marbleMaps
}
}
}
Label {
topPadding: Kirigami.Units.gridUnit
text: qsTr("<h4>Outdoor Activities Layers</h4>")
}
Item{
implicitHeight: outdoorActivitiesLoader.height + Kirigami.Units.gridUnit * 6
width: parent.width
Loader {
anchors.fill: parent
id: outdoorActivitiesLoader
source: "OutdoorActivities.qml"
onLoaded: {
item.implicitWidth = parent.width
item.marbleMaps = marbleMaps
}
}
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment