|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160417.tar.xz/src/apps/marble-maps-sailfishos/RouteEditor.qml
^
|
| @@ -74,11 +74,20 @@
clip: true
model: routing.routeRequestModel
- delegate: Rectangle {
+ delegate: ListItem {
+ id: listItem
width: parent.width
- height: Theme.itemSizeExtraSmall
- color: touchArea.pressed || waypointList.currentIndex === index ? Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity)
- : "transparent"
+ contentHeight: Theme.itemSizeExtraSmall
+ highlighted: down || waypointList.currentIndex === index
+ menu: contextMenu
+ ListView.onRemove: animateRemoval(listItem)
+
+ function remove() {
+ remorseAction("Removing", function() {
+ routing.removeVia(index);
+ waypointList.currentIndex = Math.max(0, waypointList.currentIndex-1);
+ });
+ }
WaypointImage {
id: image
@@ -102,19 +111,15 @@
text: name
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeMedium
- color: Theme.primaryColor
+ color: highlighted ? Theme.highlightColor : Theme.primaryColor
}
- MouseArea {
- id: touchArea
- anchors.fill: parent
- onClicked: {
- if (index === waypointList.currentIndex) {
- waypointList.currentIndex = -1
- } else {
- waypointList.currentIndex = index
- marbleMaps.centerOn(longitude, latitude)
- }
+ onClicked: {
+ if (index === waypointList.currentIndex) {
+ waypointList.currentIndex = -1
+ } else {
+ waypointList.currentIndex = index
+ marbleMaps.centerOn(longitude, latitude)
}
}
@@ -144,19 +149,20 @@
waypointList.currentIndex++;
}
}
-
- ImageButton {
- id: deleteButton
- anchors.verticalCenter: parent.verticalCenter
- visible: index === waypointList.currentIndex
- imageSource: "qrc:///delete.png"
- onClicked: {
- routing.removeVia(index);
- waypointList.currentIndex = Math.max(0, waypointList.currentIndex-1);
+ }
+ Component {
+ id: contextMenu
+ ContextMenu {
+ MenuItem {
+ text: "Remove"
+ onClicked: remove()
}
}
}
}
+ VerticalScrollDecorator {
+ flickable: waypointList
+ }
}
}
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160417.tar.xz/src/apps/marble-maps-sailfishos/SearchResults.qml
^
|
| @@ -39,15 +39,10 @@
clip: true
snapMode: ListView.SnapToItem
model: root.model
- delegate: Item {
+ delegate: BackgroundItem {
width: view.width
height: Theme.itemSizeExtraSmall
-
- Rectangle {
- id: delegateBackground
- anchors.fill: parent
- color: mouseArea.pressed ? palette.highlight : root.background
- }
+ highlightedColor: palette.highlight
Image {
id: icon
@@ -68,17 +63,13 @@
anchors.verticalCenter: parent.verticalCenter
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall
- color: palette.text
+ color: highlighted ? palette.highlightedText : palette.text
text: name
elide: Text.ElideMiddle
}
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- onClicked: {
- root.itemSelected(index, name);
- }
+ onClicked: {
+ root.itemSelected(index, name);
}
Component.onCompleted: {
@@ -87,5 +78,10 @@
}
}
}
+
+ VerticalScrollDecorator {
+ flickable: view
+ color: palette.dark
+ }
}
}
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160416
+Version: 1.14.21_sfos_160417
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
