4 files changed, 92 insertions, 42 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 157714c..a6e4dad 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -1,162 +1,219 @@
 /*
  * TODO
  * make a font selection thing (size too)
  *
  *
  *
  */
 
+#include <iostream.h>
+
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
 #include <qwidget.h>
 #include <qdialog.h>
 #include <qtabwidget.h>
 #include <qvbox.h>
 #include <qgrid.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qsizepolicy.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qstringlist.h>
 #include <opie/ofiledialog.h>
-#include <iostream.h>
+#include <qdir.h>
+#include <qfileinfo.h>
 #include "configdlg.h"
 #include "keyboard.h"
 
 ConfigDlg::ConfigDlg () : QTabWidget ()
 {
     setCaption( tr("Multikey Configuration") );
     Config config ("multikey");
+    config.setGroup("keymaps");
+    QString current_map = config.readEntry("current", 0);
 
     /*
      * 'general config' tab
      */
 
     QVBox *gen_box = new QVBox (this);
     gen_box->setMargin(3);
     addTab(gen_box, tr("General Settings"));
 
     QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box);
 
     keymaps = new QListBox (map_group);
     keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 
     QString cur(tr("Current Language"));
     keymaps->insertItem(cur);
+    keymaps->setSelected(0, true);
 
-    config.setGroup ("keymaps");
-    QStringList maps = config.readListEntry("maps", QChar('|'));
+    QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap");
+    default_maps = map_dir.entryList(); // so i can access it in other places
+
+    for (uint i = 0; i <map_dir.count(); i++) {
+
+        keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]);
+        if (map_dir.absPath() + "/" + map_dir[i] == current_map) {
+
+            keymaps->setSelected(i + 1, true);
+        }
+
+    } 
+
+    custom_maps = config.readListEntry("maps", QChar('|'));
+
+    for (uint i = 0; i < custom_maps.count(); i++) {
+
+        if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false) 
+                        || !QFile::exists(custom_maps[i])) {
+
+            custom_maps.remove(custom_maps.at(i));
+
+            // remove it from the list too
+            config.writeEntry("maps", custom_maps.join("|"));
 
-    for (unsigned int i = 0; i < maps.count(); i++) {
 
-        keymaps->insertItem(maps[i]);
+        } else {
+
+            keymaps->insertItem(custom_maps[i]);
+            if (custom_maps[i] == current_map) {
+
+                keymaps->setSelected(map_dir.count() + i + 1, true);
+            }
+        }
     }
 
     // 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)));
 
 
     QGrid *add_remove_grid = new QGrid(2, map_group);
     add_remove_grid->setMargin(3);
     add_remove_grid->setSpacing(3);
 
     add_button = new QPushButton(tr("Add"), add_remove_grid);
     add_button->setFlat((bool)1);
     connect(add_button, SIGNAL(clicked()), SLOT(addMap()));
 
     remove_button = new QPushButton(tr("Remove"), add_remove_grid);
     remove_button->setFlat((bool)1);
