1 files changed, 25 insertions, 8 deletions

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
@@ -32,8 +32,10 @@
 #include <qpe/config.h>
 #include <ctype.h>
 #include <qfile.h>
 #include <qtextstream.h>
+#include <qstringlist.h>
+#include <iostream.h>
 
 #include <sys/utsname.h>
 
 
@@ -287,10 +289,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
                connect(configdlg, SIGNAL(pickboardToggled(bool)), 
                        this, SLOT(togglePickboard(bool)));
                connect(configdlg, SIGNAL(setMapToDefault()), 
                        this, SLOT(setMapToDefault()));
-               connect(configdlg, SIGNAL(setMapToFile(QString)), 
-                       this, SLOT(setMapToFile(QString)));
+               connect(configdlg, SIGNAL(setMapToFile(int)), 
+                       this, SLOT(setMapToFile(int)));
                configdlg->showMaximized();
                configdlg->show();
                configdlg->raise();
             }
@@ -516,9 +518,9 @@ void Keyboard::setMapToDefault() {
 
     /* save change to multikey config file */
     config = new Config("multikey");
     config->setGroup ("keymaps");
-    config->writeEntry ("current", key_map); // default closed
+    config->writeEntry ("current", -1); // default closed
     delete config;
 
     delete keys;
     keys = new Keys(key_map);
@@ -526,18 +528,26 @@ void Keyboard::setMapToDefault() {
     // have to repaint the keyboard
     repaint(FALSE);
 }
 
-void Keyboard::setMapToFile(QString file) {
+void Keyboard::setMapToFile(int index) {
 
     /* save change to multikey config file */
     Config *config = new Config("multikey");
     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;
 
     delete keys;
-    keys = new Keys(file);
+    if (index < 0 || (int)maps.count() <= index) 
+        keys = new Keys();
+    else 
+        keys = new Keys(maps[index]);
+
     repaint(FALSE);
 
 }
 
@@ -848,12 +858,16 @@ ushort Keyboard::constoe(const ushort c) {
 Keys::Keys() {
 
     Config *config = new Config ("multikey");
     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) {
 
         Config *config = new Config("locale");
         config->setGroup( "Language" );
         QString l = config->readEntry( "Language" , "en" );
@@ -861,8 +875,11 @@ Keys::Keys() {
     
         key_map = QPEApplication::qpeDir() + "/share/multikey/" 
                 + l + ".keymap";
 
+    } else {
+
+        key_map = maps[index];
     }
 
 
     setKeysFromFile(key_map);