|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151122.tar.xz/src/apps/marble-maps-sailfishos/Search.qml
^
|
| @@ -78,12 +78,10 @@
Map.SearchField {
id: searchField
- property string query : ""
- property bool busy : false
- width: Theme.buttonWidthLarge
anchors {
top: parent.top
left: parent.left
+ right: parent.right
margins: Theme.horizontalPageMargin
}
completionModel: backend.completionModel
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151122.tar.xz/src/apps/marble-maps-sailfishos/SearchField.qml
^
|
| @@ -51,10 +51,39 @@
border.width: 1
}
+ IconButton {
+ id: searchButton
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: Theme.paddingMedium
+ width: icon.width
+ height: parent.height
+ visible: !root.busy
+ enabled: field.text.length > 0
+ icon.source: "image://theme/icon-m-search" + "?" + field.color
+
+ onClicked: root.search(field.text)
+ }
+ BusyIndicator {
+ id: searchBusyIndicator
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: Theme.paddingMedium
+ size: BusyIndicatorSize.ExtraSmall
+ height: parent.height
+ width: height
+ visible: running
+ running: root.busy
+ }
+
TextField {
id: field
- anchors.left: parent.left
- anchors.right: parent.right
+ anchors {
+ left: searchButton.right
+ right: clearButton.visible ? clearButton.left : clearButton.right
+ }
+ textLeftMargin: Theme.paddingMedium
+ textRightMargin: Theme.paddingMedium
placeholderText: qsTr("Search")
labelVisible: false
@@ -68,48 +97,25 @@
EnterKey.onClicked: root.search(text)
onTextChanged: root.completionRequested(text)
- BusyIndicator {
- id: searchBusyIndicator
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: clearButton.visible ? clearButton.left : clearButton.right
- anchors.rightMargin: Theme.paddingSmall
- size: BusyIndicatorSize.ExtraSmall
- height: 0.7 * field.height
- width: height
- }
-
- IconButton {
- id: clearButton
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: searchButton.visible ? searchButton.left : parent.right
- anchors.rightMargin: Theme.paddingSmall
- height: 0.7 * field.height
- width: height
- visible: field.text.length > 0
- icon.source: "image://theme/icon-m-clear"
-
- onClicked: {
- field.text = "";
- field.focus = true;
- placemarkDialog.placemark = null;
- itemStack.state = "";
- routing.clearSearchResultPlacemarks();
- cleared();
- }
- }
-
- IconButton {
- id: searchButton
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: Theme.paddingSmall
- height: 0.7 * field.height
- width: height
- visible: !root.busy
- enabled: field.text.length > 0
- icon.source: "image://theme/icon-m-search"
+ }
- onClicked: root.search(field.text)
+ IconButton {
+ id: clearButton
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.right: parent.right
+ anchors.rightMargin: Theme.paddingMedium
+ width: icon.width
+ height: parent.height
+ visible: field.text.length > 0
+ icon.source: "image://theme/icon-m-clear" + "?" + field.color
+
+ onClicked: {
+ field.text = "";
+ field.focus = true;
+ placemarkDialog.placemark = null;
+ itemStack.state = "";
+ routing.clearSearchResultPlacemarks();
+ cleared();
}
}
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151122.tar.xz/src/apps/marble-maps-sailfishos/SearchResults.qml
^
|
| @@ -52,7 +52,7 @@
Image {
id: icon
anchors.left: parent.left
- anchors.leftMargin: Theme.paddingLarge
+ anchors.leftMargin: Theme.paddingMedium
anchors.verticalCenter: parent.verticalCenter
width: height
height: placemarkName.height
@@ -64,7 +64,7 @@
id: placemarkName
anchors.left: icon.right
anchors.right: parent.right
- anchors.rightMargin: Theme.paddingLarge
+ anchors.rightMargin: Theme.paddingMedium
anchors.verticalCenter: parent.verticalCenter
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.12.20_sfos_151121
+Version: 1.12.20_sfos_151122
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
