author | hash <hash> | 2002-08-19 05:35:38 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-19 05:35:38 (UTC) |
commit | 64a00421be85d223072e087d4d3c9ecdad464095 (patch) (side-by-side diff) | |
tree | 66cf285aa1a8d17126c5b59125c7d91fc2c08c45 | |
parent | d92fbca743e676182a8f33ae4c28044031143fb0 (diff) | |
download | opie-64a00421be85d223072e087d4d3c9ecdad464095.zip opie-64a00421be85d223072e087d4d3c9ecdad464095.tar.gz opie-64a00421be85d223072e087d4d3c9ecdad464095.tar.bz2 |
now reads maps in default dir, and also lets you add/remove your own maps
-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 @@ -8,2 +8,4 @@ +#include <iostream.h> + #include <qpe/qpeapplication.h> @@ -24,3 +26,4 @@ #include <opie/ofiledialog.h> -#include <iostream.h> +#include <qdir.h> +#include <qfileinfo.h> #include "configdlg.h" @@ -32,2 +35,4 @@ ConfigDlg::ConfigDlg () : QTabWidget () Config config ("multikey"); + config.setGroup("keymaps"); + QString current_map = config.readEntry("current", 0); @@ -48,9 +53,38 @@ ConfigDlg::ConfigDlg () : QTabWidget () 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); + } + } } @@ -58,3 +92,2 @@ ConfigDlg::ConfigDlg () : QTabWidget () // have to "+1" because the "current language" listItem... remember? - keymaps->setSelected(config.readNumEntry("current", 0) + 1, true); @@ -73,2 +106,3 @@ ConfigDlg::ConfigDlg () : QTabWidget () remove_button->setFlat((bool)1); + connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); @@ -128,6 +162,4 @@ void ConfigDlg::pickTog() { * 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 */ @@ -138,4 +170,3 @@ void ConfigDlg::setMap(int index) { - if (remove_button->isEnabled()) - remove_button->setDisabled(true); + remove_button->setDisabled(true); @@ -143,8 +174,11 @@ void ConfigDlg::setMap(int index) { } - 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)); } @@ -154,4 +188,13 @@ 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); @@ -159,4 +202,18 @@ void ConfigDlg::addMap() { -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 @@ -19,3 +19,3 @@ signals: void setMapToDefault(); - void setMapToFile(int index); + void setMapToFile(QString map); @@ -25,3 +25,3 @@ private slots: void addMap(); - void removeMap(int index); + void removeMap(); @@ -33,2 +33,6 @@ private: + + QStringList default_maps; // the maps in your share/multikey/ dir + QStringList custom_maps; // maps you added with the 'add' button + }; 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 @@ -292,4 +292,4 @@ void Keyboard::mousePressEvent(QMouseEvent *e) this, SLOT(setMapToDefault())); - connect(configdlg, SIGNAL(setMapToFile(int)), - this, SLOT(setMapToFile(int))); + connect(configdlg, SIGNAL(setMapToFile(QString)), + this, SLOT(setMapToFile(QString))); configdlg->showMaximized(); @@ -521,3 +521,3 @@ void Keyboard::setMapToDefault() { config->setGroup ("keymaps"); - config->writeEntry ("current", -1); // default closed + config->writeEntry ("current", key_map); // default closed delete config; @@ -531,3 +531,3 @@ void Keyboard::setMapToDefault() { -void Keyboard::setMapToFile(int index) { +void Keyboard::setMapToFile(QString map) { @@ -536,7 +536,4 @@ void Keyboard::setMapToFile(int index) { 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; @@ -544,6 +541,6 @@ void Keyboard::setMapToFile(int index) { 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(); @@ -861,10 +858,6 @@ Keys::Keys() { 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())) { @@ -875,12 +868,8 @@ Keys::Keys() { - key_map = QPEApplication::qpeDir() + "/share/multikey/" + map = QPEApplication::qpeDir() + "/share/multikey/" + l + ".keymap"; - } else { - - key_map = maps[index]; - } - + } - setKeysFromFile(key_map); + setKeysFromFile(map); } 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 @@ -115,3 +115,3 @@ private slots: void setMapToDefault(); - void setMapToFile(int index); + void setMapToFile(QString map); |