diff --git a/src/apps/marble-maps/MainScreen.qml b/src/apps/marble-maps/MainScreen.qml --- a/src/apps/marble-maps/MainScreen.qml +++ b/src/apps/marble-maps/MainScreen.qml @@ -125,11 +125,21 @@ 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 @@ State { name: "developer" PropertyChanges { target: dialogLoader; source: "DeveloperDialog.qml" } + }, + State { + name: "options" + PropertyChanges { target: dialogLoader; source: "" } } ] } diff --git a/src/apps/marble-maps/MarbleMaps.qrc b/src/apps/marble-maps/MarbleMaps.qrc --- a/src/apps/marble-maps/MarbleMaps.qrc +++ b/src/apps/marble-maps/MarbleMaps.qrc @@ -30,6 +30,7 @@ SidePanel.qml PublicTransport.qml OutdoorActivities.qml + Options.qml drawer.svg ../../../data/android/drawable-xxxhdpi/search.png ../../../data/android/drawable-xxxhdpi/ic_menu_black_48dp.png diff --git a/src/apps/marble-maps/Options.qml b/src/apps/marble-maps/Options.qml new file mode 100644 --- /dev/null +++ b/src/apps/marble-maps/Options.qml @@ -0,0 +1,80 @@ +// +// 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 +// + +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("

Layer Options

") + } + + Label { + text: qsTr("

Public Transport Layers

") + } + + 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("

Outdoor Activities Layers

") + } + + 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 + } + } + } + } +}