| -rw-r--r-- | inputmethods/multikey/configdlg.cpp | 93 | ||||
| -rw-r--r-- | inputmethods/multikey/configdlg.h | 8 | ||||
| -rw-r--r-- | inputmethods/multikey/keyboard.cpp | 37 | ||||
| -rw-r--r-- | inputmethods/multikey/keyboard.h | 2 |
4 files changed, 95 insertions, 45 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 @@ -3,12 +3,14 @@ * 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> @@ -19,20 +21,23 @@ #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); @@ -43,23 +48,51 @@ ConfigDlg::ConfigDlg () : QTabWidget () 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 - config.setGroup ("keymaps"); - QStringList maps = config.readListEntry("maps", QChar('|')); + 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); @@ -68,12 +101,13 @@ ConfigDlg::ConfigDlg () : QTabWidget () 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) { @@ -123,40 +157,63 @@ void ConfigDlg::pickTog() { 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); + remove_button->setDisabled(true); emit setMapToDefault(); } - else { + else if ((uint)index <= default_maps.count()) { + + remove_button->setDisabled(true); - if (!remove_button->isEnabled()) - remove_button->setEnabled(true); + } else { - emit setMapToFile(index - 1); + remove_button->setEnabled(true); + + 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 @@ -14,23 +14,27 @@ class ConfigDlg : public QTabWidget 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 @@ -287,14 +287,14 @@ void Keyboard::mousePressEvent(QMouseEvent *e) 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) { @@ -516,39 +516,36 @@ void Keyboard::setMapToDefault() { 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 @@ -856,36 +853,28 @@ ushort Keyboard::constoe(const ushort c) { // 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); } 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 @@ -110,13 +110,13 @@ 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; |