[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kanagram] src/harmattan: Fix the language selection dialog, and do not use a temporary variable for
From:       Laszlo Papp <ext-laszlo.papp () nokia ! com>
Date:       2012-02-01 2:22:54
Message-ID: 20120201022254.36DE9A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 06cb5abc5ec406aac5ec0d3ac52c1a41d68aedc4 by Laszlo Papp.
Committed on 01/02/2012 at 05:18.
Pushed by lpapp into branch 'master'.

Fix the language selection dialog, and do not use a temporary variable for that

M  +4    -6    src/harmattan/MainSettingsPage.qml
M  +5    -0    src/harmattan/kanagramenginehelper.cpp

http://commits.kde.org/kanagram/06cb5abc5ec406aac5ec0d3ac52c1a41d68aedc4

diff --git a/src/harmattan/MainSettingsPage.qml b/src/harmattan/MainSettingsPage.qml
index d1e8964..de57b00 100644
--- a/src/harmattan/MainSettingsPage.qml
+++ b/src/harmattan/MainSettingsPage.qml
@@ -23,8 +23,6 @@ import com.nokia.extras 1.0
 
 Page {
 
-    property string selectedLanguageName: qsTr("English");
-
     function pushPage(file) {
         var component = Qt.createComponent(file)
         if (component.status == Component.Ready)
@@ -41,7 +39,7 @@ Page {
         model: kanagramEngineHelper.languageNames();
 
         onSelectedIndexChanged: {
-            selectedLanguageName = model[selectedIndex];
+            kanagramEngineHelper.dataLanguage = model[selectedIndex];
         }
     }
 
@@ -109,7 +107,7 @@ Page {
                     Label {
                         id: hintAppearanceLabel;
                         anchors.left: parent.left;
-                        text: qsTr("Hint appearance [second(s)]");
+                        text: qsTr("Hint appearance in seconds");
                     }
 
                     Slider {
@@ -146,7 +144,7 @@ Page {
                     Label {
                         id: resolveTimeLabel;
                         anchors.left: parent.left;
-                        text: qsTr("Resolve time [second(s)]");
+                        text: qsTr("Resolve time in seconds");
                     }
 
                     Slider {
@@ -202,7 +200,7 @@ Page {
                 ListItem {
                     iconSource: "preferences-desktop-locale.png";
                     titleText: qsTr("Language");
-                    subtitleText: qsTr(selectedLanguageName);
+                    subtitleText: kanagramEngineHelper.dataLanguage ?  \
kanagramEngineHelper.dataLanguage : "English";  drillDownArrow: true;
                     mousePressed: languageSelectionMouseArea.pressed;
 
diff --git a/src/harmattan/kanagramenginehelper.cpp \
b/src/harmattan/kanagramenginehelper.cpp index 98e160c..3b2590b 100644
--- a/src/harmattan/kanagramenginehelper.cpp
+++ b/src/harmattan/kanagramenginehelper.cpp
@@ -21,6 +21,11 @@
 
 #include <kanagramsettings.h>
 
+#include <sharedkvtmlfiles.h>
+
+#include <KDE/KStandardDirs>
+#include <KDE/KLocale>
+
 KanagramEngineHelper::KanagramEngineHelper(KanagramGame* kanagramGame, QObject* \
parent)  : QObject(parent)
     , m_kanagramGame(kanagramGame)


[prev in list] [next in list] [prev in thread] [next in thread]