paths to maps are now saved in config dialog

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
@@ -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];
     }