author | hash <hash> | 2002-08-27 01:47:36 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-27 01:47:36 (UTC) |
commit | 6aa0fb1ced890c21cd1ad4a3bab17b843c40164b (patch) (unidiff) | |
tree | fafb48427af1b54fc55cc4a064cfc0f6eb95e454 | |
parent | f7d9d8697c2971b7f512ade7625dfff30d0043d0 (diff) | |
download | opie-6aa0fb1ced890c21cd1ad4a3bab17b843c40164b.zip opie-6aa0fb1ced890c21cd1ad4a3bab17b843c40164b.tar.gz opie-6aa0fb1ced890c21cd1ad4a3bab17b843c40164b.tar.bz2 |
now shows whatever you wrote in the keymap 'title' var as the listItem
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 56 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 3 |
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 | |||
@@ -5,14 +5,12 @@ | |||
5 | * add meta key support for german, etc | 5 | * add meta key support for german, etc |
6 | * | 6 | * |
7 | * | 7 | * |
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <iostream.h> | ||
12 | |||
13 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
14 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
15 | 13 | ||
16 | #include <qwidget.h> | 14 | #include <qwidget.h> |
17 | #include <qdialog.h> | 15 | #include <qdialog.h> |
18 | #include <qtabwidget.h> | 16 | #include <qtabwidget.h> |
@@ -57,15 +55,34 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
57 | keymaps->insertItem(cur); | 55 | keymaps->insertItem(cur); |
58 | keymaps->setSelected(0, true); | 56 | keymaps->setSelected(0, true); |
59 | 57 | ||
60 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); | 58 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); |
61 | default_maps = map_dir.entryList(); // so i can access it in other places | 59 | default_maps = map_dir.entryList(); // so i can access it in other places |
62 | 60 | ||
63 | for (uint i = 0; i <map_dir.count(); i++) { | 61 | for (uint i = 0; i < map_dir.count(); i++) { |
62 | |||
63 | QFile map (map_dir.absPath() + "/" + map_dir[i]); | ||
64 | if (map.open(IO_ReadOnly)) { | ||
65 | |||
66 | QString line; bool found = 0; | ||
67 | |||
68 | map.readLine(line, 1024); | ||
69 | while (!map.atEnd()) { | ||
64 | 70 | ||
65 | keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]); | 71 | if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { |
72 | |||
73 | keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); | ||
74 | found = 1; | ||
75 | break; | ||
76 | } | ||
77 | map.readLine(line, 1024); | ||
78 | } | ||
79 | if (!found) keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]); | ||
80 | |||
81 | map.close(); | ||
82 | } | ||
66 | if (map_dir.absPath() + "/" + map_dir[i] == current_map) { | 83 | if (map_dir.absPath() + "/" + map_dir[i] == current_map) { |
67 | 84 | ||
68 | keymaps->setSelected(i + 1, true); | 85 | keymaps->setSelected(i + 1, true); |
69 | } | 86 | } |
70 | 87 | ||
71 | } | 88 | } |
@@ -82,13 +99,32 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
82 | // remove it from the list too | 99 | // remove it from the list too |
83 | config.writeEntry("maps", custom_maps.join("|")); | 100 | config.writeEntry("maps", custom_maps.join("|")); |
84 | 101 | ||
85 | 102 | ||
86 | } else { | 103 | } else { |
87 | 104 | ||
88 | keymaps->insertItem(custom_maps[i]); | 105 | QFile map (custom_maps[i]); |
106 | if (map.open(IO_ReadOnly)) { | ||
107 | |||
108 | QString line; bool found = 0; | ||
109 | |||
110 | map.readLine(line, 1024); | ||
111 | while (!map.atEnd()) { | ||
112 | |||
113 | if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { | ||
114 | |||
115 | keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); | ||
116 | found = 1; | ||
117 | break; | ||
118 | } | ||
119 | map.readLine(line, 1024); | ||
120 | } | ||
121 | if (!found) keymaps->insertItem(custom_maps[i]); | ||
122 | |||
123 | map.close(); | ||
124 | } | ||
89 | if (custom_maps[i] == current_map) { | 125 | if (custom_maps[i] == current_map) { |
90 | 126 | ||
91 | keymaps->setSelected(map_dir.count() + i + 1, true); | 127 | keymaps->setSelected(map_dir.count() + i + 1, true); |
92 | } | 128 | } |
93 | } | 129 | } |
94 | } | 130 | } |
@@ -229,18 +265,18 @@ void ConfigDlg::setMap(int index) { | |||
229 | remove_button->setDisabled(true); | 265 | remove_button->setDisabled(true); |
230 | emit setMapToDefault(); | 266 | emit setMapToDefault(); |
231 | } | 267 | } |
232 | else if ((uint)index <= default_maps.count()) { | 268 | else if ((uint)index <= default_maps.count()) { |
233 | 269 | ||
234 | remove_button->setDisabled(true); | 270 | remove_button->setDisabled(true); |
235 | emit setMapToFile(keymaps->text(index)); | 271 | emit setMapToFile(QPEApplication::qpeDir() + "/share/multikey/" + default_maps[index - 1]); |
236 | 272 | ||
237 | } else { | 273 | } else { |
238 | 274 | ||
239 | remove_button->setEnabled(true); | 275 | remove_button->setEnabled(true); |
240 | emit setMapToFile(keymaps->text(index)); | 276 | emit setMapToFile(custom_maps[index - default_maps.count() - 1]); |
241 | } | 277 | } |
242 | } | 278 | } |
243 | 279 | ||
244 | // ConfigDlg::addMap() {{{1 | 280 | // ConfigDlg::addMap() {{{1 |
245 | void ConfigDlg::addMap() { | 281 | void ConfigDlg::addMap() { |
246 | 282 | ||
@@ -249,33 +285,31 @@ void ConfigDlg::addMap() { | |||
249 | if (map.isNull()) return; | 285 | if (map.isNull()) return; |
250 | 286 | ||
251 | Config config ("multikey"); | 287 | Config config ("multikey"); |
252 | config.setGroup("keymaps"); | 288 | config.setGroup("keymaps"); |
253 | QStringList maps = config.readListEntry("maps", QChar('|')); | 289 | QStringList maps = config.readListEntry("maps", QChar('|')); |
254 | maps.append(map); | 290 | maps.append(map); |
291 | custom_maps.append(map); | ||
255 | keymaps->insertItem(map); | 292 | keymaps->insertItem(map); |
256 | keymaps->setSelected(keymaps->count() - 1, true); | 293 | keymaps->setSelected(keymaps->count() - 1, true); |
257 | 294 | ||
258 | 295 | ||
259 | config.writeEntry("maps", maps, QChar('|')); | 296 | config.writeEntry("maps", maps, QChar('|')); |
260 | config.writeEntry("current", map); | 297 | config.writeEntry("current", map); |
261 | 298 | ||
262 | } | 299 | } |
263 | 300 | ||
264 | // ConfigDlg::removeMap() {{{1 | 301 | // ConfigDlg::removeMap() {{{1 |
265 | void ConfigDlg::removeMap() { | 302 | void ConfigDlg::removeMap() { |
266 | 303 | ||
267 | cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n"; | ||
268 | cout << "currentItem : " << keymaps->currentItem() << "\n"; | ||
269 | |||
270 | // move selection up one | 304 | // move selection up one |
271 | keymaps->setSelected(keymaps->currentItem() - 1, true); | 305 | keymaps->setSelected(keymaps->currentItem() - 1, true); |
272 | // delete the next selected item cus you just moved it up | 306 | // delete the next selected item cus you just moved it up |
273 | keymaps->removeItem(keymaps->currentItem() + 1); | 307 | keymaps->removeItem(keymaps->currentItem() + 1); |
274 | 308 | ||
275 | custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]); | 309 | custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count())); |
276 | 310 | ||
277 | // write the changes | 311 | // write the changes |
278 | Config config ("multikey"); | 312 | Config config ("multikey"); |
279 | config.setGroup("keymaps"); | 313 | config.setGroup("keymaps"); |
280 | config.writeEntry("maps", custom_maps, QChar('|')); | 314 | config.writeEntry("maps", custom_maps, QChar('|')); |
281 | } | 315 | } |
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 | |||
@@ -31,13 +31,12 @@ | |||
31 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
32 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
33 | #include <ctype.h> | 33 | #include <ctype.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
36 | #include <qstringlist.h> | 36 | #include <qstringlist.h> |
37 | #include <iostream.h> | ||
38 | 37 | ||
39 | #include <sys/utsname.h> | 38 | #include <sys/utsname.h> |
40 | 39 | ||
41 | 40 | ||
42 | /* Keyboard::Keyboard {{{1 */ | 41 | /* Keyboard::Keyboard {{{1 */ |
43 | Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : | 42 | Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : |
@@ -599,13 +598,13 @@ void Keyboard::togglePickboard(bool on_off) | |||
599 | QCopChannel::send ("QPE/TaskBar", "showInputMethod()"); | 598 | QCopChannel::send ("QPE/TaskBar", "showInputMethod()"); |
600 | } | 599 | } |
601 | 600 | ||
602 | void Keyboard::toggleRepeat(bool on) { | 601 | void Keyboard::toggleRepeat(bool on) { |
603 | 602 | ||
604 | useRepeat = on; | 603 | useRepeat = on; |
605 | cout << "setting useRepeat to: " << useRepeat << "\n"; | 604 | //cout << "setting useRepeat to: " << useRepeat << "\n"; |
606 | } | 605 | } |
607 | 606 | ||
608 | /* Keyboard::setMapTo ... {{{1 */ | 607 | /* Keyboard::setMapTo ... {{{1 */ |
609 | void Keyboard::setMapToDefault() { | 608 | void Keyboard::setMapToDefault() { |
610 | 609 | ||
611 | 610 | ||