repositioning zoom slider

repositioning zoom slider
removing mobileUi as no longer need it

Change-Id: I2295c23e8385af964f46712f4dab7ea3bb815547
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

7 files changed, 3 insertions, 11 deletions

diff --git a/examples/declarative/mapviewer/content/map/MapComponent.qml b/examples/declarative/mapviewer/content/map/MapComponent.qml
index c840491d..8feadebc 100644
--- a/examples/declarative/mapviewer/content/map/MapComponent.qml
+++ b/examples/declarative/mapviewer/content/map/MapComponent.qml
@@ -153,7 +153,7 @@ Map {
         z: map.z + 3
         anchors {
             bottom: parent.bottom;
-            bottomMargin: 56; rightMargin: 10; leftMargin: 10
+            bottomMargin: 15; rightMargin: 10; leftMargin: 90
             left: parent.left
         }
         width: parent.width - anchors.rightMargin - anchors.leftMargin
@@ -562,7 +562,6 @@ Map {
         anchors {
             bottom: zoomSlider.top;
             bottomMargin: 8;
-            leftMargin: 20
             left: zoomSlider.left
         }
         Image {
diff --git a/examples/declarative/mapviewer/content/map/MiniMap.qml b/examples/declarative/mapviewer/content/map/MiniMap.qml
index 3a4b62b7..72ca68d0 100644
--- a/examples/declarative/mapviewer/content/map/MiniMap.qml
+++ b/examples/declarative/mapviewer/content/map/MiniMap.qml
@@ -48,7 +48,7 @@ Rectangle{
     anchors.right: (parent) ? parent.right : undefined
     anchors.rightMargin: 10
     anchors.top: (parent) ? parent.top : undefined
-    anchors.topMargin: page.mobileUi ? 35 : 10
+    anchors.topMargin: 10
     color: "#242424"
     Map {
         id: miniMap
diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer.qml
index 7f601c4a..6c1657a2 100644
--- a/examples/declarative/mapviewer/mapviewer.qml
+++ b/examples/declarative/mapviewer/mapviewer.qml
@@ -48,7 +48,6 @@ Item {
     id: page
     width: parent ? parent.width : 360
     height: parent ? parent.height : 640
-    property bool mobileUi: true
     property variant map
     property variant minimap
     property list<PluginParameter> parameters
diff --git a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp b/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
index a4a7edbf..b6cd0acc 100644
--- a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
+++ b/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
@@ -103,7 +103,6 @@ int main(int argc, char *argv[])
     view.setResizeMode(QQuickView::SizeRootObjectToView);
 
     QQuickItem *object = view.rootObject();
-    object->setProperty("mobileUi", false);
     if (parameters.size() > 0) QMetaObject::invokeMethod(object, "setPluginParameters", Q_ARG(QVariant, QVariant::fromValue(parameters)));
 
     QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
diff --git a/examples/declarative/places/content/places/MapComponent.qml b/examples/declarative/places/content/places/MapComponent.qml
index 6d345c94..1583bb11 100644
--- a/examples/declarative/places/content/places/MapComponent.qml
+++ b/examples/declarative/places/content/places/MapComponent.qml
@@ -83,7 +83,7 @@ Map {
         z: map.z+1
         anchors {
             bottom: parent.bottom;
-            bottomMargin: 56; rightMargin: 10; leftMargin: 10
+            bottomMargin: 15; rightMargin: 10; leftMargin: 90
             left: parent.left
         }
         width: parent.width - anchors.rightMargin - anchors.leftMargin
@@ -110,7 +110,6 @@ Map {
         anchors {
             bottom: zoomSlider.top;
             bottomMargin: 8;
-            leftMargin: 20
             left: zoomSlider.left
         }
         Image {
diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml
index 27042808..1b8d9777 100644
--- a/examples/declarative/places/places.qml
+++ b/examples/declarative/places/places.qml
@@ -47,7 +47,6 @@ Item {
     id: page
     width: (parent && parent.width > 0) ? parent.width : 360
     height: (parent && parent.height > 0) ? parent.height : 640
-    property bool mobileUi: true
     property variant map
     property variant searchRegion : startLocation
     property variant searchRegionItem
@@ -421,7 +420,6 @@ Item {
         id: searchBox
 
         anchors.top: page.top
-        anchors.topMargin: page.mobileUi ? 20 : 0
         width: parent.width
         expandedHeight: parent.height
         z: backgroundRect.z + 3
diff --git a/examples/declarative/places/qmlplaceswrapper.cpp b/examples/declarative/places/qmlplaceswrapper.cpp
index ba8a5aa1..e2f69f1a 100644
--- a/examples/declarative/places/qmlplaceswrapper.cpp
+++ b/examples/declarative/places/qmlplaceswrapper.cpp
@@ -105,8 +105,6 @@ int main(int argc, char *argv[])
     view.setSource(QUrl(mainQmlApp));
     view.setResizeMode(QQuickView::SizeRootObjectToView);
 
-    view.rootObject()->setProperty("mobileUi", false);
-
     QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
     view.setGeometry(QRect(100, 100, 360, 640));
     view.show();