Merge branch 'trunk' into audioaudio

23 files changed, 159 insertions, 159 deletions

diff --git a/navit/gui/qml/skins/navit/ButtonIcon.qml b/navit/gui/qml/skins/navit/ButtonIcon.qml
index f969ebb5a..6e0f8f032 100644
--- a/navit/gui/qml/skins/navit/ButtonIcon.qml
+++ b/navit/gui/qml/skins/navit/ButtonIcon.qml
@@ -1,40 +1,40 @@
-import Qt 4.7

-

-Rectangle {

+import Qt 4.7
+
+Rectangle {
     id: container
-

-    signal clicked

-    property string text: "Button"

-    property string icon: "Icon.png"

-

-    color: "black"; smooth: true; opacity: 0.75

-    width: imgItem.width+20; height: txtItem.height + 6 + imgItem.height;

-    transformOrigin: Rectangle.Center;

-

-    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;

-	width: gui.height/4; height: gui.height/4

-   }

-

-    Text {

-        id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; 

-	color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter

-    }

-

-    states: [

-        State {

-            name: "Pressed"; when: mr.pressed == true

-            PropertyChanges { target: container; scale: 2.0 }

-            PropertyChanges { target: container; opacity: 1 }

-

-        }

-    ]

-

-    transitions: Transition {

-        NumberAnimation { properties: "scale"; easing.type: "OutExpo"; duration: 200 }

-        NumberAnimation { properties: "opacity"; easing.type: "InQuad"; duration: 200 }

-    }

-

-}

