From f64447a7c8a3ba855923e3d9a1c2e9c62e6bdba4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 19 Jun 2011 21:23:26 +0300
Subject: Fix reading default config values in setupitem class.

---
 src/gui/setupitem.cpp | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

(limited to 'src/gui/setupitem.cpp')

diff --git a/src/gui/setupitem.cpp b/src/gui/setupitem.cpp
index 9af65f23f..ecd6a9407 100644
--- a/src/gui/setupitem.cpp
+++ b/src/gui/setupitem.cpp
@@ -52,7 +52,8 @@ SetupItem::SetupItem(std::string text, std::string description,
     mUseDefault(false),
     mValue(""),
     mDefault(""),
-    mWidget(0)
+    mWidget(0),
+    mValueType(VBOOL)
 {
 }
 
@@ -68,7 +69,8 @@ SetupItem::SetupItem(std::string text, std::string description,
     mUseDefault(true),
     mValue(""),
     mDefault(def),
-    mWidget(0)
+    mWidget(0),
+    mValueType(VBOOL)
 {
 }
 
@@ -89,9 +91,28 @@ void SetupItem::load()
 {
     Configuration *cfg = getConfig();
     if (mUseDefault)
+    {
         mValue = cfg->getValue(mKeyName, mDefault);
+    }
     else
-        mValue = cfg->getStringValue(mKeyName);
+    {
+        switch (mValueType)
+        {
+            case VBOOL:
+                if (cfg->getBoolValue(mKeyName))
+                    mValue = "1";
+                else
+                    mValue = "0";
+                break;
+            case VSTR:
+            default:
+                mValue = cfg->getStringValue(mKeyName);
+                break;
+            case VINT:
+                mValue = toString(cfg->getIntValue(mKeyName));
+                break;
+        }
+    }
 }
 
 void SetupItem::save()
@@ -207,6 +228,7 @@ SetupItemTextField::SetupItemTextField(std::string text,
     mButton(0),
     mEditDialog(0)
 {
+    mValueType = VSTR;
     createControls();
 }
 
@@ -223,6 +245,7 @@ SetupItemTextField::SetupItemTextField(std::string text,
     mButton(0),
     mEditDialog(0)
 {
+    mValueType = VSTR;
     createControls();
 }
 
@@ -306,16 +329,6 @@ void SetupItemTextField::apply(std::string eventName)
 }
 
 
-
-
-
-
-
-
-
-
-
-
 SetupItemIntTextField::SetupItemIntTextField(std::string text,
                                              std::string description,
                                              std::string keyName,
@@ -332,6 +345,7 @@ SetupItemIntTextField::SetupItemIntTextField(std::string text,
     mMax(max),
     mEditDialog(0)
 {
+    mValueType = VSTR;
     createControls();
 }
 
@@ -352,6 +366,7 @@ SetupItemIntTextField::SetupItemIntTextField(std::string text,
     mMax(max),
     mEditDialog(0)
 {
+    mValueType = VSTR;
     createControls();
 }
 
-- 
cgit v1.2.3-60-g2f50