+    connect(remove_button, SIGNAL(clicked()), SLOT(removeMap()));
 
     pick_button = new QCheckBox(tr("Pickboard"), gen_box);
 
     config.setGroup ("pickboard");
     bool pick_open = config.readBoolEntry ("open", "0"); // default closed
     if (pick_open) {
 
         pick_button->setChecked(true);
     }
 
     // by connecting it after checking it, the signal isn't emmited
     connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog()));
 
     /*
      * 'color' tab
      */
 
     QGrid *color_box = new QGrid(2, this);
     color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
     color_box->setMargin(3);
     color_box->setSpacing(3);
     addTab(color_box, tr("Colors"));
 
     QLabel *label;
 
     label = new QLabel(tr("Key Color"), color_box);
     QPushButton *button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Key Pressed Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Line Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Text Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
 
     label = new QLabel("", color_box); // a spacer so the above buttons dont expand
     label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 
 }
 
 void ConfigDlg::pickTog() {
 
     Config config ("multikey");
     config.setGroup ("pickboard");
     config.writeEntry ("open", pick_button->isChecked()); // default closed
 
     emit pickboardToggled(pick_button->isChecked());
 }
 
 /* 
  * 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. 
+ * listItem. therefor you have to minus one to the index before you access it.
  *
- * and later on, the "current language" setting should be -1 in the config file
  */
 
 void ConfigDlg::setMap(int index) {
 
     if (index == 0) {
 
-        if (remove_button->isEnabled())
             remove_button->setDisabled(true);
 
         emit setMapToDefault();
     }
-    else {
+    else if ((uint)index <= default_maps.count()) {
+
+        remove_button->setDisabled(true);
+
+    } else {
 
-        if (!remove_button->isEnabled()) 
             remove_button->setEnabled(true);
 
-        emit setMapToFile(index - 1);
+        emit setMapToFile(keymaps->text(index));
     }
 }
 
 void ConfigDlg::addMap() {
 
-    QString map = OFileDialog::getOpenFileName(2, QPEApplication::qpeDir() + "/share/multikey");
-    cout << "added file " << map << "!\n";
+    QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
+    Config config ("multikey");
+    config.setGroup("keymaps");
+    QStringList maps = config.readListEntry("maps", QChar('|'));
+    maps.append(map);
+    keymaps->insertItem(map);
+    keymaps->setSelected(keymaps->count() - 1, true);
+
+
+    config.writeEntry("maps", maps.join("|"));
+    config.writeEntry("current", map);
 
 }
 
-void ConfigDlg::removeMap(int index) {
+void ConfigDlg::removeMap() {
+
+    cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n";
+    cout << "currentItem : " << keymaps->currentItem() << "\n";
 
+    // move selection up one
+    keymaps->setSelected(keymaps->currentItem() - 1, true);
+    // delete the next selected item cus you just moved it up
+    keymaps->removeItem(keymaps->currentItem() + 1);
+
+    custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]);
+
+    // write the changes
+    Config config ("multikey");
+    config.setGroup("keymaps");
+    config.writeEntry("maps", custom_maps.join("|"));
 }
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h
index 03a3547..07d109c 100644
--- a/inputmethods/multikey/configdlg.h
+++ b/inputmethods/multikey/configdlg.h
@@ -1,36 +1,40 @@
 #include <qpe/qpeapplication.h>
 #include <qtabwidget.h>
 #include <qcheckbox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
 #ifndef CONFIGDLG_H
 #define CONFIGDLG_H
 
 class ConfigDlg : public QTabWidget
 {
     Q_OBJECT
 
 public:
     ConfigDlg ();
 
 signals:
     void pickboardToggled(bool on_off);
     void setMapToDefault();
-    void setMapToFile(int index);
+    void setMapToFile(QString map);
 
 private slots:
     void pickTog();
     void setMap(int index);
     void addMap();
-    void removeMap(int index);
+    void removeMap();
 
 private:
     QCheckBox *pick_button;
     QListBox *keymaps;
     QPushButton *add_button;
     QPushButton *remove_button;
 
+
+    QStringList default_maps; // the maps in your share/multikey/ dir
+    QStringList custom_maps; // maps you added with the 'add' button
+
 };
 
 #endif
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index c53ae6c..ac3d9be 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -245,98 +245,98 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
             x += keyWidthPix;
         }
 
 
     }
     p.drawLine(0, height() - 1, width(), height() - 1);
     p.drawLine(width() - 1, 0, width() - 1, height());
     }
 
 }
 
 
 /* Keyboard::mousePressEvent {{{1 */
 void Keyboard::mousePressEvent(QMouseEvent *e)
 {
     int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1;
     if (row > 5) row = 5;
 
     // figure out the column
     int col = 0; 
     for (int w = 0; e->x() >= w; col++)
         if (col < keys->numKeys(row)) // it segfaults if it trys to read past numKeys
             w += keys->width(row,col) * defaultKeyWidth;
         else break;
 
     col --; // rewind one...
 
     qkeycode = keys->qcode(row, col);
     unicode = keys->uni(row, col);
 
     // might need to repaint if two or more of the same keys.
     // should be faster if just paint one key even though multiple keys exist.
     bool need_repaint = FALSE; 
 
     if (unicode == 0) { // either Qt char, or nothing
 
         if (qkeycode == Qt::Key_F1) { // toggle the pickboard
 
             if ( configdlg ) { 
                 delete (ConfigDlg *) configdlg; 
                 configdlg = 0;
             }
             else {
                configdlg = new ConfigDlg ();
                connect(configdlg, SIGNAL(pickboardToggled(bool)), 
                        this, SLOT(togglePickboard(bool)));
                connect(configdlg, SIGNAL(setMapToDefault()), 
                        this, SLOT(setMapToDefault()));
-               connect(configdlg, SIGNAL(setMapToFile(int)), 
-                       this, SLOT(setMapToFile(int)));
+               connect(configdlg, SIGNAL(setMapToFile(QString)), 
+                       this, SLOT(setMapToFile(QString)));
                configdlg->showMaximized();
                configdlg->show();
                configdlg->raise();
             }
 
         } else if (qkeycode == Qt::Key_Control) {
             ctrl = keys->pressedPtr(row, col);
             need_repaint = TRUE;
             *ctrl = !keys->pressed(row, col);
 
         } else if (qkeycode == Qt::Key_Alt) {
             alt = keys->pressedPtr(row, col);
             need_repaint = TRUE;
             *alt = !keys->pressed(row, col);
 
         } else if (qkeycode == Qt::Key_Shift) {
             need_repaint = TRUE;
 
             if (shift) {
                 *shift = 0;
                 shift = 0;
             }
             else {
                 shift = keys->pressedPtr(row, col);
                 *shift = 1;
                 if (lock) {
                     *lock = 0;
                     lock = 0;
                 }
             }
 
         } else if (qkeycode == Qt::Key_CapsLock) {
             need_repaint = TRUE;
 
             if (lock) {
                 *lock = 0;
                 lock = 0;
             }
             else {
                 lock = keys->pressedPtr(row, col);;
                 *lock = 1;
                 if (shift) {
                     *shift = 0;
                     shift = 0;
                 }
             }
 
         }
@@ -474,123 +474,120 @@ void Keyboard::resetState()
 {
     schar = mchar = echar = 0;
     picks->resetState();
 }
 
 /* Keyboard::togglePickboard {{{1 */
 void Keyboard::togglePickboard(bool on_off)
 {
     usePicks = on_off;
     if (usePicks) {
         picks->show();
         //move(x(), y() - picks->height()); // not required anymore because QCopChannel::send
         //adjustSize();
         QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
     } else {
 
         picks->hide();
         picks->resetState();
         //move(x(), y() + picks->height());
         //adjustSize();
         QObject::disconnect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
 
     }
     /*
      * this closes && opens the input method
      */
     QCopChannel::send ("QPE/TaskBar", "hideInputMethod()");
     QCopChannel::send ("QPE/TaskBar", "showInputMethod()");
 }
 
 /* Keyboard::setMapTo ... {{{1 */
 void Keyboard::setMapToDefault() {
 
 
     /* load current locale language map */
     Config *config = new Config("locale");
     config->setGroup( "Language" );
     QString l = config->readEntry( "Language" , "en" );
     delete config;
 
     QString key_map = QPEApplication::qpeDir() + "/share/multikey/" 
             + l + ".keymap";
 
     /* save change to multikey config file */
     config = new Config("multikey");
     config->setGroup ("keymaps");
-    config->writeEntry ("current", -1); // default closed
+    config->writeEntry ("current", key_map); // default closed
     delete config;
 
     delete keys;
     keys = new Keys(key_map);
 
     // have to repaint the keyboard
     repaint(FALSE);
 }
 
-void Keyboard::setMapToFile(int index) {
+void Keyboard::setMapToFile(QString map) {
 
     /* save change to multikey config file */
     Config *config = new Config("multikey");
     config->setGroup ("keymaps");
-    config->writeEntry ("current", index); // default closed
+    config->writeEntry ("current", map); // default closed
 
-
-    /* now you have to retrieve the map */
-    QStringList maps = config->readListEntry("maps", QChar('|'));
     delete config;
 
     delete keys;
-    if (index < 0 || (int)maps.count() <= index) 
-        keys = new Keys();
+    if (QFile(map).exists()) 
+        keys = new Keys(map);
     else 
-        keys = new Keys(maps[index]);
+        keys = new Keys();
 
     repaint(FALSE);
 
 }
 
 /* korean input functions {{{1 
  *
  * TODO
  * one major problem with this implementation is that you can't move the
  * cursor after inputing korean chars, otherwise it will eat up and replace
  * the char before the cursor you move to. fix that
  *
  * make backspace delete one single char, not the whole thing if still 
  * editing.
  *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
  *
  * how korean input works
  *
  * all following chars means unicode char value and are in hex
  *
  * ÃÊÀ½ = schar (start char)
  * ÁßÀ½ = mchar (middle char)
  * ³¡À½ = echar (end char)
  *
  * there are 19 schars. unicode position is at 1100 - 1112
  * there are 21 mchars. unicode position is at 1161 - 1175
  * there are 27 echars. unicode position is at 11a8 - 11c2
  *
  * the map with everything combined is at ac00 - d7a3
  *
  */
 
 ushort Keyboard::parseKoreanInput (ushort c) {
 
         if ((c != 0 && (c < 0x1100 || 0x11c2 < c) && (c < 0xac00 || 0xd7a3 < c)) 
           ||
         (c == 0 && qkeycode != Qt::Key_Shift && Qt::Key_CapsLock != qkeycode
          && qkeycode != Qt::Key_Control && qkeycode != Qt::Key_Alt)) {
 
                 schar = 0, mchar = 0, echar = 0;
         return c;
         }
 
         if ( 0x1100 <= c && c <= 0x1112 ) { // schar or echar was input
 
                 if (schar == 0 || (schar != 0 && mchar == 0)) {
                         schar = c; mchar = 0; echar = 0;
@@ -814,120 +811,112 @@ ushort Keyboard::constoe(const ushort c) {
                         case 0x1106: return 0x11b7;
                         case 0x1107: return 0x11b8;
                         case 0x1109: return 0x11ba;
                         case 0x110a: return 0x11bb;
                         case 0x110b: return 0x11bc;
                         case 0x110c: return 0x11bd;
                         case 0x110e: return 0x11be;
                         case 0x110f: return 0x11bf;
                         case 0x1110: return 0x11c0;
                         case 0x1111: return 0x11c1;
                         case 0x1112: return 0x11c2;
                         default: return 0;
 
                 }
 
         } else { //echar to schar
 
                 switch (c) {
                         case 0x11a8: return 0x1100;
                         case 0x11a9: return 0x1101;
                         case 0x11ab: return 0x1102;
                         case 0x11ae: return 0x1103;
                         case 0x11af: return 0x1105;
                         case 0x11b7: return 0x1106;
                         case 0x11b8: return 0x1107;
                         case 0x11ba: return 0x1109;
                         case 0x11bb: return 0x110a;
                         case 0x11bc: return 0x110b;
                         case 0x11bd: return 0x110c;
                         case 0x11be: return 0x110e;
                         case 0x11bf: return 0x110f;
                         case 0x11c0: return 0x1110;
                         case 0x11c1: return 0x1111;
                         case 0x11c2: return 0x1112;
                         default: return 0;
 
                 }
 
         }
 }
 
 
 // Keys::Keys {{{1
 
 Keys::Keys() {
 
     Config *config = new Config ("multikey");
     config->setGroup( "keymaps" );
-    QStringList maps = config->readListEntry ("maps", QChar('|'));
-
-    int index = config->readNumEntry( "current", -1 );
+    QString map = config->readEntry( "current" );
     delete config;
 
-    QString key_map;
-
-    if (index < 0 || (int)maps.count() <= index) {
+    if (map.isNull() || !(QFile(map).exists())) {
 
         Config *config = new Config("locale");
         config->setGroup( "Language" );
         QString l = config->readEntry( "Language" , "en" );
         delete config;
     
-        key_map = QPEApplication::qpeDir() + "/share/multikey/" 
+        map = QPEApplication::qpeDir() + "/share/multikey/" 
                 + l + ".keymap";
 
-    } else {
-
-        key_map = maps[index];
     }
 
-
-    setKeysFromFile(key_map);
+    setKeysFromFile(map);
 }
 
 Keys::Keys(const char * filename) {
 
     setKeysFromFile(filename);
 }
 
 // Keys::setKeysFromFile {{{2
 void Keys::setKeysFromFile(const char * filename) {
 
     QFile f(filename);
 
     if (f.open(IO_ReadOnly)) {
 
         QTextStream t(&f);
         int row;
         int qcode;
         ushort unicode;
         int width;
         QString buf;
         QString comment;
         char * xpm[256]; //couldnt be larger than that... could it?
         QPixmap *xpm2pix = 0;
 
         buf = t.readLine();
         while (buf) {
 
             // key definition
             if (buf.contains(QRegExp("^\\d+\\s+[0-1a-fx]+", FALSE, FALSE))) { 
             // no $1 type referencing!!! this implementation of regexp sucks
 
                 // dont know of any sscanf() type funcs in Qt lib
                 QTextStream tmp (buf, IO_ReadOnly);
                 tmp >> row >> qcode >> unicode >> width >> comment;
 
                 buf = t.readLine();
                 int xpmLineCount = 0;
                 xpm2pix = 0;
 
                 // erase blank space
                 while (buf.contains(QRegExp("^\\s*$")) && buf) buf = t.readLine();
 
                 while (buf.contains(QRegExp("^\\s*\".*\""))) {
 
                     QString xpmBuf = buf.stripWhiteSpace();
 
                     xpm[xpmLineCount] = new char [xpmBuf.length()];
 
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index 7a8d4b4..805f0ed 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -68,91 +68,91 @@ public:
     void    setKey(const int row, const int qcode, const ushort unicode, 
                     const int width, QPixmap *pix);
     void    setPressed(const int row, const int col, const bool pressed);
     QString lang;
     QString title;
 
 private:
 
     typedef struct Key {
             int qcode; // are qt key codes just unicode values?
             ushort unicode;
             int width;  // not pixels but relative key width. normal key is 2
 
         // only needed for keys like ctrl that can have multiple keys pressed at once
         bool *pressed; 
             QPixmap *pix;
     };
 
     QList<Key> keys[6];
     QMap<ushort,ushort> shiftMap;
 
 };
 
 class Keyboard : public QFrame
 {
     Q_OBJECT
 public:
     Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 );
     ~Keyboard();
 
     void resetState();
 
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     void paintEvent(QPaintEvent* e);
     //void timerEvent(QTimerEvent* e);
     void drawKeyboard( QPainter &p, int row = -1, int col = -1);
 
     QSize sizeHint() const;
 
 signals:
     void key( ushort scancode, ushort unicode, ushort modifiers, bool, bool );
 
 private slots:
     void repeat();
     void togglePickboard(bool on_off);
     void setMapToDefault();
-    void setMapToFile(int index);
+    void setMapToFile(QString map);
     
 private:
     int getKey( int &w, int j = -1 );
     void clearHighlight();
 
     bool *shift;
     bool *lock;
     bool *ctrl;
     bool *alt;
     uint useLargeKeys:1;
     uint usePicks:1;
     
     int pressedKeyRow;
     int pressedKeyCol;
 
     KeyboardPicks *picks;
 
     int keyHeight;
     int defaultKeyWidth;
     int xoffs;
 
     int unicode;
     int qkeycode;
     int modifiers;
 
     int pressTid;
     bool pressed;
 
     Keys *keys;
 
     /* for korean input */
     ushort schar, mchar, echar;
     ushort parseKoreanInput(ushort c);
     ushort combineKoreanChars(const ushort s, const ushort m, const ushort e);
     ushort constoe(const ushort c);
 
     QTimer *repeatTimer;
 
     ConfigDlg *configdlg;
 };