+
+    signal clicked
+    property string text: "Button"
+    property string icon: "Icon.png"
+
+    color: "black"; smooth: true; opacity: 0.75
+    width: imgItem.width+20; height: txtItem.height + 6 + imgItem.height;
+    transformOrigin: Rectangle.Center;
+
+    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;
+	width: gui.height/4; height: gui.height/4
+   }
+
+    Text {
+        id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter;
+	color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter
+    }
+
+    states: [
+        State {
+            name: "Pressed"; when: mr.pressed == true
+            PropertyChanges { target: container; scale: 2.0 }
+            PropertyChanges { target: container; opacity: 1 }
+
+        }
+    ]
+
+    transitions: Transition {
+        NumberAnimation { properties: "scale"; easing.type: "OutExpo"; duration: 200 }
+        NumberAnimation { properties: "opacity"; easing.type: "InQuad"; duration: 200 }
+    }
+
+}
diff --git a/navit/gui/qml/skins/navit/Cellar.qml b/navit/gui/qml/skins/navit/Cellar.qml
index de4d3c146..89ecfc899 100644
--- a/navit/gui/qml/skins/navit/Cellar.qml
+++ b/navit/gui/qml/skins/navit/Cellar.qml
@@ -3,14 +3,14 @@ import "pagenavigation.js" as Navit
 
 Rectangle {
 
-    function onStartup(currentPage) {    
+    function onStartup(currentPage) {
 	btnBack.opacity=0;
 	btnQuit.opacity=0;
        	if ( gui.lengthPage() > 1  ) {
 		btnBack.opacity=1;
 	}
 	if ( gui.lengthPage() == 1 && currentPage == "PageMain.qml" ) {
-		btnQuit.opacity=1;		
+		btnQuit.opacity=1;
 	}
     }
 
diff --git a/navit/gui/qml/skins/navit/ListSelector.qml b/navit/gui/qml/skins/navit/ListSelector.qml
index 09c927cf1..9480275be 100644
--- a/navit/gui/qml/skins/navit/ListSelector.qml
+++ b/navit/gui/qml/skins/navit/ListSelector.qml
@@ -17,8 +17,8 @@ Rectangle {
 		listScroller.opacity=0.5;
 	}
     }
-    
-    Component.onCompleted: startup();    
+
+    Component.onCompleted: startup();
 
     Text {
 	id: labelTxt; text: listselector.text; color: "White"; font.pointSize: 22;
@@ -37,7 +37,7 @@ Rectangle {
 	     clip: true
 	     highlightFollowsCurrentItem: true
 	     keyNavigationWraps: true
-	     
+
 	     Component.onCompleted: { list.currentIndex=listselector.itemId; }
          }
 	 Rectangle {
diff --git a/navit/gui/qml/skins/navit/PageAbout.qml b/navit/gui/qml/skins/navit/PageAbout.qml
index a96baabca..b026e73be 100644
--- a/navit/gui/qml/skins/navit/PageAbout.qml
+++ b/navit/gui/qml/skins/navit/PageAbout.qml
@@ -12,9 +12,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     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 15a5982b6..46da8d865 100644
--- a/navit/gui/qml/skins/navit/PageBookmarks.qml
+++ b/navit/gui/qml/skins/navit/PageBookmarks.qml
@@ -11,7 +11,7 @@ Rectangle {
     function bookmarkReload() {
 	    listModel.xml=bookmarks.getBookmarks();
 	    listModel.query="/bookmarks/bookmark";
-	    listModel.reload();        
+	    listModel.reload();
     }
 
     function bookmarkClick(itemName,itemType,itemCoord) {
@@ -31,9 +31,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -41,7 +41,7 @@ Rectangle {
     ButtonIcon { id: folderBtn; text: "New folder"; icon: "gui_active.svg"; onClicked: folderDialog.opacity=1
 		      anchors.top: parent.top; anchors.topMargin: page.height/16; anchors.left: parent.left; anchors.leftMargin: page.width/16
     }
-    ButtonIcon { id: pasteBtn; text: "Paste"; icon: "gui_active.svg"; onClicked: { bookmarks.Paste(); bookmarkReload(); } 
+    ButtonIcon { id: pasteBtn; text: "Paste"; icon: "gui_active.svg"; onClicked: { bookmarks.Paste(); bookmarkReload(); }
 		      anchors.top: parent.top; anchors.topMargin: page.height/16; anchors.left: folderBtn.right; anchors.leftMargin: page.width/16
     }
 
@@ -109,7 +109,7 @@ Rectangle {
         }
     }
 
-    ListSelector { 
+    ListSelector {
 	id:layoutList; text: ""
 	anchors.top: pasteBtn.bottom;
 	anchors.left: parent.left;
diff --git a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml
index 39694d2af..c02aea7c3 100644
--- a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml
+++ b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml
@@ -25,9 +25,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     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 3d4e04bc2..32e43841f 100644
--- a/navit/gui/qml/skins/navit/PageNavigate.qml
+++ b/navit/gui/qml/skins/navit/PageNavigate.qml
@@ -23,9 +23,9 @@ Rectangle {
 	}
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     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 4ab9f5c0f..71f21bb2f 100644
--- a/navit/gui/qml/skins/navit/PagePoi.qml
+++ b/navit/gui/qml/skins/navit/PagePoi.qml
@@ -64,9 +64,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -138,7 +138,7 @@ Rectangle {
         }
     }
 
-    ListSelector { 
+    ListSelector {
 	id:layoutList; text: ""
 	anchors.top: distanceSlider.bottom;
 	anchors.left: parent.left;
diff --git a/navit/gui/qml/skins/navit/PagePointInfo.qml b/navit/gui/qml/skins/navit/PagePointInfo.qml
index 1014c63df..c33027e26 100644
--- a/navit/gui/qml/skins/navit/PagePointInfo.qml
+++ b/navit/gui/qml/skins/navit/PagePointInfo.qml
@@ -12,9 +12,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -68,7 +68,7 @@ Rectangle {
         }
     }
 
-    ListSelector { 
+    ListSelector {
 	id:layoutList; text: "Attributes";
 	anchors.top: urlTxt.bottom;
 	anchors.left: parent.left;
diff --git a/navit/gui/qml/skins/navit/PageRoute.qml b/navit/gui/qml/skins/navit/PageRoute.qml
index a340eaa1b..ea71569b3 100644
--- a/navit/gui/qml/skins/navit/PageRoute.qml
+++ b/navit/gui/qml/skins/navit/PageRoute.qml
@@ -20,9 +20,9 @@ Rectangle {
 	}
 	route.getDestinations();
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
diff --git a/navit/gui/qml/skins/navit/PageSearch.qml b/navit/gui/qml/skins/navit/PageSearch.qml
index 3d9419920..bc93dce52 100644
--- a/navit/gui/qml/skins/navit/PageSearch.qml
+++ b/navit/gui/qml/skins/navit/PageSearch.qml
@@ -20,9 +20,9 @@ Rectangle {
        }
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -36,19 +36,19 @@ Rectangle {
 	    columns: 1;rows: 2;
 	    id: gridCountry;
             Text {
-                id: txtItemCountry; text: "Country"; 
+                id: txtItemCountry; text: "Country";
 	        color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter
 	    }
             ButtonIcon {
                 id: btnCountry; text: search.countryName; icon: "country_"+search.countryISO2+".svgz"; onClicked: { search.searchContext="country"; Navit.load("PageSearchSelector.qml"); }
-            }            
+            }
 	}
 	Grid {
 	    columns: 1; rows: 2;
 	    id: gridCity
 	    opacity: 0;
             Text {
-                id: txtItemCity; text: "Town"; 
+                id: txtItemCity; text: "Town";
 	        color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter
 	    }
             ButtonIcon {
@@ -67,7 +67,7 @@ Rectangle {
 	    id: gridStreet
 	    opacity: 0;
             Text {
-                id: txtItemStreet; text: "Street"; 
+                id: txtItemStreet; text: "Street";
 	        color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter
 	    }
             ButtonIcon {
@@ -79,7 +79,7 @@ Rectangle {
 	   id: gridAddress;
 	   opacity: 0;
             Text {
-                id: txtItemAddress; text: "Address"; 
+                id: txtItemAddress; text: "Address";
 	        color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter
 	    }
             ButtonIcon {
diff --git a/navit/gui/qml/skins/navit/PageSearchSelector.qml b/navit/gui/qml/skins/navit/PageSearchSelector.qml
index ec1ca73dd..d47fcbc71 100644
--- a/navit/gui/qml/skins/navit/PageSearchSelector.qml
+++ b/navit/gui/qml/skins/navit/PageSearchSelector.qml
@@ -40,15 +40,15 @@ Rectangle {
 	  }
           page.opacity = 1;
       }
-    
-      Component.onCompleted: pageOpen();    
-    
+
+      Component.onCompleted: pageOpen();
+
       Behavior on opacity {
           NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
       }
 
      TextInput{
-     	  id: searchTxt; 
+     	  id: searchTxt;
 	  anchors.top: parent.top; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 	  width: page.width; font.pointSize: 14; color: "White";focus: true; readOnly: false; cursorVisible: true;
      }
@@ -78,8 +78,8 @@ Rectangle {
 			id: imgIcon; source: gui.iconPath+itemIcon
 			width: 20; height: 20;
 		}
-                Text { 
-		    id: txtItemName; text: itemName; color: "White"; 
+                Text {
+		    id: txtItemName; text: itemName; color: "White";
 		    anchors.left: imgIcon.right;anchors.leftMargin: 5
 		    width: list.width-imgIcon.width
 		}
@@ -98,7 +98,7 @@ Rectangle {
         }
     }
 
-    ListSelector { 
+    ListSelector {
 	id:layoutList; text: search.searchContext; onChanged: setSearchResult()
 	anchors.top: searchTxt.bottom; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 	width: page.width; height: page.height/2-cellar.height
diff --git a/navit/gui/qml/skins/navit/PageSettings.qml b/navit/gui/qml/skins/navit/PageSettings.qml
index f7efcacd5..2030fe56f 100644
--- a/navit/gui/qml/skins/navit/PageSettings.qml
+++ b/navit/gui/qml/skins/navit/PageSettings.qml
@@ -12,9 +12,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     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 61db6a385..9d0002d9d 100644
--- a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml
@@ -34,9 +34,9 @@ Rectangle {
 	}
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -60,9 +60,9 @@ Rectangle {
          }
      }
 
-    CommonHighlight { id: listHighlight} 
+    CommonHighlight { id: listHighlight}
 
-    ListSelector { 
+    ListSelector {
 	id:layoutList; text: "Current layout"; itemId: navit.getAttrList("layout"); onChanged: navit.setObjectByName("layout",layoutList.value)
 	anchors.top: parent.top;
 	anchors.left: parent.left;
diff --git a/navit/gui/qml/skins/navit/PageSettingsLocale.qml b/navit/gui/qml/skins/navit/PageSettingsLocale.qml
index 441248484..ab4afa20d 100644
--- a/navit/gui/qml/skins/navit/PageSettingsLocale.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsLocale.qml
@@ -12,9 +12,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -22,7 +22,7 @@ Rectangle {
     Grid {
         columns: 1;rows: 3
         anchors.horizontalCenter: parent.horizontalCenter;
-        anchors.verticalCenter: parent.verticalCenter; 
+        anchors.verticalCenter: parent.verticalCenter;
 
 	Text { id: lang; text: gui.localeName; color: "White";font.pointSize: gui.height/24 }
 	Text { id: langname; text: gui.langName; color: "White";font.pointSize: gui.height/24 }
diff --git a/navit/gui/qml/skins/navit/PageSettingsRules.qml b/navit/gui/qml/skins/navit/PageSettingsRules.qml
index e5238f584..007f36c84 100644
--- a/navit/gui/qml/skins/navit/PageSettingsRules.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsRules.qml
@@ -1,38 +1,38 @@
 import Qt 4.7
 import "pagenavigation.js" as Navit
-

-Rectangle {

-    id: page

-

-    width: gui.width; height: gui.height

-    border.width: 1

-    color: "Black"

-    opacity: 0

-

-    function pageOpen() {

-        page.opacity = 1;

-    }

-    

-    Component.onCompleted: pageOpen();    

-    

-    Behavior on opacity {

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

-    }

-

-  VisualItemModel {

-      	id: selectorsModel

-

-        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",followcursorSw.stOn) }

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

-  }

-

-  ListView {

-      	id: selectorsList; model: selectorsModel

-        focus: true; clip: true; orientation: Qt.Vertical

-	anchors.verticalCenter: parent.verticalCenter; anchors.horizontalCenter: parent.horizontalCenter;

-	width: trackingSw.width*1.5; height: trackingSw.height*4

-  }

-    Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width }

-}

+
+Rectangle {
+    id: page
+
+    width: gui.width; height: gui.height
+    border.width: 1
+    color: "Black"
+    opacity: 0
+
+    function pageOpen() {
+        page.opacity = 1;
+    }
+
+    Component.onCompleted: pageOpen();
+
+    Behavior on opacity {
+        NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
+    }
+
+  VisualItemModel {
+      	id: selectorsModel
+
+        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",followcursorSw.stOn) }
+	ToggleSwitch { id: autozoomSw; stOn: navit.getAttr("autozoom_active");  text: "Auto zoom"; onChanged: navit.setAttr("autozoom_active",autozoomSw.stOn) }
+  }
+
+  ListView {
+      	id: selectorsList; model: selectorsModel
+        focus: true; clip: true; orientation: Qt.Vertical
+	anchors.verticalCenter: parent.verticalCenter; anchors.horizontalCenter: parent.horizontalCenter;
+	width: trackingSw.width*1.5; height: trackingSw.height*4
+  }
+    Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width }
+}
diff --git a/navit/gui/qml/skins/navit/PageSettingsTools.qml b/navit/gui/qml/skins/navit/PageSettingsTools.qml
index a4af1222e..717bdc9fd 100644
--- a/navit/gui/qml/skins/navit/PageSettingsTools.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsTools.qml
@@ -12,9 +12,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -22,7 +22,7 @@ Rectangle {
     Grid {
         columns: 1;rows: 1
         anchors.horizontalCenter: parent.horizontalCenter;
-        anchors.verticalCenter: parent.verticalCenter; 
+        anchors.verticalCenter: parent.verticalCenter;
         ButtonIcon {
             id: btnDisplay; text: "Locale"; icon: "gui_actions.svg"; onClicked: Navit.load("PageSettingsLocale.qml");
         }
diff --git a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml
index 157afcb00..189b8fd1f 100644
--- a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml
+++ b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml
@@ -12,9 +12,9 @@ Rectangle {
     function pageOpen() {
         page.opacity = 1;
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -43,9 +43,9 @@ Rectangle {
 		}
 	}
     }
-	CommonHighlight { id: listHighlight} 
+	CommonHighlight { id: listHighlight}
 
-	ListSelector { 
+	ListSelector {
 		id:vehicleList; text: "Current vehicle profile"; itemId: navit.itemId; onChanged: {navit.setObjectByName("vehicle",vehicleList.value) }
 		anchors.top: parent.top; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32
 		anchors.left: parent.left; width: page.width/2;height: page.height/2
diff --git a/navit/gui/qml/skins/navit/Slider.qml b/navit/gui/qml/skins/navit/Slider.qml
index e4d56e031..698a9f6e1 100644
--- a/navit/gui/qml/skins/navit/Slider.qml
+++ b/navit/gui/qml/skins/navit/Slider.qml
@@ -39,7 +39,7 @@ Rectangle {
 	}
 	MouseArea {
 		anchors.fill: parent
-		onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); } 
+		onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); }
 	}
 
 	radius: 8; opacity: 0.7
diff --git a/navit/gui/qml/skins/navit/ToggleButton.qml b/navit/gui/qml/skins/navit/ToggleButton.qml
index 29d986601..30617644b 100644
--- a/navit/gui/qml/skins/navit/ToggleButton.qml
+++ b/navit/gui/qml/skins/navit/ToggleButton.qml
@@ -13,14 +13,14 @@ import Qt 4.7
      function toggle() {
          if (togglebutton.state == "on")
              togglebutton.state = "off";
-         else 
+         else
 	     togglebutton.state = "on";
      }
 
      function startup () {
-	 if (togglebutton.stOn == "1" ) 
+	 if (togglebutton.stOn == "1" )
        		togglebutton.stOn = "true";
-	 else if (togglebutton.stOn == "0" ) 
+	 else if (togglebutton.stOn == "0" )
 		togglebutton.stOn = "false";
          if (togglebutton.stOn == "true")
              togglebutton.state = "on";
@@ -38,7 +38,7 @@ import Qt 4.7
    }
 
     Text {
-        id: txtItem; text: togglebutton.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: togglebutton.horizontalCenter; 
+        id: txtItem; text: togglebutton.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: togglebutton.horizontalCenter;
 	color: "White"; font.pointSize: gui.height/64; horizontalAlignment: Qt.AlignHCenter
     }
 
diff --git a/navit/gui/qml/skins/navit/ToggleSwitch.qml b/navit/gui/qml/skins/navit/ToggleSwitch.qml
index b1b262461..14bc7b0ba 100644
--- a/navit/gui/qml/skins/navit/ToggleSwitch.qml
+++ b/navit/gui/qml/skins/navit/ToggleSwitch.qml
@@ -15,9 +15,9 @@ import Qt 4.7
      }
 
      function startup () {
-	 if (toggleswitch.stOn == "1" ) 
+	 if (toggleswitch.stOn == "1" )
        		toggleswitch.stOn = "true";
-	 else if (toggleswitch.stOn == "0" ) 
+	 else if (toggleswitch.stOn == "0" )
 		toggleswitch.stOn = "false";
          if (toggleswitch.stOn == "true")
              toggleswitch.state = "on";
diff --git a/navit/gui/qml/skins/navit/command.js b/navit/gui/qml/skins/navit/command.js
index 071653acf..bcf0cf746 100644
--- a/navit/gui/qml/skins/navit/command.js
+++ b/navit/gui/qml/skins/navit/command.js
@@ -1,7 +1,7 @@
 import Qt 4.7
 
 Rectangle {
-    id: page    
+    id: page
 
     function pageOpen(command) {
         if ( command=="menu") {
@@ -11,10 +11,10 @@ Rectangle {
 	if (command=="quit") {
 		navit.quit();
 	}
-	
+
     }
-    
-    Component.onCompleted: pageOpen(gui.commandFunction);    
-    
-	Text { id: myText; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "Black"; font.pointSize: gui.height/32 }    
+
+    Component.onCompleted: pageOpen(gui.commandFunction);
+
+	Text { id: myText; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "Black"; font.pointSize: gui.height/32 }
 }
diff --git a/navit/gui/qml/skins/navit/main.qml b/navit/gui/qml/skins/navit/main.qml
index 20b93d113..344dd182d 100644
--- a/navit/gui/qml/skins/navit/main.qml
+++ b/navit/gui/qml/skins/navit/main.qml
@@ -11,9 +11,9 @@ Rectangle {
     function pageOpen() {
     	Navit.load("PageMain.qml");
     }
-    
-    Component.onCompleted: pageOpen();    
-    
+
+    Component.onCompleted: pageOpen();
+
     Behavior on opacity {
         NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true }
     }
@@ -25,7 +25,7 @@ Rectangle {
 	height: gui.height-cellar.height;
 	anchors.horizontalCenter: parent.horizontalCenter;
 	anchors.verticalCenter: parent.verticalCenter;
-    }	
+    }
 
     Cellar {id: cellar;anchors.bottom: main.bottom; anchors.horizontalCenter: main.horizontalCenter; width: main.width }
 }