Fix:gui/qml:Made QML gui compatible with newer Qt4.7 beta.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3256 ffa7fe5e-494d-0410-b361-a75ebd5db220

20 files changed, 35 insertions, 35 deletions

diff --git a/navit/gui/qml/skins/navit/ButtonIcon.qml.in b/navit/gui/qml/skins/navit/ButtonIcon.qml.in
index 7c4803294..a50049974 100644
--- a/navit/gui/qml/skins/navit/ButtonIcon.qml.in
+++ b/navit/gui/qml/skins/navit/ButtonIcon.qml.in
@@ -11,7 +11,7 @@ Rectangle {
     width: imgItem.width+20; height: txtItem.height + 6 + imgItem.height;

     transformOrigin: Rectangle.Center;

 

-    MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }

+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }

 

    Image {

 	id: imgItem; source: gui.iconPath+container.icon; anchors.top: container.top; anchors.horizontalCenter: container.horizontalCenter;

diff --git a/navit/gui/qml/skins/navit/PageAbout.qml b/navit/gui/qml/skins/navit/PageAbout.qml
index a75b23dac..bc06effe1 100644
--- a/navit/gui/qml/skins/navit/PageAbout.qml
+++ b/navit/gui/qml/skins/navit/PageAbout.qml
@@ -14,7 +14,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PageBookmarks.qml b/navit/gui/qml/skins/navit/PageBookmarks.qml
index 00676082e..12ba79981 100644
--- a/navit/gui/qml/skins/navit/PageBookmarks.qml
+++ b/navit/gui/qml/skins/navit/PageBookmarks.qml
@@ -33,7 +33,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
@@ -62,7 +62,7 @@ Rectangle {
                  Text { id: txtItem; text: itemName; color: {itemType== "bookmark" ? "White"  : "Yellow"}
 		 font.bold: {itemType!= "bookmark" }
        	         width: list.width-imgDelete.width
-		     MouseRegion {
+		     MouseArea {
 		         id:delegateMouse
 			 anchors.fill: parent
 			 onClicked: bookmarkClick(itemName,itemType,itemValue);
@@ -72,7 +72,7 @@ Rectangle {
 			id: imgCut; source: gui.iconPath+"zoom_out.svg"; anchors.right: imgCopy.left;anchors.rightMargin: 5;
 			width: 20; height: 20;
 
-			MouseRegion {
+			MouseArea {
 				id:delegateMouseCut
 				anchors.fill: parent
 				onClicked: { bookmarks.Cut(itemName); bookmarkReload(); }
@@ -82,7 +82,7 @@ Rectangle {
 			id: imgCopy; source: gui.iconPath+"zoom_in.svg"; anchors.right: imgDelete.left;anchors.rightMargin: 5;
 			width: 20; height: 20;
 
-			MouseRegion {
+			MouseArea {
 				id:delegateMouseCopy
 				anchors.fill: parent
 				onClicked: { bookmarks.Copy(itemName); bookmarkReload(); }
@@ -92,7 +92,7 @@ Rectangle {
 			id: imgDelete; source: gui.iconPath+"gui_inactive.svg"; anchors.right: wrapper.right;anchors.rightMargin: 5;
 			width: 20; height: 20;
 
-			MouseRegion {
+			MouseArea {
 				id:delegateMouseDelete
 				anchors.fill: parent
 				onClicked: { bookmarks.Delete(itemName); bookmarkReload(); }
@@ -111,7 +111,7 @@ Rectangle {
     ListSelector { 
 	id:layoutList; text: ""
 	anchors.top: pasteBtn.bottom;
-	anchors.left: parent.left; anchors.leftMargin: 3
+	anchors.left: parent.left;
 	anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 	width: page.width; height: page.height*0.25
     }
diff --git a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml
index 9aa15c30e..7dc2f0e25 100644
--- a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml
+++ b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml
@@ -28,7 +28,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PageNavigate.qml b/navit/gui/qml/skins/navit/PageNavigate.qml
index a6ee057e4..76deb529b 100644
--- a/navit/gui/qml/skins/navit/PageNavigate.qml
+++ b/navit/gui/qml/skins/navit/PageNavigate.qml
@@ -25,7 +25,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PageNavigation.qml b/navit/gui/qml/skins/navit/PageNavigation.qml
index edcbfec8f..a319b0f78 100644
--- a/navit/gui/qml/skins/navit/PageNavigation.qml
+++ b/navit/gui/qml/skins/navit/PageNavigation.qml
@@ -21,7 +21,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PagePoi.qml b/navit/gui/qml/skins/navit/PagePoi.qml
index 91a336582..477258ac3 100644
--- a/navit/gui/qml/skins/navit/PagePoi.qml
+++ b/navit/gui/qml/skins/navit/PagePoi.qml
@@ -66,7 +66,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
@@ -122,7 +122,7 @@ Rectangle {
 		 Text { id: txtItemDist; text: itemDistance; color: "White"; anchors.leftMargin: 5; anchors.left: txtItemName.right;anchors.top: txtItemName.top }
 		 Text { id: txtItemDirect; text: itemDirection; color: "White"; anchors.leftMargin: 5; anchors.left: txtItemDist.right;anchors.top: txtItemDist.top }
              }
-	     MouseRegion {
+	     MouseArea {
 	   		id:delegateMouse
 			anchors.fill: parent
 			onClicked: { point.setNewPoint(itemValue); gui.returnSource="/main.qml"; gui.setPage("PageNavigate.qml"); }
@@ -140,7 +140,7 @@ Rectangle {
     ListSelector { 
 	id:layoutList; text: ""
 	anchors.top: distanceSlider.bottom;
-	anchors.left: parent.left; anchors.leftMargin: 3
+	anchors.left: parent.left;
 	anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 	width: page.width; height: page.height*0.25
     }
diff --git a/navit/gui/qml/skins/navit/PagePointInfo.qml b/navit/gui/qml/skins/navit/PagePointInfo.qml
index a5c4f4175..c7199115c 100644
--- a/navit/gui/qml/skins/navit/PagePointInfo.qml
+++ b/navit/gui/qml/skins/navit/PagePointInfo.qml
@@ -14,7 +14,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
@@ -70,7 +70,7 @@ Rectangle {
     ListSelector { 
 	id:layoutList; text: "Attributes";
 	anchors.top: urlTxt.bottom;
-	anchors.left: parent.left; anchors.leftMargin: 3
+	anchors.left: parent.left;
 	anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 	width: page.width; height: page.height*0.25
     }
diff --git a/navit/gui/qml/skins/navit/PageSearch.qml b/navit/gui/qml/skins/navit/PageSearch.qml
index 90c9cefb4..1ef6635c8 100644
--- a/navit/gui/qml/skins/navit/PageSearch.qml
+++ b/navit/gui/qml/skins/navit/PageSearch.qml
@@ -22,7 +22,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PageSearchSelector.qml.in b/navit/gui/qml/skins/navit/PageSearchSelector.qml.in
index 71ee70699..669f89879 100644
--- a/navit/gui/qml/skins/navit/PageSearchSelector.qml.in
+++ b/navit/gui/qml/skins/navit/PageSearchSelector.qml.in
@@ -43,7 +43,7 @@ Rectangle {
     
       Component.onCompleted: pageOpen();    
     
-      opacity: Behavior {
+      Behavior on opacity {
           NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
       }
 
@@ -83,7 +83,7 @@ Rectangle {
 		    anchors.left: imgIcon.right;anchors.leftMargin: 5
 		    width: list.width-imgIcon.width
 		}
-	        MouseRegion {
+	        MouseArea {
 	   	    id:delegateMouse
 		    anchors.fill: parent
 		    onClicked: { setSearchResult(itemName); }
diff --git a/navit/gui/qml/skins/navit/PageSettings.qml b/navit/gui/qml/skins/navit/PageSettings.qml
index 6a3322926..0b2a9afae 100644
--- a/navit/gui/qml/skins/navit/PageSettings.qml
+++ b/navit/gui/qml/skins/navit/PageSettings.qml
@@ -14,7 +14,7 @@ Rectangle {
     

     Component.onCompleted: pageOpen();    

     

-    opacity: Behavior {

+    Behavior on opacity {

         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }

     }

 

diff --git a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml
index d1dda3950..c2962b950 100644
--- a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml
@@ -36,7 +36,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
@@ -51,7 +51,7 @@ Rectangle {
 		 Text { id: txtItemDist; text: itemDistance; color: "White"; anchors.leftMargin: 5; anchors.left: txtItemName.right;anchors.top: txtItemName.top }
 		 Text { id: txtItemDirect; text: itemDirection; color: "White"; anchors.leftMargin: 5; anchors.left: txtItemDist.right;anchors.top: txtItemDist.top }
              }
-	     MouseRegion {
+	     MouseArea {
 	   		id:delegateMouse
 			anchors.fill: parent
 			onClicked: { list.currentIndex=itemId; listselector.value=itemValue; listselector.changed() }
@@ -64,7 +64,7 @@ Rectangle {
     ListSelector { 
 	id:layoutList; text: "Current layout"; itemId: navit.getAttrList("layout"); onChanged: navit.setObjectByName("layout",layoutList.value)
 	anchors.top: parent.top;
-	anchors.left: parent.left; anchors.leftMargin: 3
+	anchors.left: parent.left;
 	anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 	width: page.width/2; height: page.height*0.25
     }
diff --git a/navit/gui/qml/skins/navit/PageSettingsLocale.qml b/navit/gui/qml/skins/navit/PageSettingsLocale.qml
index bb97f4d5e..b97da314e 100644
--- a/navit/gui/qml/skins/navit/PageSettingsLocale.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsLocale.qml
@@ -15,7 +15,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PageSettingsRules.qml b/navit/gui/qml/skins/navit/PageSettingsRules.qml
index 603037081..37208692d 100644
--- a/navit/gui/qml/skins/navit/PageSettingsRules.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsRules.qml
@@ -14,7 +14,7 @@ Rectangle {
     

     Component.onCompleted: pageOpen();    

     

-    opacity: Behavior {

+    Behavior on opacity {

         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }

     }

 

@@ -23,7 +23,7 @@ Rectangle {
 

         ToggleSwitch { id: trackingSw; stOn: navit.getAttr("tracking");  text: "Lock on road"; onChanged: navit.setAttr("tracking",trackingSw.stOn)  }

         ToggleSwitch { id: orientationSw; stOn: navit.getAttr("orientation");  text: "Northing"; onChanged: navit.setAttr("orientation",orientationSw.stOn) }

-	ToggleSwitch { id: followcursorSw; stOn: navit.getAttr("follow_cursor");  text: "Map follows Vehicle"; onChanged: navit.setAttr("follow_cursor",followrcursorSw.stOn) }

+	ToggleSwitch { id: followcursorSw; stOn: navit.getAttr("follow_cursor");  text: "Map follows Vehicle"; onChanged: navit.setAttr("follow_cursor",followcursorSw.stOn) }

 	ToggleSwitch { id: autozoomSw; stOn: navit.getAttr("autozoom_active");  text: "Auto zoom"; onChanged: navit.setAttr("autozoom_active",autozoomSw.stOn) }

   }

 

diff --git a/navit/gui/qml/skins/navit/PageSettingsTools.qml b/navit/gui/qml/skins/navit/PageSettingsTools.qml
index 2efd1bde7..5182e92ba 100644
--- a/navit/gui/qml/skins/navit/PageSettingsTools.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsTools.qml
@@ -15,7 +15,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
diff --git a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml
index a2a71dab1..ffe719c37 100644
--- a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml
@@ -14,7 +14,7 @@ Rectangle {
     
     Component.onCompleted: pageOpen();    
     
-    opacity: Behavior {
+    Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
 
@@ -29,7 +29,7 @@ Rectangle {
 		 Text { id: txtItemDist; text: itemDistance; color: "White"; anchors.leftMargin: 5; anchors.left: txtItemName.right;anchors.top: txtItemName.top }
 		 Text { id: txtItemDirect; text: itemDirection; color: "White"; anchors.leftMargin: 5; anchors.left: txtItemDist.right;anchors.top: txtItemDist.top }
              }
-	     MouseRegion {
+	     MouseArea {
 	   		id:delegateMouse
 			anchors.fill: parent
 			onClicked: { list.currentIndex=itemId; listselector.value=itemValue; listselector.changed() }
diff --git a/navit/gui/qml/skins/navit/Slider.qml b/navit/gui/qml/skins/navit/Slider.qml
index 6f9feb105..6be23f53e 100644
--- a/navit/gui/qml/skins/navit/Slider.qml
+++ b/navit/gui/qml/skins/navit/Slider.qml
@@ -37,7 +37,7 @@ Rectangle {
 		GradientStop { position: 0.0; color: "steelblue" }
 		GradientStop { position: 1.0; color: "lightsteelblue" }
 	}
-	MouseRegion {
+	MouseArea {
 		anchors.fill: parent
 		onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); } 
 	}
@@ -51,7 +51,7 @@ Rectangle {
 		GradientStop { position: 0.0; color: "lightgray" }
 		GradientStop { position: 1.0; color: "gray" }
             }
-	    MouseRegion {
+	    MouseArea {
 		anchors.fill: parent
 		drag.target: parent; drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: background.width-knob.width
 		onPositionChanged: slider.value=Math.round(fromSlider(knob.x))
diff --git a/navit/gui/qml/skins/navit/ToggleButton.qml.in b/navit/gui/qml/skins/navit/ToggleButton.qml.in
index a633757f1..a64362452 100644
--- a/navit/gui/qml/skins/navit/ToggleButton.qml.in
+++ b/navit/gui/qml/skins/navit/ToggleButton.qml.in
@@ -31,7 +31,7 @@ import Qt 4.6
 
      Component.onCompleted: startup();
 
-    MouseRegion { id: mr; anchors.fill: parent; onReleased: toggle() }
+    MouseArea { id: mr; anchors.fill: parent; onReleased: toggle() }
 
    Image {
 	id: imgItem; source: gui.iconPath+togglebutton.icon; anchors.top: togglebutton.top; anchors.horizontalCenter: togglebutton.horizontalCenter;
diff --git a/navit/gui/qml/skins/navit/ToggleSwitch.qml.in b/navit/gui/qml/skins/navit/ToggleSwitch.qml.in
index fc87402bf..158a7af26 100644
--- a/navit/gui/qml/skins/navit/ToggleSwitch.qml.in
+++ b/navit/gui/qml/skins/navit/ToggleSwitch.qml.in
@@ -36,7 +36,7 @@ import Qt 4.6
 

      Image {

          id: background; source: "background.svg"

-         MouseRegion { anchors.fill: parent; onClicked: toggle() }

+         MouseArea { anchors.fill: parent; onClicked: toggle() }

 	 height: gui.height/7.5; width: height*2.4;

      }

 

@@ -44,7 +44,7 @@ import Qt 4.6
          id: knob; source: "knob.svg"; x: 1; y: 2

 	 height: gui.height/8; width: gui.height/8;

 

-         MouseRegion {

+         MouseArea {

              anchors.fill: parent

              drag.target: knob; drag.axis: "XAxis"; drag.minimumX: 1; drag.maximumX: background.width-knob.width

 	     hoverEnabled: false; onReleased: toggle()

diff --git a/navit/gui/qml/skins/navit/main.qml b/navit/gui/qml/skins/navit/main.qml
index b69b1f80c..0bddc4710 100644
--- a/navit/gui/qml/skins/navit/main.qml
+++ b/navit/gui/qml/skins/navit/main.qml
@@ -13,7 +13,7 @@ Rectangle {
     

     Component.onCompleted: pageOpen();    

     

-    opacity: Behavior {

+    Behavior on opacity {

         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }

     }