Some fixes to connection manager.

[jenirok] / src / common / settings.cpp

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 7c25219..6453bb3 100644 (file)
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -27,18 +27,22 @@
 
 namespace
 {
-    static int const LANGUAGE_COUNT = 3;
+    static int const LANGUAGE_COUNT = 5;
 
     static QString const LANGUAGE_NAMES[LANGUAGE_COUNT] = {
        "English",
+       "Deutsch",
        "Norsk",
-       "Suomi"
+       "Suomi",
+       "Svenska"
     };
 
     static QString const LANGUAGE_IDS[LANGUAGE_COUNT] = {
        "en_US",
+       "de_DE",
        "nb_NO",
-       "fi_FI"
+       "fi_FI",
+       "sv_SE"
     };
 }
 
@@ -125,11 +129,20 @@ bool Settings::set(QString const& name, QString const& value)
         endEdit();
     }
 
+    settings_[name] = value;
+
     return returnValue;
 }
 
 QString Settings::get(QString const& name)
 {
+    QMap<QString, QString>::iterator it;
+
+    if((it = settings_.find(name)) != settings_.end())
+    {
+        return it.value();
+    }
+
     QString result = "";
 
     bool close = !editing_;
@@ -155,6 +168,8 @@ QString Settings::get(QString const& name)
         endEdit();
     }
 
+    settings_[name] = result;
+
     return result;
 
 }