From c3f48496f5ff516e21f14416be3fa0d744851fb4 Mon Sep 17 00:00:00 2001 From: akashihi Date: Sun, 14 Mar 2010 15:46:14 +0000 Subject: [PATCH] Add:gui/qml:Added locale checking tool git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3009 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/gui/qml/skins/navit/PageSettingsLocale.qml | 6 +++--- navit/navit/gui/qml/skins/navit/PageSettingsRules.qml | 6 +++--- navit/navit/gui/qml/skins/navit/ToggleSwitch.qml | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/navit/navit/gui/qml/skins/navit/PageSettingsLocale.qml b/navit/navit/gui/qml/skins/navit/PageSettingsLocale.qml index 964a2ff..8219e85 100644 --- a/navit/navit/gui/qml/skins/navit/PageSettingsLocale.qml +++ b/navit/navit/gui/qml/skins/navit/PageSettingsLocale.qml @@ -24,9 +24,9 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter; anchors.verticalCenter: parent.verticalCenter; - Text { id: lang; anchors.bottom: langname.top; text: "Hi, i'm Navit!"; color: "White" } - Text { id: langname; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "White" } - Text { id: ctryname; anchors.top: langname.bottom; text: "Hi, i'm Navit!"; color: "White" } + Text { id: lang; anchors.bottom: langname.top; text: gui.localeName; color: "White" } + Text { id: langname; anchors.centerIn: parent; text: gui.langName; color: "White" } + Text { id: ctryname; anchors.top: langname.bottom; text: gui.ctryName; color: "White" } } Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width } diff --git a/navit/navit/gui/qml/skins/navit/PageSettingsRules.qml b/navit/navit/gui/qml/skins/navit/PageSettingsRules.qml index 290efbb..945b298 100644 --- a/navit/navit/gui/qml/skins/navit/PageSettingsRules.qml +++ b/navit/navit/gui/qml/skins/navit/PageSettingsRules.qml @@ -24,13 +24,13 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter; spacing: 64 ToggleSwitch { - on: navit.getAttr("tracking"); text: "Lock on road" + id: trackingSw; on: navit.getAttr("tracking"); text: "Lock on road"; onChanged: navit.setAttr("tracking",trackingSw.on) } ToggleSwitch { - on: navit.getAttr("orientation"); text: "Northing" + id: orientationSw; on: navit.getAttr("orientation"); text: "Northing"; onChanged: navit.setAttr("orientation",orientationSw.on) } ToggleSwitch { - on: navit.getAttr("follow_cursor"); text: "Map follows Vehicle" + id: followrcursorSw; on: navit.getAttr("follow_cursor"); text: "Map follows Vehicle"; onChanged: navit.setAttr("follow_cursor",followrcursorSw.on) } } diff --git a/navit/navit/gui/qml/skins/navit/ToggleSwitch.qml b/navit/navit/gui/qml/skins/navit/ToggleSwitch.qml index 7f229af..ff1c832 100644 --- a/navit/navit/gui/qml/skins/navit/ToggleSwitch.qml +++ b/navit/navit/gui/qml/skins/navit/ToggleSwitch.qml @@ -6,6 +6,7 @@ import Qt 4.6 property string on: "false" property string text: "Toggle switch" + signal changed function toggle() { if (toggleswitch.state == "on") @@ -51,10 +52,14 @@ import Qt 4.6 State { name: "on" PropertyChanges { target: knob; x: 78 } + PropertyChanges { target: toggleswitch; on: "true" } + StateChangeScript { script: toggleswitch.changed(); } }, State { name: "off" PropertyChanges { target: knob; x: 1 } + PropertyChanges { target: toggleswitch; on: "false" } + StateChangeScript { script: toggleswitch.changed(); } } ] -- 2.7.4