author | hash <hash> | 2002-08-18 06:18:18 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-18 06:18:18 (UTC) |
commit | 229a66f5a955ec71bd5973ac6961cd694692856a (patch) (side-by-side diff) | |
tree | e2fa7e43d90728b972933e3fca77a897aa376287 /inputmethods/multikey | |
parent | 5f271187a72b18339310f12a2c753e9b8548c078 (diff) | |
download | opie-229a66f5a955ec71bd5973ac6961cd694692856a.zip opie-229a66f5a955ec71bd5973ac6961cd694692856a.tar.gz opie-229a66f5a955ec71bd5973ac6961cd694692856a.tar.bz2 |
paths to maps are now saved in config dialog
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 29 | ||||
-rw-r--r-- | inputmethods/multikey/configdlg.h | 2 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 33 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.h | 2 |
4 files changed, 53 insertions, 13 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index 7bea589..c4f7413 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp @@ -15,63 +15,77 @@ #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 "configdlg.h" #include "keyboard.h" ConfigDlg::ConfigDlg () : QTabWidget () { setCaption( tr("Multikey Configuration") ); + Config config ("multikey"); /* * '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)); - //keymaps->setMaximumHeight(150); QString cur(tr("Current Language")); keymaps->insertItem(cur); + + config.setGroup ("keymaps"); + QStringList maps = config.readListEntry("maps", QChar('|')); + + for (unsigned int i = 0; i < maps.count(); i++) { + + keymaps->insertItem(maps[i]); + } + + // 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))); + /* QString ko(QPEApplication::qpeDir() + "/share/multikey/ko.keymap"); keymaps->insertItem(ko); QString en(QPEApplication::qpeDir() + "/share/multikey/en.keymap"); keymaps->insertItem(en); QString de(QPEApplication::qpeDir() + "/share/multikey/de.keymap"); keymaps->insertItem(de); + */ 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); remove_button = new QPushButton(tr("Remove"), add_remove_grid); remove_button->setFlat((bool)1); pick_button = new QCheckBox(tr("Pickboard"), gen_box); - Config config ("multikey"); 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 @@ -111,31 +125,40 @@ 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. + * + * 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 { if (!remove_button->isEnabled()) remove_button->setEnabled(true); - emit setMapToFile(keymaps->text(index)); + emit setMapToFile(index - 1); } } void ConfigDlg::addMap() { } void ConfigDlg::removeMap(int index) { diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h index 1a64764..03a3547 100644 --- a/inputmethods/multikey/configdlg.h +++ b/inputmethods/multikey/configdlg.h @@ -12,17 +12,17 @@ class ConfigDlg : public QTabWidget Q_OBJECT public: ConfigDlg (); signals: void pickboardToggled(bool on_off); void setMapToDefault(); - void setMapToFile(QString file); + void setMapToFile(int index); private slots: void pickTog(); void setMap(int index); void addMap(); void removeMap(int index); private: diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 671868c..c53ae6c 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp @@ -28,16 +28,18 @@ #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> #define USE_SMALL_BACKSPACE /* Keyboard::Keyboard {{{1 */ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : @@ -283,18 +285,18 @@ void Keyboard::mousePressEvent(QMouseEvent *e) 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(QString)), - this, SLOT(setMapToFile(QString))); + connect(configdlg, SIGNAL(setMapToFile(int)), + this, SLOT(setMapToFile(int))); configdlg->showMaximized(); configdlg->show(); configdlg->raise(); } } else if (qkeycode == Qt::Key_Control) { ctrl = keys->pressedPtr(row, col); need_repaint = TRUE; @@ -512,36 +514,44 @@ void Keyboard::setMapToDefault() { 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 + config->writeEntry ("current", -1); // default closed delete config; delete keys; keys = new Keys(key_map); // have to repaint the keyboard repaint(FALSE); } -void Keyboard::setMapToFile(QString file) { +void Keyboard::setMapToFile(int index) { /* save change to multikey config file */ Config *config = new Config("multikey"); config->setGroup ("keymaps"); - config->writeEntry ("current", file); // default closed + config->writeEntry ("current", index); // default closed + + + /* now you have to retrieve the map */ + QStringList maps = config->readListEntry("maps", QChar('|')); delete config; delete keys; - keys = new Keys(file); + if (index < 0 || (int)maps.count() <= index) + keys = new Keys(); + else + keys = new Keys(maps[index]); + repaint(FALSE); } /* korean input functions {{{1 * * TODO * one major problem with this implementation is that you can't move the @@ -844,29 +854,36 @@ ushort Keyboard::constoe(const ushort c) { // Keys::Keys {{{1 Keys::Keys() { Config *config = new Config ("multikey"); config->setGroup( "keymaps" ); - QString key_map = config->readEntry( "current" ); + QStringList maps = config->readListEntry ("maps", QChar('|')); + + int index = config->readNumEntry( "current", -1 ); delete config; - if (key_map.isNull()) { + QString key_map; + + if (index < 0 || (int)maps.count() <= index) { Config *config = new Config("locale"); config->setGroup( "Language" ); QString l = config->readEntry( "Language" , "en" ); delete config; key_map = QPEApplication::qpeDir() + "/share/multikey/" + l + ".keymap"; + } else { + + key_map = maps[index]; } setKeysFromFile(key_map); } Keys::Keys(const char * filename) { diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 400edc0..7a8d4b4 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h @@ -108,17 +108,17 @@ public: 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 file); + void setMapToFile(int index); private: int getKey( int &w, int j = -1 ); void clearHighlight(); bool *shift; bool *lock; bool *ctrl; |