1 files changed, 26 insertions, 3 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 7bea589..c4f7413 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -22,2 +22,3 @@
 #include <qlistbox.h>
+#include <qstringlist.h>
 #include "configdlg.h"
@@ -28,2 +29,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
     setCaption( tr("Multikey Configuration") );
+    Config config ("multikey");
 
@@ -41,3 +43,2 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
     keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
-    //keymaps->setMaximumHeight(150);
 
@@ -45,4 +46,17 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
     keymaps->insertItem(cur);
+
+    config.setGroup ("keymaps");
+    QStringList maps = config.readListEntry("maps", QChar('|'));
+
+    for (unsigned int i = 0; i < maps.count(); i++) {
+
+        keymaps->insertItem(maps[i]);
+    }
+
+    // have to "+1" because the "current language" listItem... remember?
+    keymaps->setSelected(config.readNumEntry("current", 0) + 1, true);
+
     connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int)));
 
+    /*
     QString ko(QPEApplication::qpeDir() + "/share/multikey/ko.keymap");
@@ -55,2 +69,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
     keymaps->insertItem(de);
+    */
 
@@ -68,3 +83,2 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
 
-    Config config ("multikey");
     config.setGroup ("pickboard");
@@ -118,2 +132,11 @@ void ConfigDlg::pickTog() {
 
+/* 
+ * the index is kinda screwy, because in the config file, index 0 is just the
+ * first element in the QStringList, but here it's the "Current Language"
+ * listItem. therefor you have to minus one to the index before you access
+ * it from the config file. 
+ *
+ * and later on, the "current language" setting should be -1 in the config file
+ */
+
 void ConfigDlg::setMap(int index) {
@@ -132,3 +155,3 @@ void ConfigDlg::setMap(int index) {
 
-        emit setMapToFile(keymaps->text(index));
+        emit setMapToFile(index - 1);
     }