parses dir and also lets you add/remove maps located in other places

2 files changed, 3 insertions, 1 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index a6e4dad..ac132d3 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -51,169 +51,171 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
 
     QString cur(tr("Current Language"));
     keymaps->insertItem(cur);
     keymaps->setSelected(0, true);
     
     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("|"));
 
 
         } 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?
 
     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.
  *
  */
 
 void ConfigDlg::setMap(int index) {
 
     if (index == 0) {
 
         remove_button->setDisabled(true);
 
         emit setMapToDefault();
     }
     else if ((uint)index <= default_maps.count()) {
 
         remove_button->setDisabled(true);
 
+        emit setMapToFile(keymaps->text(index));
+
     } else {
 
         remove_button->setEnabled(true);
 
         emit setMapToFile(keymaps->text(index));
     }
 }
 
 void ConfigDlg::addMap() {
 
     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() {
 
     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/keyboard.h b/inputmethods/multikey/keyboard.h
index 805f0ed..8c4e666 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -1,158 +1,158 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qframe.h>
 #include <qmap.h>
 #include "../pickboard/pickboardcfg.h"
 #include "../pickboard/pickboardpicks.h"
 #include "configdlg.h"
 
 class QTimer;
 
 class KeyboardConfig : public DictFilterConfig
 {
 public:
     KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; }
     virtual void generateText(const QString &s);
     void decBackspaces() { if (backspaces) backspaces--; }
     void incBackspaces() { backspaces++; }
     void resetBackspaces() { backspaces = 0; }
 private:
     int backspaces;
 };
 
 
 class KeyboardPicks : public PickboardPicks
 {
     Q_OBJECT
 public:
     KeyboardPicks(QWidget* parent=0, const char* name=0, WFlags f=0)
         : PickboardPicks(parent, name, f) { }
     void initialise();
     virtual QSize sizeHint() const;
     KeyboardConfig *dc;
 };
 
 
 class Keys {
 public:
 
     Keys();
     Keys(const char * filename);
     ~Keys();
     ushort  uni(const int row, const int col);
     int     qcode(const int row, const int col);
     int     width(const int row, const int col);
     bool    pressed(const int row, const int col);
     bool    *pressedPtr(const int row, const int col);
     ushort  shift(const ushort);
     QPixmap *pix(const int row, const int col);
     int     numKeys(const int row);
     void    setKeysFromFile(const char *filename);
     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;
+    QString label;
 
 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(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;
 };