2 files changed, 46 insertions, 13 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 10bc611..c5ebe3c 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -1,36 +1,34 @@
 /*
  * TODO
  * make a font selection thing (size too)
  * make a cursor thing
  * add meta key support for german, etc
  *
  *
  *
  */
 
-#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 <opie/colordialog.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include "configdlg.h"
 #include "keyboard.h"
 
 // ConfigDlg::ConfigDlg() {{{1
 ConfigDlg::ConfigDlg () : QTabWidget ()
@@ -39,74 +37,112 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
     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);
     
     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++) {
+    for (uint i = 0; i < map_dir.count(); i++) {
+
+        QFile map (map_dir.absPath() + "/" + map_dir[i]);
+        if (map.open(IO_ReadOnly)) {
+
+            QString line; bool found = 0;
+
+            map.readLine(line, 1024);
+            while (!map.atEnd()) {
 
-        keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]);
+                if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
+                
+                    keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
+                    found = 1;
+                    break;
+                }
+                map.readLine(line, 1024);
+            }
+            if (!found) keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]);
+
+            map.close();
+        }
         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]);
+            QFile map (custom_maps[i]);
+            if (map.open(IO_ReadOnly)) {
+
+                QString line; bool found = 0;
+
+                map.readLine(line, 1024);
+                while (!map.atEnd()) {
+
+                    if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
+                
+                        keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
+                        found = 1;
+                        break;
+                    }
+                    map.readLine(line, 1024);
+                }
+                if (!found) keymaps->insertItem(custom_maps[i]);
+
+                map.close();
+            }
             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);
     if ((int)map_dir.count() >= keymaps->currentItem()) 
         remove_button->setDisabled(true);
@@ -211,89 +247,87 @@ void ConfigDlg::repeatTog() {
     config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed
 
     emit repeatToggled(repeat_button->isChecked());
 }
 
 // ConfigDlg::setMap {{{1
 
 /* 
  * 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));
+        emit setMapToFile(QPEApplication::qpeDir() + "/share/multikey/" + default_maps[index - 1]);
 
     } else {
 
         remove_button->setEnabled(true);
-        emit setMapToFile(keymaps->text(index));
+        emit setMapToFile(custom_maps[index - default_maps.count() - 1]);
     }
 }
 
 // ConfigDlg::addMap() {{{1
 void ConfigDlg::addMap() {
 
     QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
 
     if (map.isNull()) return;
 
     Config config ("multikey");
     config.setGroup("keymaps");
     QStringList maps = config.readListEntry("maps", QChar('|'));
     maps.append(map);
+    custom_maps.append(map);
     keymaps->insertItem(map);
     keymaps->setSelected(keymaps->count() - 1, true);
 
 
     config.writeEntry("maps", maps, QChar('|'));
     config.writeEntry("current", map);
 
 }
 
 // ConfigDlg::removeMap() {{{1
 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()]);
+    custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count()));
 
     // write the changes
     Config config ("multikey");
     config.setGroup("keymaps");
     config.writeEntry("maps", custom_maps, QChar('|'));
 }
 
 /* ConfigDlg::slots for the color buttons {{{1
  *
  * these four slots are almost the same, except for the names. i was thinking
  * of making a map with pointers to the buttons and names of the configEntry
  * so it could be one slot, but then there would be no way of telling which 
  * of the buttons was clicked if they all connect to the same slot.
  *
  */
 
 void ConfigDlg::keyColorClicked() {
 
     Config config ("multikey");
     config.setGroup ("colors");
 
     QStringList color = config.readListEntry("keycolor", QChar(','));
 
     QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 3f6f73b..c3ee8f3 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -13,49 +13,48 @@
 **
 ** 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 "keyboard.h"
 #include "configdlg.h"
 
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qwindowsystem_qws.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <ctype.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
-#include <iostream.h>
 
 #include <sys/utsname.h>
 
 
 /* Keyboard::Keyboard {{{1 */
 Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     QFrame(parent, _name, f),  shift(0), lock(0), ctrl(0), alt(0), meta(0), 
     useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1),
     unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
     configdlg(0)
 
 {
 
     // get the default font
     Config *config = new Config( "qpe" );
     config->setGroup( "Appearance" );
     QString familyStr = config->readEntry( "FontFamily", "fixed" );
     delete config;
 
     config = new Config("multikey");
     config->setGroup ("general");
     usePicks = config->readBoolEntry ("usePickboard", "0"); // default closed
     useRepeat = config->readBoolEntry ("useRepeat", "1");
     delete config;
@@ -581,49 +580,49 @@ void Keyboard::togglePickboard(bool on_off)
         //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()");
 }
 
 void Keyboard::toggleRepeat(bool on) {
 
     useRepeat = on;
-    cout << "setting useRepeat to: " << useRepeat << "\n";
+    //cout << "setting useRepeat to: " << useRepeat << "\n";
 }
 
 /* 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", key_map); // default closed
     delete config;
 
     delete keys;
     keys = new Keys(key_map);