4 files changed, 53 insertions, 13 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);
     }
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h
index 1a64764..03a3547 100644
--- a/inputmethods/multikey/configdlg.h
+++ b/inputmethods/multikey/configdlg.h
@@ -19,3 +19,3 @@ signals:
     void setMapToDefault();
-    void setMapToFile(QString file);
+    void setMapToFile(int index);
 
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 671868c..c53ae6c 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -35,2 +35,4 @@
 #include <qtextstream.h>
+#include <qstringlist.h>
+#include <iostream.h>
 
@@ -290,4 +292,4 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
                        this, SLOT(setMapToDefault()));
-               connect(configdlg, SIGNAL(setMapToFile(QString)), 
-                       this, SLOT(setMapToFile(QString)));
+               connect(configdlg, SIGNAL(setMapToFile(int)), 
+                       this, SLOT(setMapToFile(int)));
                configdlg->showMaximized();
@@ -519,3 +521,3 @@ void Keyboard::setMapToDefault() {
     config->setGroup ("keymaps");
-    config->writeEntry ("current", key_map); // default closed
+    config->writeEntry ("current", -1); // default closed
     delete config;
@@ -529,3 +531,3 @@ void Keyboard::setMapToDefault() {
 
-void Keyboard::setMapToFile(QString file) {
+void Keyboard::setMapToFile(int index) {
 
@@ -534,3 +536,7 @@ void Keyboard::setMapToFile(QString file) {
     config->setGroup ("keymaps");
-    config->writeEntry ("current", file); // default closed
+    config->writeEntry ("current", index); // default closed
+
+
+    /* now you have to retrieve the map */
+    QStringList maps = config->readListEntry("maps", QChar('|'));
     delete config;
@@ -538,3 +544,7 @@ void Keyboard::setMapToFile(QString file) {
     delete keys;
-    keys = new Keys(file);
+    if (index < 0 || (int)maps.count() <= index) 
+        keys = new Keys();
+    else 
+        keys = new Keys(maps[index]);
+
     repaint(FALSE);
@@ -851,6 +861,10 @@ Keys::Keys() {
     config->setGroup( "keymaps" );
-    QString key_map = config->readEntry( "current" );
+    QStringList maps = config->readListEntry ("maps", QChar('|'));
+
+    int index = config->readNumEntry( "current", -1 );
     delete config;
 
-    if (key_map.isNull()) {
+    QString key_map;
+
+    if (index < 0 || (int)maps.count() <= index) {
 
@@ -864,2 +878,5 @@ Keys::Keys() {
 
+    } else {
+
+        key_map = maps[index];
     }
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index 400edc0..7a8d4b4 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -115,3 +115,3 @@ private slots:
     void setMapToDefault();
-    void setMapToFile(QString file);
+    void setMapToFile(int index);