Diffstat (limited to 'inputmethods/multikey/configdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 29 |
1 files changed, 26 insertions, 3 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 | |||
@@ -21,4 +21,5 @@ | |||
21 | #include <qpushbutton.h> | 21 | #include <qpushbutton.h> |
22 | #include <qlistbox.h> | 22 | #include <qlistbox.h> |
23 | #include <qstringlist.h> | ||
23 | #include "configdlg.h" | 24 | #include "configdlg.h" |
24 | #include "keyboard.h" | 25 | #include "keyboard.h" |
@@ -27,4 +28,5 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
27 | { | 28 | { |
28 | setCaption( tr("Multikey Configuration") ); | 29 | setCaption( tr("Multikey Configuration") ); |
30 | Config config ("multikey"); | ||
29 | 31 | ||
30 | /* | 32 | /* |
@@ -40,10 +42,22 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
40 | keymaps = new QListBox (map_group); | 42 | keymaps = new QListBox (map_group); |
41 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); | 43 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); |
42 | //keymaps->setMaximumHeight(150); | ||
43 | 44 | ||
44 | QString cur(tr("Current Language")); | 45 | QString cur(tr("Current Language")); |
45 | keymaps->insertItem(cur); | 46 | keymaps->insertItem(cur); |
47 | |||
48 | config.setGroup ("keymaps"); | ||
49 | QStringList maps = config.readListEntry("maps", QChar('|')); | ||
50 | |||
51 | for (unsigned int i = 0; i < maps.count(); i++) { | ||
52 | |||
53 | keymaps->insertItem(maps[i]); | ||
54 | } | ||
55 | |||
56 | // have to "+1" because the "current language" listItem... remember? | ||
57 | keymaps->setSelected(config.readNumEntry("current", 0) + 1, true); | ||
58 | |||
46 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); | 59 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); |
47 | 60 | ||
61 | /* | ||
48 | QString ko(QPEApplication::qpeDir() + "/share/multikey/ko.keymap"); | 62 | QString ko(QPEApplication::qpeDir() + "/share/multikey/ko.keymap"); |
49 | keymaps->insertItem(ko); | 63 | keymaps->insertItem(ko); |
@@ -54,4 +68,5 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
54 | QString de(QPEApplication::qpeDir() + "/share/multikey/de.keymap"); | 68 | QString de(QPEApplication::qpeDir() + "/share/multikey/de.keymap"); |
55 | keymaps->insertItem(de); | 69 | keymaps->insertItem(de); |
70 | */ | ||
56 | 71 | ||
57 | QGrid *add_remove_grid = new QGrid(2, map_group); | 72 | QGrid *add_remove_grid = new QGrid(2, map_group); |
@@ -67,5 +82,4 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
67 | pick_button = new QCheckBox(tr("Pickboard"), gen_box); | 82 | pick_button = new QCheckBox(tr("Pickboard"), gen_box); |
68 | 83 | ||
69 | Config config ("multikey"); | ||
70 | config.setGroup ("pickboard"); | 84 | config.setGroup ("pickboard"); |
71 | bool pick_open = config.readBoolEntry ("open", "0"); // default closed | 85 | bool pick_open = config.readBoolEntry ("open", "0"); // default closed |
@@ -117,4 +131,13 @@ void ConfigDlg::pickTog() { | |||
117 | } | 131 | } |
118 | 132 | ||
133 | /* | ||
134 | * the index is kinda screwy, because in the config file, index 0 is just the | ||
135 | * first element in the QStringList, but here it's the "Current Language" | ||
136 | * listItem. therefor you have to minus one to the index before you access | ||
137 | * it from the config file. | ||
138 | * | ||
139 | * and later on, the "current language" setting should be -1 in the config file | ||
140 | */ | ||
141 | |||
119 | void ConfigDlg::setMap(int index) { | 142 | void ConfigDlg::setMap(int index) { |
120 | 143 | ||
@@ -131,5 +154,5 @@ void ConfigDlg::setMap(int index) { | |||
131 | remove_button->setEnabled(true); | 154 | remove_button->setEnabled(true); |
132 | 155 | ||
133 | emit setMapToFile(keymaps->text(index)); | 156 | emit setMapToFile(index - 1); |
134 | } | 157 | } |
135 | } | 158 | } |