|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160421.tar.xz/src/apps/marble-maps-sailfishos/MarbleMaps.qrc
^
|
| @@ -20,7 +20,6 @@
<file>NavigationManager.qml</file>
<file>PositionMarker.qml</file>
<file>Waypoint.qml</file>
- <file alias="search.png">../../../data/android/drawable-xxxhdpi/search.png</file>
<file alias="gps_fixed.png">../../../data/android/drawable-xxxhdpi/gps_fixed.png</file>
<file alias="gps_not_fixed.png">../../../data/android/drawable-xxxhdpi/gps_not_fixed.png</file>
<file alias="backdrop.png">../../../data/android/drawable-xxxhdpi/backdrop.png</file>
@@ -34,17 +33,14 @@
<file alias="waypoint.png">../../../data/android/drawable-xxxhdpi/waypoint.png</file>
<file alias="up.png">../../../data/android/drawable-xxxhdpi/up.png</file>
<file alias="down.png">../../../data/android/drawable-xxxhdpi/down.png</file>
- <file alias="delete.png">../../../data/android/drawable-xxxhdpi/delete.png</file>
<file alias="delete_white.png">../../../data/android/drawable-xxxhdpi/delete_white.png</file>
- <file alias="clear.png">../../../data/android/drawable-xxxhdpi/ic_close_black_18dp.png</file>
- <file alias="busy_indicator.png">../../../data/android/drawable-xxxhdpi/busy_indicator.png</file>
<file alias="navigation_blue.png">../../../data/android/drawable-xxxhdpi/navigation_blue.png</file>
<file alias="circular_menu_backdrop.png">../../../data/android/drawable-xxxhdpi/circular_menu_backdrop.png</file>
- <file alias="ic_place.png">../../../data/android/drawable-xxxhdpi/ic_place.png</file>
- <file alias="ic_place_arrival.png">../../../data/android/drawable-xxxhdpi/ic_place_arrival.png</file>
- <file alias="ic_place_departure.png">../../../data/android/drawable-xxxhdpi/ic_place_departure.png</file>
- <file alias="ic_place_unknown.png">../../../data/android/drawable-xxxhdpi/ic_place_unknown.png</file>
- <file alias="ic_place_via.png">../../../data/android/drawable-xxxhdpi/ic_place_via.png</file>
+ <file alias="ic_place.svg">../../../data/svg/ic_place.svg</file>
+ <file alias="ic_place_arrival.svg">../../../data/svg/ic_place_arrival.svg</file>
+ <file alias="ic_place_departure.svg">../../../data/svg/ic_place_departure.svg</file>
+ <file alias="ic_place_unknown.svg">../../../data/svg/ic_place_unknown.svg</file>
+ <file alias="ic_place_via.svg">../../../data/svg/ic_place_via.svg</file>
<file alias="add.png">../../../data/android/drawable-xxxhdpi/ic_add_black_48dp.png</file>
<file>RouteProfileRadioButton.qml</file>
</qresource>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160421.tar.xz/src/apps/marble-maps-sailfishos/PlacemarkDialog.qml
^
|
| @@ -95,7 +95,7 @@
RouteProfileRadioButton {
id: addDepartureSwitch
visible: routing.routeRequestModel.count === 0
- icon.source: "qrc:///ic_place_departure.png"
+ icon.source: "qrc:///ic_place_departure.svg"
onClicked: { rowLayout.setCurrentItem(addDepartureSwitch); }
function execute() {
routing.addViaByPlacemarkAtIndex(0, placemark);
@@ -105,7 +105,7 @@
}
RouteProfileRadioButton {
id: addPlaceViaSwitch
- icon.source: "qrc:///ic_place_via.png"
+ icon.source: "qrc:///ic_place_via.svg"
onClicked: { rowLayout.setCurrentItem(addPlaceViaSwitch); }
function execute() {
ensureRouteHasDeparture();
@@ -117,7 +117,7 @@
RouteProfileRadioButton {
id: addDestinationSwitch
checked: true
- icon.source: "qrc:///ic_place_arrival.png"
+ icon.source: "qrc:///ic_place_arrival.svg"
onClicked: { rowLayout.setCurrentItem(addDestinationSwitch); }
function execute() {
ensureRouteHasDeparture();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160421.tar.xz/src/apps/marble-maps-sailfishos/RouteEditor.qml
^
|
| @@ -64,6 +64,7 @@
SilicaListView {
id: waypointList
+ // TODO: needs to adapt to itemcontextmenu appearing
// TODO: 10 is arbitrary, needs concept how to deal with full screen height
height: count > 0 ? Theme.itemSizeExtraSmall * Math.min(10,count) : 0
anchors {
@@ -95,6 +96,7 @@
left: parent.left
verticalCenter: parent.verticalCenter
}
+ iconSize: Theme.iconSizeMedium
type: index === 0 ? "departure" : (index === waypointList.count-1 ? "destination" : "waypoint")
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160421.tar.xz/src/apps/marble-maps-sailfishos/RouteProfileRadioButton.qml
^
|
| @@ -27,7 +27,8 @@
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
opacity: parent.enabled ? 1.0 : 0.4
- width: Theme.iconSizeMedium
- height: width
+ height: Theme.iconSizeMedium
+ width: height
+ sourceSize.height: height
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160421.tar.xz/src/apps/marble-maps-sailfishos/Waypoint.qml
^
|
| @@ -12,6 +12,8 @@
import QtGraphicalEffects 1.0
import QtQuick.Window 2.0
+import Sailfish.Silica 1.0
+
import org.kde.edu.marble 0.20
Item {
@@ -23,13 +25,14 @@
property var placemark: null
property int index: -1
- width: Screen.pixelDensity * 15
+ width: Theme.itemSizeExtraSmall
height: width
x: xPos - 0.5 * width
y: yPos - 0.5 * height
WaypointImage {
id: image
+ iconSize: Theme.iconSizeMedium
onClicked: {
if (type == "searchResult") {
if (placemarkDialog.placemark === placemark) {
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160421.tar.xz/src/apps/marble-maps-sailfishos/WaypointImage.qml
^
|
| @@ -19,6 +19,7 @@
// Can be 'departure', 'waypoint', 'destination', 'searchResult'
property alias type: image.state
+ property int iconSize: Theme.iconSizeMedium
signal clicked()
@@ -30,15 +31,16 @@
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
- width: Theme.iconSizeMedium
- height: width
+ height: iconSize
+ width: height
+ sourceSize.height: height
states: [
State {
name: "departure"
PropertyChanges {
target: image
- source: "qrc:///ic_place_departure.png"
+ source: "qrc:///ic_place_departure.svg"
}
},
@@ -46,7 +48,7 @@
name: "waypoint"
PropertyChanges {
target: image
- source: "qrc:///ic_place_via.png"
+ source: "qrc:///ic_place_via.svg"
}
},
@@ -54,7 +56,7 @@
name: "destination"
PropertyChanges {
target: image
- source: "qrc:///ic_place_arrival.png"
+ source: "qrc:///ic_place_arrival.svg"
}
},
@@ -62,7 +64,7 @@
name: "searchResult"
PropertyChanges {
target: image
- source: "qrc:///ic_place.png"
+ source: "qrc:///ic_place.svg"
}
}
]
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160420
+Version: 1.14.21_sfos_160421
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
