author | hash <hash> | 2002-08-19 05:35:38 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-19 05:35:38 (UTC) |
commit | 64a00421be85d223072e087d4d3c9ecdad464095 (patch) (unidiff) | |
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 | |||
@@ -5,8 +5,10 @@ | |||
5 | * | 5 | * |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <iostream.h> | ||
10 | |||
9 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
10 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
11 | 13 | ||
12 | #include <qwidget.h> | 14 | #include <qwidget.h> |
@@ -21,16 +23,19 @@ | |||
21 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
22 | #include <qlistbox.h> | 24 | #include <qlistbox.h> |
23 | #include <qstringlist.h> | 25 | #include <qstringlist.h> |
24 | #include <opie/ofiledialog.h> | 26 | #include <opie/ofiledialog.h> |
25 | #include <iostream.h> | 27 | #include <qdir.h> |
28 | #include <qfileinfo.h> | ||
26 | #include "configdlg.h" | 29 | #include "configdlg.h" |
27 | #include "keyboard.h" | 30 | #include "keyboard.h" |
28 | 31 | ||
29 | ConfigDlg::ConfigDlg () : QTabWidget () | 32 | ConfigDlg::ConfigDlg () : QTabWidget () |
30 | { | 33 | { |
31 | setCaption( tr("Multikey Configuration") ); | 34 | setCaption( tr("Multikey Configuration") ); |
32 | Config config ("multikey"); | 35 | Config config ("multikey"); |
36 | config.setGroup("keymaps"); | ||
37 | QString current_map = config.readEntry("current", 0); | ||
33 | 38 | ||
34 | /* | 39 | /* |
35 | * 'general config' tab | 40 | * 'general config' tab |
36 | */ | 41 | */ |
@@ -45,19 +50,47 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
45 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); | 50 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); |
46 | 51 | ||
47 | QString cur(tr("Current Language")); | 52 | QString cur(tr("Current Language")); |
48 | keymaps->insertItem(cur); | 53 | keymaps->insertItem(cur); |
54 | keymaps->setSelected(0, true); | ||
55 | |||
56 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); | ||
57 | default_maps = map_dir.entryList(); // so i can access it in other places | ||
49 | 58 | ||
50 | config.setGroup ("keymaps"); | 59 | for (uint i = 0; i <map_dir.count(); i++) { |
51 | QStringList maps = config.readListEntry("maps", QChar('|')); | 60 | |
61 | keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]); | ||
62 | if (map_dir.absPath() + "/" + map_dir[i] == current_map) { | ||
63 | |||
64 | keymaps->setSelected(i + 1, true); | ||
65 | } | ||
66 | |||
67 | } | ||
68 | |||
69 | custom_maps = config.readListEntry("maps", QChar('|')); | ||
70 | |||
71 | for (uint i = 0; i < custom_maps.count(); i++) { | ||
72 | |||
73 | if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false) | ||
74 | || !QFile::exists(custom_maps[i])) { | ||
75 | |||
76 | custom_maps.remove(custom_maps.at(i)); | ||
77 | |||
78 | // remove it from the list too | ||
79 | config.writeEntry("maps", custom_maps.join("|")); | ||
52 | 80 | ||
53 | for (unsigned int i = 0; i < maps.count(); i++) { | ||
54 | 81 | ||
55 | keymaps->insertItem(maps[i]); | 82 | } else { |
83 | |||
84 | keymaps->insertItem(custom_maps[i]); | ||
85 | if (custom_maps[i] == current_map) { | ||
86 | |||
87 | keymaps->setSelected(map_dir.count() + i + 1, true); | ||
88 | } | ||
89 | } | ||
56 | } | 90 | } |
57 | 91 | ||
58 | // have to "+1" because the "current language" listItem... remember? | 92 | // have to "+1" because the "current language" listItem... remember? |
59 | keymaps->setSelected(config.readNumEntry("current", 0) + 1, true); | ||
60 | 93 | ||
61 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); | 94 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); |
62 | 95 | ||
63 | 96 | ||
@@ -70,8 +103,9 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
70 | connect(add_button, SIGNAL(clicked()), SLOT(addMap())); | 103 | connect(add_button, SIGNAL(clicked()), SLOT(addMap())); |
71 | 104 | ||
72 | remove_button = new QPushButton(tr("Remove"), add_remove_grid); | 105 | remove_button = new QPushButton(tr("Remove"), add_remove_grid); |
73 | remove_button->setFlat((bool)1); | 106 | remove_button->setFlat((bool)1); |
107 | connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); | ||
74 | 108 | ||
75 | pick_button = new QCheckBox(tr("Pickboard"), gen_box); | 109 | pick_button = new QCheckBox(tr("Pickboard"), gen_box); |
76 | 110 | ||
77 | config.setGroup ("pickboard"); | 111 | config.setGroup ("pickboard"); |
@@ -125,38 +159,61 @@ void ConfigDlg::pickTog() { | |||
125 | 159 | ||
126 | /* | 160 | /* |
127 | * the index is kinda screwy, because in the config file, index 0 is just the | 161 | * the index is kinda screwy, because in the config file, index 0 is just the |
128 | * first element in the QStringList, but here it's the "Current Language" | 162 | * first element in the QStringList, but here it's the "Current Language" |
129 | * listItem. therefor you have to minus one to the index before you access | 163 | * listItem. therefor you have to minus one to the index before you access it. |
130 | * it from the config file. | ||
131 | * | 164 | * |
132 | * and later on, the "current language" setting should be -1 in the config file | ||
133 | */ | 165 | */ |
134 | 166 | ||
135 | void ConfigDlg::setMap(int index) { | 167 | void ConfigDlg::setMap(int index) { |
136 | 168 | ||
137 | if (index == 0) { | 169 | if (index == 0) { |
138 | 170 | ||
139 | if (remove_button->isEnabled()) | 171 | remove_button->setDisabled(true); |
140 | remove_button->setDisabled(true); | ||
141 | 172 | ||
142 | emit setMapToDefault(); | 173 | emit setMapToDefault(); |
143 | } | 174 | } |
144 | else { | 175 | else if ((uint)index <= default_maps.count()) { |
176 | |||
177 | remove_button->setDisabled(true); | ||
145 | 178 | ||
146 | if (!remove_button->isEnabled()) | 179 | } else { |
147 | remove_button->setEnabled(true); | ||
148 | 180 | ||
149 | emit setMapToFile(index - 1); | 181 | remove_button->setEnabled(true); |
182 | |||
183 | emit setMapToFile(keymaps->text(index)); | ||
150 | } | 184 | } |
151 | } | 185 | } |
152 | 186 | ||
153 | void ConfigDlg::addMap() { | 187 | void ConfigDlg::addMap() { |
154 | 188 | ||
155 | QString map = OFileDialog::getOpenFileName(2, QPEApplication::qpeDir() + "/share/multikey"); | 189 | QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); |
156 | cout << "added file " << map << "!\n"; | 190 | Config config ("multikey"); |
191 | config.setGroup("keymaps"); | ||
192 | QStringList maps = config.readListEntry("maps", QChar('|')); | ||
193 | maps.append(map); | ||
194 | keymaps->insertItem(map); | ||
195 | keymaps->setSelected(keymaps->count() - 1, true); | ||
196 | |||
197 | |||
198 | config.writeEntry("maps", maps.join("|")); | ||
199 | config.writeEntry("current", map); | ||
157 | 200 | ||
158 | } | 201 | } |
159 | 202 | ||
160 | void ConfigDlg::removeMap(int index) { | 203 | void ConfigDlg::removeMap() { |
204 | |||
205 | cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n"; | ||
206 | cout << "currentItem : " << keymaps->currentItem() << "\n"; | ||
161 | 207 | ||
208 | // move selection up one | ||
209 | keymaps->setSelected(keymaps->currentItem() - 1, true); | ||
210 | // delete the next selected item cus you just moved it up | ||
211 | keymaps->removeItem(keymaps->currentItem() + 1); | ||
212 | |||
213 | custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]); | ||
214 | |||
215 | // write the changes | ||
216 | Config config ("multikey"); | ||
217 | config.setGroup("keymaps"); | ||
218 | config.writeEntry("maps", custom_maps.join("|")); | ||
162 | } | 219 | } |
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 | |||
@@ -16,21 +16,25 @@ public: | |||
16 | 16 | ||
17 | signals: | 17 | signals: |
18 | void pickboardToggled(bool on_off); | 18 | void pickboardToggled(bool on_off); |
19 | void setMapToDefault(); | 19 | void setMapToDefault(); |
20 | void setMapToFile(int index); | 20 | void setMapToFile(QString map); |
21 | 21 | ||
22 | private slots: | 22 | private slots: |
23 | void pickTog(); | 23 | void pickTog(); |
24 | void setMap(int index); | 24 | void setMap(int index); |
25 | void addMap(); | 25 | void addMap(); |
26 | void removeMap(int index); | 26 | void removeMap(); |
27 | 27 | ||
28 | private: | 28 | private: |
29 | QCheckBox *pick_button; | 29 | QCheckBox *pick_button; |
30 | QListBox *keymaps; | 30 | QListBox *keymaps; |
31 | QPushButton *add_button; | 31 | QPushButton *add_button; |
32 | QPushButton *remove_button; | 32 | QPushButton *remove_button; |
33 | 33 | ||
34 | |||
35 | QStringList default_maps; // the maps in your share/multikey/ dir | ||
36 | QStringList custom_maps; // maps you added with the 'add' button | ||
37 | |||
34 | }; | 38 | }; |
35 | 39 | ||
36 | #endif | 40 | #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 | |||
@@ -289,10 +289,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
289 | connect(configdlg, SIGNAL(pickboardToggled(bool)), | 289 | connect(configdlg, SIGNAL(pickboardToggled(bool)), |
290 | this, SLOT(togglePickboard(bool))); | 290 | this, SLOT(togglePickboard(bool))); |
291 | connect(configdlg, SIGNAL(setMapToDefault()), | 291 | connect(configdlg, SIGNAL(setMapToDefault()), |
292 | this, SLOT(setMapToDefault())); | 292 | this, SLOT(setMapToDefault())); |
293 | connect(configdlg, SIGNAL(setMapToFile(int)), | 293 | connect(configdlg, SIGNAL(setMapToFile(QString)), |
294 | this, SLOT(setMapToFile(int))); | 294 | this, SLOT(setMapToFile(QString))); |
295 | configdlg->showMaximized(); | 295 | configdlg->showMaximized(); |
296 | configdlg->show(); | 296 | configdlg->show(); |
297 | configdlg->raise(); | 297 | configdlg->raise(); |
298 | } | 298 | } |
@@ -518,9 +518,9 @@ void Keyboard::setMapToDefault() { | |||
518 | 518 | ||
519 | /* save change to multikey config file */ | 519 | /* save change to multikey config file */ |
520 | config = new Config("multikey"); | 520 | config = new Config("multikey"); |
521 | config->setGroup ("keymaps"); | 521 | config->setGroup ("keymaps"); |
522 | config->writeEntry ("current", -1); // default closed | 522 | config->writeEntry ("current", key_map); // default closed |
523 | delete config; | 523 | delete config; |
524 | 524 | ||
525 | delete keys; | 525 | delete keys; |
526 | keys = new Keys(key_map); | 526 | keys = new Keys(key_map); |
@@ -528,25 +528,22 @@ void Keyboard::setMapToDefault() { | |||
528 | // have to repaint the keyboard | 528 | // have to repaint the keyboard |
529 | repaint(FALSE); | 529 | repaint(FALSE); |
530 | } | 530 | } |
531 | 531 | ||
532 | void Keyboard::setMapToFile(int index) { | 532 | void Keyboard::setMapToFile(QString map) { |
533 | 533 | ||
534 | /* save change to multikey config file */ | 534 | /* save change to multikey config file */ |
535 | Config *config = new Config("multikey"); | 535 | Config *config = new Config("multikey"); |
536 | config->setGroup ("keymaps"); | 536 | config->setGroup ("keymaps"); |
537 | config->writeEntry ("current", index); // default closed | 537 | config->writeEntry ("current", map); // default closed |
538 | 538 | ||
539 | |||
540 | /* now you have to retrieve the map */ | ||
541 | QStringList maps = config->readListEntry("maps", QChar('|')); | ||
542 | delete config; | 539 | delete config; |
543 | 540 | ||
544 | delete keys; | 541 | delete keys; |
545 | if (index < 0 || (int)maps.count() <= index) | 542 | if (QFile(map).exists()) |
546 | keys = new Keys(); | 543 | keys = new Keys(map); |
547 | else | 544 | else |
548 | keys = new Keys(maps[index]); | 545 | keys = new Keys(); |
549 | 546 | ||
550 | repaint(FALSE); | 547 | repaint(FALSE); |
551 | 548 | ||
552 | } | 549 | } |
@@ -858,32 +855,24 @@ ushort Keyboard::constoe(const ushort c) { | |||
858 | Keys::Keys() { | 855 | Keys::Keys() { |
859 | 856 | ||
860 | Config *config = new Config ("multikey"); | 857 | Config *config = new Config ("multikey"); |
861 | config->setGroup( "keymaps" ); | 858 | config->setGroup( "keymaps" ); |
862 | QStringList maps = config->readListEntry ("maps", QChar('|')); | 859 | QString map = config->readEntry( "current" ); |
863 | |||
864 | int index = config->readNumEntry( "current", -1 ); | ||
865 | delete config; | 860 | delete config; |
866 | 861 | ||
867 | QString key_map; | 862 | if (map.isNull() || !(QFile(map).exists())) { |
868 | |||
869 | if (index < 0 || (int)maps.count() <= index) { | ||
870 | 863 | ||
871 | Config *config = new Config("locale"); | 864 | Config *config = new Config("locale"); |
872 | config->setGroup( "Language" ); | 865 | config->setGroup( "Language" ); |
873 | QString l = config->readEntry( "Language" , "en" ); | 866 | QString l = config->readEntry( "Language" , "en" ); |
874 | delete config; | 867 | delete config; |
875 | 868 | ||
876 | key_map = QPEApplication::qpeDir() + "/share/multikey/" | 869 | map = QPEApplication::qpeDir() + "/share/multikey/" |
877 | + l + ".keymap"; | 870 | + l + ".keymap"; |
878 | 871 | ||
879 | } else { | 872 | } |
880 | |||
881 | key_map = maps[index]; | ||
882 | } | ||
883 | |||
884 | 873 | ||
885 | setKeysFromFile(key_map); | 874 | setKeysFromFile(map); |
886 | } | 875 | } |
887 | 876 | ||
888 | Keys::Keys(const char * filename) { | 877 | Keys::Keys(const char * filename) { |
889 | 878 | ||
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 | |||
@@ -112,9 +112,9 @@ signals: | |||
112 | private slots: | 112 | private slots: |
113 | void repeat(); | 113 | void repeat(); |
114 | void togglePickboard(bool on_off); | 114 | void togglePickboard(bool on_off); |
115 | void setMapToDefault(); | 115 | void setMapToDefault(); |
116 | void setMapToFile(int index); | 116 | void setMapToFile(QString map); |
117 | 117 | ||
118 | private: | 118 | private: |
119 | int getKey( int &w, int j = -1 ); | 119 | int getKey( int &w, int j = -1 ); |
120 | void clearHighlight(); | 120 | void clearHighlight(); |