diff --git a/src/apps/marble-maps/MarbleMaps.qrc b/src/apps/marble-maps/MarbleMaps.qrc
index 4c03f4a17..935483df6 100644
--- a/src/apps/marble-maps/MarbleMaps.qrc
+++ b/src/apps/marble-maps/MarbleMaps.qrc
@@ -1,75 +1,75 @@
AboutDialog.qml
FlatButton.qml
Completion.qml
MainScreen.qml
SearchResults.qml
SearchField.qml
Search.qml
CircularButton.qml
IconText.qml
PositionButton.qml
BoxedText.qml
ImageButton.qml
WaypointImage.qml
RoutingManager.qml
PlacemarkDialog.qml
SettingsDialog.qml
DeveloperDialog.qml
ProfileSelectorMenu.qml
FloatingMenuButton.qml
RouteEditor.qml
RoutesItem.qml
NavigationInfoBar.qml
NavigationManager.qml
PositionMarker.qml
Waypoint.qml
CurrentPosition.qml
../../../data/android/drawable-xxxhdpi/search.png
../../../data/android/drawable-xxxhdpi/gps_fixed.png
../../../data/android/drawable-xxxhdpi/gps_not_fixed.png
../../../data/android/drawable-xxxhdpi/backdrop.png
../../../data/android/drawable-xxxhdpi/border_shadow.png
../../../data/android/drawable-xxxhdpi/map.png
../../../data/android/drawable-xxxhdpi/waypoint.png
../../../data/android/drawable-xxxhdpi/up.png
../../../data/android/drawable-xxxhdpi/down.png
../../../data/android/drawable-xxxhdpi/delete.png
../../../data/android/drawable-xxxhdpi/delete_white.png
../../../data/android/drawable-xxxhdpi/ic_close_black_18dp.png
../../../data/android/drawable-xxxhdpi/busy_indicator.png
../../../data/android/drawable-xxxhdpi/navigation_blue.png
../../../data/svg/navigation_blue.svg
../../../data/android/drawable-xxxhdpi/circular_menu_backdrop.png
../../../data/android/drawable-xxxhdpi/ic_place.png
../../../data/android/drawable-xxxhdpi/ic_place_arrival.png
../../../data/android/drawable-xxxhdpi/ic_place_departure.png
../../../data/android/drawable-xxxhdpi/ic_place_unknown.png
../../../data/android/drawable-xxxhdpi/ic_place_via.png
../../../data/android/drawable-xxxhdpi/ic_add_black_48dp.png
material-icons/ic_local_gas_station_48px.svg
material-icons/ic_open_in_browser_48px.svg
material-icons/ic_volume_off_48px.svg
material-icons/ic_volume_up_48px.svg
material-icons/ic_directions_48px.svg
material-icons/ic_directions_bike_48px.svg
material-icons/ic_directions_car_48px.svg
material-icons/ic_directions_walk_48px.svg
material-icons/ic_navigation_48px.svg
material-icons/ic_access_time_48px.svg
material-icons/ic_accessible_black_48px.svg
material-icons/ic_network_wifi_black_48px.svg
material-icons/ic_place_black_48px.svg
material-icons/ic_star_24px.svg
material-icons/ic_star_border_24px.svg
material-icons/ic_label_48px.svg
konqi/konqi-app-dev.png
konqi/konqi-dev-qt.png
konqi/konqi-group.png
konqi/konqi-globe.png
konqi/konqi-books.png
RouteProfileRadioButton.qml
- ScrollBar.qml
+ MarbleScrollBar.qml
diff --git a/src/apps/marble-maps/ScrollBar.qml b/src/apps/marble-maps/MarbleScrollBar.qml
similarity index 100%
rename from src/apps/marble-maps/ScrollBar.qml
rename to src/apps/marble-maps/MarbleScrollBar.qml
diff --git a/src/apps/marble-maps/RouteEditor.qml b/src/apps/marble-maps/RouteEditor.qml
index e4526af2b..4ac088103 100644
--- a/src/apps/marble-maps/RouteEditor.qml
+++ b/src/apps/marble-maps/RouteEditor.qml
@@ -1,171 +1,171 @@
//
// 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 2015 Gábor Péterffy
// Copyright 2015 Dennis Nienhüser
//
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Window 2.2
import QtQuick.Layouts 1.1
import org.kde.marble 0.20
Item {
id: root
property alias routingProfile: profileSelector.selectedProfile
property alias currentProfileIcon: profileSelector.profileIcon
property int currentIndex: 0
property var routingManager
height: visible ? Screen.pixelDensity * 4 + column.height : 0
SystemPalette{
id: palette
colorGroup: SystemPalette.Active
}
Rectangle {
anchors.fill: parent
color: palette.base
}
Column {
id: column
spacing: Screen.pixelDensity * 2
anchors {
top: parent.top
left: parent.left
right: parent.right
margins: Screen.pixelDensity * 2
}
Item {
anchors {
left: parent.left
right: parent.right
}
height: profileSelector.height
ProfileSelectorMenu {
id: profileSelector
anchors.left: parent.left
}
}
Text {
id: helpText
visible: waypointList.count < 2
color: "gray"
text: qsTr("Search for places to integrate them into a route.")
}
ListView {
id: waypointList
anchors {
left: parent.left
right: parent.right
}
height: Math.min(0.4 * Screen.height, contentHeight)
clip: true
model: routingManager.routeRequestModel
currentIndex: root.currentIndex
delegate: Rectangle {
width: parent.width
height: Screen.pixelDensity * 2 + Math.max(text.height, image.height)
color: touchArea.pressed || root.currentIndex === index ? palette.highlight : palette.base
WaypointImage {
id: image
anchors {
left: parent.left
verticalCenter: parent.verticalCenter
}
type: index === 0 ? "departure" : (index === waypointList.count-1 ? "destination" : "waypoint")
}
Text {
id: text
anchors {
left: image.right
right: buttonsRow.left
leftMargin: parent.width * 0.05
verticalCenter: parent.verticalCenter
}
elide: Text.ElideMiddle
text: name
font.pointSize: 18
color: palette.text
}
MouseArea {
id: touchArea
anchors.fill: parent
onClicked: {
if (index === root.currentIndex) {
root.currentIndex = -1
} else {
root.currentIndex = index
marbleMaps.centerOn(longitude, latitude)
}
}
}
Row {
id: buttonsRow
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
ImageButton {
id: upButton
anchors.verticalCenter: parent.verticalCenter
visible: index > 0 && index === root.currentIndex
imageSource: "qrc:///up.png"
onClicked: {
routingManager.swapVias(index, index-1);
root.currentIndex--;
}
}
ImageButton {
id: downButton
anchors.verticalCenter: parent.verticalCenter
visible: index+1 < routingManager.routeRequestModel.count && index === root.currentIndex
imageSource: "qrc:///down.png"
onClicked: {
routingManager.swapVias(index, index+1);
root.currentIndex++;
}
}
ImageButton {
id: deleteButton
anchors.verticalCenter: parent.verticalCenter
visible: index === root.currentIndex
imageSource: "qrc:///delete.png"
onClicked: {
routingManager.removeVia(index);
root.currentIndex = Math.max(0, root.currentIndex-1);
}
}
}
}
- ScrollBar {
+ MarbleScrollBar {
id: scrollBar
flickableItem: waypointList
}
}
}
}
diff --git a/src/apps/marble-maps/SearchResults.qml b/src/apps/marble-maps/SearchResults.qml
index d1bd98665..1b1e276d6 100644
--- a/src/apps/marble-maps/SearchResults.qml
+++ b/src/apps/marble-maps/SearchResults.qml
@@ -1,98 +1,98 @@
//
// 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 2015 Gábor Péterffy
// Copyright 2015 Mikhail Ivchenko
//
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Window 2.2
Item {
id: root
property var model: []
property color background: palette.base
property alias count: view.count
property int delegateHeight: 0
signal itemSelected(int index, string name)
SystemPalette{
id: palette
colorGroup: SystemPalette.Active
}
Rectangle {
id: background
anchors.fill: parent
color: root.background
}
ListView {
id: view
anchors.fill: parent
clip: true
snapMode: ListView.SnapToItem
model: root.model
delegate: Item {
width: view.width
height: placemarkName.height + 20
Rectangle {
id: delegateBackground
anchors.fill: parent
color: mouseArea.pressed ? palette.highlight : root.background
}
Image {
id: icon
anchors.left: parent.left
anchors.leftMargin: 10
anchors.verticalCenter: parent.verticalCenter
width: height
height: placemarkName.height
source: iconPath.substr(0,1) === '/' ? "file://" + iconPath : iconPath
sourceSize.width: width
sourceSize.height: height
fillMode: Image.Pad
}
Text {
id: placemarkName
anchors.left: icon.right
anchors.right: parent.right
anchors.rightMargin: 10
anchors.verticalCenter: parent.verticalCenter
font.pointSize: 18
color: palette.text
text: name
elide: Text.ElideMiddle
}
MouseArea {
id: mouseArea
anchors.fill: parent
onClicked: {
root.itemSelected(index, name);
}
}
Component.onCompleted: {
if( root.delegateHeight != height ) {
root.delegateHeight = height;
}
}
}
}
- ScrollBar {
+ MarbleScrollBar {
id: scrollBar
flickableItem: view
}
}