author | mickeyl <mickeyl> | 2004-01-03 16:57:51 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-01-03 16:57:51 (UTC) |
commit | bdabd0e055d494c7546de08348e32cf5622c9074 (patch) (unidiff) | |
tree | 97346f3ef40158d31c2e649390a941135890a39b /inputmethods/multikey | |
parent | 4f7bf49ba4c0466aa9cea618c9317ac965a1118f (diff) | |
download | opie-bdabd0e055d494c7546de08348e32cf5622c9074.zip opie-bdabd0e055d494c7546de08348e32cf5622c9074.tar.gz opie-bdabd0e055d494c7546de08348e32cf5622c9074.tar.bz2 |
add multikey patches courtesy Anton Kachalov <mouse@altlinux.ru>
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 200 | ||||
-rw-r--r-- | inputmethods/multikey/configdlg.h | 8 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 42 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.h | 2 |
4 files changed, 190 insertions, 62 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index a8206b7..f127d0e 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp | |||
@@ -9,8 +9,9 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
13 | #include <qpe/resource.h> | ||
13 | 14 | ||
14 | #include <qwidget.h> | 15 | #include <qwidget.h> |
15 | #include <qdialog.h> | 16 | #include <qdialog.h> |
16 | #include <qtabwidget.h> | 17 | #include <qtabwidget.h> |
@@ -22,8 +23,9 @@ | |||
22 | #include <qsizepolicy.h> | 23 | #include <qsizepolicy.h> |
23 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
24 | #include <qlistbox.h> | 25 | #include <qlistbox.h> |
25 | #include <qstringlist.h> | 26 | #include <qstringlist.h> |
27 | #include <qtoolbutton.h> | ||
26 | #include <opie/ofiledialog.h> | 28 | #include <opie/ofiledialog.h> |
27 | #include <opie/colordialog.h> | 29 | #include <opie/colordialog.h> |
28 | #include <qdir.h> | 30 | #include <qdir.h> |
29 | #include <qfileinfo.h> | 31 | #include <qfileinfo.h> |
@@ -47,63 +49,60 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
47 | addTab(gen_box, tr("General Settings")); | 49 | addTab(gen_box, tr("General Settings")); |
48 | 50 | ||
49 | QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); | 51 | QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); |
50 | 52 | ||
51 | keymaps = new QListBox (map_group); | 53 | QHBox *hbox1 = new QHBox(map_group); |
54 | keymaps = new QListBox(hbox1); | ||
52 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); | 55 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); |
56 | QVBox *vbox1 = new QVBox(hbox1); | ||
57 | |||
58 | QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up")); | ||
59 | tb1->setPixmap(Resource::loadPixmap("up")); | ||
60 | tb1->setAutoRaise(TRUE); | ||
61 | tb1->setFocusPolicy(QWidget::NoFocus); | ||
62 | tb1->setToggleButton(FALSE); | ||
63 | connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp())); | ||
64 | |||
65 | QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down")); | ||
66 | tb2->setPixmap(Resource::loadPixmap("down")); | ||
67 | tb2->setAutoRaise(TRUE); | ||
68 | tb2->setFocusPolicy(QWidget::NoFocus); | ||
69 | tb2->setToggleButton(FALSE); | ||
70 | connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown())); | ||
53 | 71 | ||
54 | QString cur(tr("Current Language")); | 72 | QString cur(tr("Current Language")); |
55 | keymaps->insertItem(cur); | 73 | keymaps->insertItem(cur); |
56 | keymaps->setSelected(0, true); | 74 | keymaps->setSelected(0, true); |
57 | 75 | ||
58 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); | 76 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); |
59 | default_maps = map_dir.entryList(); // so i can access it in other places | 77 | default_maps = map_dir.entryList(); // so i can access it in other places |
78 | custom_maps = config.readListEntry("maps", QChar('|')); | ||
79 | sw_maps = ConfigDlg::loadSw(); | ||
60 | 80 | ||
61 | for (uint i = 0; i < map_dir.count(); i++) { | 81 | QStringList sw_copy(sw_maps); |
62 | 82 | for (uint i = 0; i < sw_copy.count(); i++) { | |
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()) { | ||
70 | |||
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 | } | ||
83 | if (map_dir.absPath() + "/" + map_dir[i] == current_map) { | ||
84 | |||
85 | keymaps->setSelected(i + 1, true); | ||
86 | } | ||
87 | |||
88 | } | ||
89 | 83 | ||
90 | custom_maps = config.readListEntry("maps", QChar('|')); | 84 | QString keymap_map; |
85 | if (sw_copy[i][0] != '/') { /* share/multikey */ | ||
91 | 86 | ||
92 | for (uint i = 0; i < custom_maps.count(); i++) { | 87 | keymap_map = map_dir.absPath() + "/" + sw_copy[i]; |
88 | } else { | ||
93 | 89 | ||
94 | if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false) | 90 | if (map_dir.exists(QFileInfo(sw_copy[i]).fileName(), false) |
95 | || !QFile::exists(custom_maps[i])) { | 91 | || !QFile::exists(sw_copy[i])) { |
96 | 92 | ||
97 | custom_maps.remove(custom_maps.at(i)); | 93 | custom_maps.remove(sw_copy[i]); |
94 | sw_maps.remove(sw_copy[i]); | ||
98 | 95 | ||
99 | // remove it from the list too | 96 | // remove it from the list too |
100 | config.writeEntry("maps", custom_maps.join("|")); | 97 | config.writeEntry("maps", custom_maps.join("|")); |
101 | 98 | ||
99 | continue; | ||
100 | } | ||
101 | keymap_map = sw_copy[i]; | ||
102 | } | ||
102 | 103 | ||
103 | } else { | 104 | QFile map(keymap_map); |
104 | |||
105 | QFile map (custom_maps[i]); | ||
106 | if (map.open(IO_ReadOnly)) { | 105 | if (map.open(IO_ReadOnly)) { |
107 | 106 | ||
108 | QString line; bool found = 0; | 107 | QString line; bool found = 0; |
109 | 108 | ||
@@ -117,44 +116,43 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
117 | break; | 116 | break; |
118 | } | 117 | } |
119 | map.readLine(line, 1024); | 118 | map.readLine(line, 1024); |
120 | } | 119 | } |
121 | if (!found) keymaps->insertItem(custom_maps[i]); | 120 | if (!found) |
121 | keymaps->insertItem(keymap_map); | ||
122 | 122 | ||
123 | map.close(); | 123 | map.close(); |
124 | } | 124 | } |
125 | if (custom_maps[i] == current_map) { | ||
126 | 125 | ||
127 | keymaps->setSelected(map_dir.count() + i + 1, true); | 126 | if (keymap_map == current_map) { |
128 | } | 127 | keymaps->setSelected(i + 1, true); |
129 | } | 128 | } |
130 | } | 129 | } |
131 | 130 | ||
132 | // have to "+1" because the "current language" listItem... remember? | 131 | // have to "+1" because the "current language" listItem... remember? |
133 | 132 | ||
134 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); | 133 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); |
135 | 134 | ||
136 | |||
137 | QGrid *add_remove_grid = new QGrid(2, map_group); | 135 | QGrid *add_remove_grid = new QGrid(2, map_group); |
138 | add_remove_grid->setMargin(3); | 136 | add_remove_grid->setMargin(3); |
139 | add_remove_grid->setSpacing(3); | 137 | add_remove_grid->setSpacing(3); |
140 | 138 | ||
141 | add_button = new QPushButton(tr("Add"), add_remove_grid); | 139 | add_button = new QPushButton(tr("Add"), add_remove_grid); |
142 | add_button->setFlat((bool)1); | 140 | add_button->setFlat(TRUE); |
143 | connect(add_button, SIGNAL(clicked()), SLOT(addMap())); | 141 | connect(add_button, SIGNAL(clicked()), SLOT(addMap())); |
144 | 142 | ||
145 | remove_button = new QPushButton(tr("Remove"), add_remove_grid); | 143 | remove_button = new QPushButton(tr("Remove"), add_remove_grid); |
146 | remove_button->setFlat((bool)1); | 144 | remove_button->setFlat(TRUE); |
147 | if ((int)map_dir.count() >= keymaps->currentItem()) | 145 | if (default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end()) |
148 | remove_button->setDisabled(true); | 146 | remove_button->setDisabled(true); |
149 | connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); | 147 | connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); |
150 | 148 | ||
151 | // make a box that will contain the buttons on the bottom | 149 | // make a box that will contain the buttons on the bottom |
152 | QGrid *other_grid = new QGrid(2, gen_box); | 150 | QGrid *other_grid = new QGrid(2, gen_box); |
153 | pick_button = new QCheckBox(tr("Pickboard"), other_grid); | 151 | pick_button = new QCheckBox(tr("Pickboard"), other_grid); |
154 | 152 | ||
155 | config.setGroup ("general"); | 153 | config.setGroup ("general"); |
156 | bool pick_open = config.readBoolEntry ("usePickboard", (bool)0); // default closed | 154 | bool pick_open = config.readBoolEntry ("usePickboard", FALSE); // default closed |
157 | if (pick_open) { | 155 | if (pick_open) { |
158 | 156 | ||
159 | pick_button->setChecked(true); | 157 | pick_button->setChecked(true); |
160 | } | 158 | } |
@@ -162,17 +160,16 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
162 | // by connecting it after checking it, the signal isn't emmited | 160 | // by connecting it after checking it, the signal isn't emmited |
163 | connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog())); | 161 | connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog())); |
164 | 162 | ||
165 | repeat_button = new QCheckBox(tr("Key Repeat"), other_grid); | 163 | repeat_button = new QCheckBox(tr("Key Repeat"), other_grid); |
166 | bool repeat_on = config.readBoolEntry ("useRepeat", (bool)1); | 164 | bool repeat_on = config.readBoolEntry ("useRepeat", TRUE); |
167 | 165 | ||
168 | if (repeat_on) { | 166 | if (repeat_on) { |
169 | 167 | ||
170 | repeat_button->setChecked(true); | 168 | repeat_button->setChecked(true); |
171 | } | 169 | } |
172 | connect (repeat_button, SIGNAL(clicked()), this, SLOT(repeatTog())); | 170 | connect (repeat_button, SIGNAL(clicked()), this, SLOT(repeatTog())); |
173 | 171 | ||
174 | |||
175 | /* | 172 | /* |
176 | * 'color' tab | 173 | * 'color' tab |
177 | */ | 174 | */ |
178 | 175 | ||
@@ -188,9 +185,9 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
188 | 185 | ||
189 | label = new QLabel(tr("Key Color"), color_box); | 186 | label = new QLabel(tr("Key Color"), color_box); |
190 | keycolor_button = new QPushButton(color_box); | 187 | keycolor_button = new QPushButton(color_box); |
191 | connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked())); | 188 | connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked())); |
192 | keycolor_button->setFlat((bool)1); | 189 | keycolor_button->setFlat(TRUE); |
193 | color = config.readListEntry("keycolor", QChar(',')); | 190 | color = config.readListEntry("keycolor", QChar(',')); |
194 | /* | 191 | /* |
195 | * hopefully not required | 192 | * hopefully not required |
196 | 193 | ||
@@ -205,31 +202,115 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
205 | 202 | ||
206 | label = new QLabel(tr("Key Pressed Color"), color_box); | 203 | label = new QLabel(tr("Key Pressed Color"), color_box); |
207 | keycolor_pressed_button = new QPushButton(color_box); | 204 | keycolor_pressed_button = new QPushButton(color_box); |
208 | connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked())); | 205 | connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked())); |
209 | keycolor_pressed_button->setFlat((bool)1); | 206 | keycolor_pressed_button->setFlat(TRUE); |
210 | color = config.readListEntry("keycolor_pressed", QChar(',')); | 207 | color = config.readListEntry("keycolor_pressed", QChar(',')); |
211 | keycolor_pressed_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); | 208 | keycolor_pressed_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); |
212 | 209 | ||
213 | label = new QLabel(tr("Line Color"), color_box); | 210 | label = new QLabel(tr("Line Color"), color_box); |
214 | keycolor_lines_button = new QPushButton(color_box); | 211 | keycolor_lines_button = new QPushButton(color_box); |
215 | connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked())); | 212 | connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked())); |
216 | keycolor_lines_button->setFlat((bool)1); | 213 | keycolor_lines_button->setFlat(TRUE); |
217 | color = config.readListEntry("keycolor_lines", QChar(',')); | 214 | color = config.readListEntry("keycolor_lines", QChar(',')); |
218 | keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); | 215 | keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); |
219 | 216 | ||
220 | 217 | ||
221 | label = new QLabel(tr("Text Color"), color_box); | 218 | label = new QLabel(tr("Text Color"), color_box); |
222 | textcolor_button = new QPushButton(color_box); | 219 | textcolor_button = new QPushButton(color_box); |
223 | connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked())); | 220 | connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked())); |
224 | textcolor_button->setFlat((bool)1); | 221 | textcolor_button->setFlat(TRUE); |
225 | color = config.readListEntry("textcolor", QChar(',')); | 222 | color = config.readListEntry("textcolor", QChar(',')); |
226 | textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); | 223 | textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); |
227 | 224 | ||
228 | |||
229 | label = new QLabel("", color_box); // a spacer so the above buttons dont expand | 225 | label = new QLabel("", color_box); // a spacer so the above buttons dont expand |
230 | label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); | 226 | label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); |
227 | } | ||
228 | |||
229 | ConfigDlg::~ConfigDlg() | ||
230 | { | ||
231 | emit reloadSw(); | ||
232 | } | ||
233 | |||
234 | QStringList ConfigDlg::loadSw() | ||
235 | { | ||
236 | Config *config = new Config("multikey"); | ||
237 | config->setGroup("keymaps"); | ||
238 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); | ||
239 | QStringList d_maps = map_dir.entryList(); // so i can access it in other places | ||
240 | QStringList c_maps = config->readListEntry("maps", QChar('|')); | ||
241 | QStringList s_maps = config->readListEntry("sw", QChar('|')); | ||
242 | delete config; | ||
243 | |||
244 | if (!s_maps.count()) | ||
245 | { | ||
246 | s_maps = d_maps+c_maps; | ||
247 | } | ||
248 | else | ||
249 | { | ||
250 | /* Clear non existents entries */ | ||
251 | QStringList s_copy = s_maps; | ||
252 | for (uint i = 0; i < s_copy.count(); ++i) { | ||
253 | if (d_maps.find(s_copy[i]) == d_maps.end() | ||
254 | && c_maps.find(s_copy[i]) == c_maps.end()) { | ||
255 | s_maps.remove(s_copy[i]); | ||
256 | } | ||
257 | } | ||
258 | /* Update sw_maps from default_maps */ | ||
259 | for (uint i = 0; i < d_maps.count(); ++i) { | ||
260 | if (s_maps.find(d_maps[i]) == s_maps.end()) { | ||
261 | s_maps.append(d_maps[i]); | ||
262 | } | ||
263 | } | ||
264 | /* Update sw_maps from custom_maps */ | ||
265 | for (uint i = 0; i < c_maps.count(); ++i) { | ||
266 | if (s_maps.find(c_maps[i]) == s_maps.end()) { | ||
267 | s_maps.append(c_maps[i]); | ||
268 | } | ||
269 | } | ||
270 | } | ||
271 | |||
272 | return s_maps; | ||
273 | } | ||
231 | 274 | ||
275 | void ConfigDlg::moveSelectedUp() | ||
276 | { | ||
277 | int i = keymaps->currentItem(); | ||
278 | /* Ignore Current Language */ | ||
279 | if (i > 1) { | ||
280 | QString t = sw_maps[i-1]; | ||
281 | sw_maps[i-1] = sw_maps[i-2]; | ||
282 | sw_maps[i-2] = t; | ||
283 | |||
284 | QString item = keymaps->currentText(); | ||
285 | keymaps->removeItem(i); | ||
286 | keymaps->insertItem(item, i-1); | ||
287 | keymaps->setCurrentItem(i-1); | ||
288 | |||
289 | Config config("multikey"); | ||
290 | config.setGroup("keymaps"); | ||
291 | config.writeEntry("sw", sw_maps, QChar('|')); | ||
292 | } | ||
293 | } | ||
294 | |||
295 | void ConfigDlg::moveSelectedDown() | ||
296 | { | ||
297 | int i = keymaps->currentItem(); | ||
298 | /* Ignore Current Language */ | ||
299 | if (i > 0 && i < (int)keymaps->count() - 1) { | ||
300 | QString t = sw_maps[i-1]; | ||
301 | sw_maps[i-1] = sw_maps[i]; | ||
302 | sw_maps[i] = t; | ||
303 | |||
304 | QString item = keymaps->currentText(); | ||
305 | keymaps->removeItem(i); | ||
306 | keymaps->insertItem(item, i+1); | ||
307 | keymaps->setCurrentItem(i+1); | ||
308 | |||
309 | Config config("multikey"); | ||
310 | config.setGroup("keymaps"); | ||
311 | config.writeEntry("sw", sw_maps, QChar('|')); | ||
312 | } | ||
232 | } | 313 | } |
233 | 314 | ||
234 | void ConfigDlg::pickTog() { | 315 | void ConfigDlg::pickTog() { |
235 | 316 | ||
@@ -270,17 +351,17 @@ void ConfigDlg::setMap(int index) { | |||
270 | 351 | ||
271 | remove_button->setDisabled(true); | 352 | remove_button->setDisabled(true); |
272 | emit setMapToDefault(); | 353 | emit setMapToDefault(); |
273 | } | 354 | } |
274 | else if ((uint)index <= default_maps.count()) { | 355 | else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) { |
275 | 356 | ||
276 | remove_button->setDisabled(true); | 357 | remove_button->setDisabled(true); |
277 | emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + default_maps[index - 1]); | 358 | emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]); |
278 | 359 | ||
279 | } else { | 360 | } else { |
280 | 361 | ||
281 | remove_button->setEnabled(true); | 362 | remove_button->setEnabled(true); |
282 | emit setMapToFile(custom_maps[index - default_maps.count() - 1]); | 363 | emit setMapToFile(sw_maps[index - 1]); |
283 | } | 364 | } |
284 | } | 365 | } |
285 | 366 | ||
286 | // ConfigDlg::addMap() {{{1 | 367 | // ConfigDlg::addMap() {{{1 |
@@ -294,8 +375,10 @@ void ConfigDlg::addMap() { | |||
294 | config.setGroup("keymaps"); | 375 | config.setGroup("keymaps"); |
295 | QStringList maps = config.readListEntry("maps", QChar('|')); | 376 | QStringList maps = config.readListEntry("maps", QChar('|')); |
296 | maps.append(map); | 377 | maps.append(map); |
297 | custom_maps.append(map); | 378 | custom_maps.append(map); |
379 | if (sw_maps.find(map) == sw_maps.end()) | ||
380 | sw_maps.append(map); | ||
298 | 381 | ||
299 | QFile map_file (map); | 382 | QFile map_file (map); |
300 | if (map_file.open(IO_ReadOnly)) { | 383 | if (map_file.open(IO_ReadOnly)) { |
301 | 384 | ||
@@ -320,8 +403,9 @@ void ConfigDlg::addMap() { | |||
320 | keymaps->setSelected(keymaps->count() - 1, true); | 403 | keymaps->setSelected(keymaps->count() - 1, true); |
321 | 404 | ||
322 | 405 | ||
323 | config.writeEntry("maps", maps, QChar('|')); | 406 | config.writeEntry("maps", maps, QChar('|')); |
407 | config.writeEntry("sw", sw_maps, QChar('|')); | ||
324 | config.writeEntry("current", map); | 408 | config.writeEntry("current", map); |
325 | 409 | ||
326 | } | 410 | } |
327 | 411 | ||
@@ -332,14 +416,16 @@ void ConfigDlg::removeMap() { | |||
332 | keymaps->setSelected(keymaps->currentItem() - 1, true); | 416 | keymaps->setSelected(keymaps->currentItem() - 1, true); |
333 | // delete the next selected item cus you just moved it up | 417 | // delete the next selected item cus you just moved it up |
334 | keymaps->removeItem(keymaps->currentItem() + 1); | 418 | keymaps->removeItem(keymaps->currentItem() + 1); |
335 | 419 | ||
336 | custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count())); | 420 | custom_maps.remove(sw_maps[keymaps->currentItem()]); |
421 | sw_maps.remove(sw_maps.at(keymaps->currentItem())); | ||
337 | 422 | ||
338 | // write the changes | 423 | // write the changes |
339 | Config config ("multikey"); | 424 | Config config ("multikey"); |
340 | config.setGroup("keymaps"); | 425 | config.setGroup("keymaps"); |
341 | config.writeEntry("maps", custom_maps, QChar('|')); | 426 | config.writeEntry("maps", custom_maps, QChar('|')); |
427 | config.writeEntry("sw", sw_maps, QChar('|')); | ||
342 | } | 428 | } |
343 | 429 | ||
344 | /* ConfigDlg::slots for the color buttons {{{1 | 430 | /* ConfigDlg::slots for the color buttons {{{1 |
345 | * | 431 | * |
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h index 336932b..ea157c5 100644 --- a/inputmethods/multikey/configdlg.h +++ b/inputmethods/multikey/configdlg.h | |||
@@ -12,16 +12,23 @@ class ConfigDlg : public QTabWidget | |||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | ConfigDlg (); | 15 | ConfigDlg (); |
16 | ~ConfigDlg (); | ||
17 | static QStringList ConfigDlg::loadSw(); | ||
16 | 18 | ||
17 | signals: | 19 | signals: |
18 | void pickboardToggled(bool on_off); | 20 | void pickboardToggled(bool on_off); |
19 | void repeatToggled(bool on_off); | 21 | void repeatToggled(bool on_off); |
20 | void setMapToDefault(); | 22 | void setMapToDefault(); |
21 | void setMapToFile(QString map); | 23 | void setMapToFile(QString map); |
22 | void reloadKeyboard(); | 24 | void reloadKeyboard(); |
23 | void configDlgClosed(); | 25 | void configDlgClosed(); |
26 | void reloadSw(); | ||
27 | |||
28 | protected slots: | ||
29 | void moveSelectedUp(); | ||
30 | void moveSelectedDown(); | ||
24 | 31 | ||
25 | private slots: | 32 | private slots: |
26 | void pickTog(); | 33 | void pickTog(); |
27 | void repeatTog(); | 34 | void repeatTog(); |
@@ -46,8 +53,9 @@ private: | |||
46 | 53 | ||
47 | 54 | ||
48 | QStringList default_maps; // the maps in your share/multikey/ dir | 55 | QStringList default_maps; // the maps in your share/multikey/ dir |
49 | QStringList custom_maps; // maps you added with the 'add' button | 56 | QStringList custom_maps; // maps you added with the 'add' button |
57 | QStringList sw_maps; // maps, which used in keyboard switch rotation ring | ||
50 | 58 | ||
51 | /* color buttons */ | 59 | /* color buttons */ |
52 | QPushButton *keycolor_button; | 60 | QPushButton *keycolor_button; |
53 | QPushButton *keycolor_pressed_button; | 61 | QPushButton *keycolor_pressed_button; |
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 2ce6dd3..aec0ad3 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -30,9 +30,9 @@ | |||
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
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 <qdir.h> |
35 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
36 | #include <qstringlist.h> | 36 | #include <qstringlist.h> |
37 | 37 | ||
38 | #include <sys/utsname.h> | 38 | #include <sys/utsname.h> |
@@ -93,14 +93,17 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : | |||
93 | 93 | ||
94 | repeatTimer = new QTimer( this ); | 94 | repeatTimer = new QTimer( this ); |
95 | connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); | 95 | connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); |
96 | 96 | ||
97 | QCopChannel* kbdChannel = new QCopChannel("MultiKey/Keyboard", this); | ||
98 | connect(kbdChannel, SIGNAL(received(const QCString &, const QByteArray &)), | ||
99 | this, SLOT(receive(const QCString &, const QByteArray &))); | ||
97 | } | 100 | } |
98 | 101 | ||
99 | Keyboard::~Keyboard() { | 102 | Keyboard::~Keyboard() { |
100 | 103 | ||
101 | if ( configdlg ) { | 104 | if ( configdlg ) { |
102 | delete (ConfigDlg *) configdlg; | 105 | delete configdlg; |
103 | configdlg = 0; | 106 | configdlg = 0; |
104 | } | 107 | } |
105 | 108 | ||
106 | } | 109 | } |
@@ -416,9 +419,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
416 | if (qkeycode == Qt::Key_F1) { // toggle the pickboard | 419 | if (qkeycode == Qt::Key_F1) { // toggle the pickboard |
417 | 420 | ||
418 | if ( configdlg ) { | 421 | if ( configdlg ) { |
419 | 422 | ||
420 | delete (ConfigDlg *) configdlg; | 423 | delete configdlg; |
421 | configdlg = 0; | 424 | configdlg = 0; |
422 | } | 425 | } |
423 | else { | 426 | else { |
424 | configdlg = new ConfigDlg (); | 427 | configdlg = new ConfigDlg (); |
@@ -433,8 +436,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
433 | connect(configdlg, SIGNAL(reloadKeyboard()), | 436 | connect(configdlg, SIGNAL(reloadKeyboard()), |
434 | this, SLOT(reloadKeyboard())); | 437 | this, SLOT(reloadKeyboard())); |
435 | connect(configdlg, SIGNAL(configDlgClosed()), | 438 | connect(configdlg, SIGNAL(configDlgClosed()), |
436 | this, SLOT(cleanupConfigDlg())); | 439 | this, SLOT(cleanupConfigDlg())); |
440 | connect(configdlg, SIGNAL(reloadSw()), | ||
441 | this, SLOT(reloadSw())); | ||
437 | configdlg->showMaximized(); | 442 | configdlg->showMaximized(); |
438 | configdlg->show(); | 443 | configdlg->show(); |
439 | configdlg->raise(); | 444 | configdlg->raise(); |
440 | } | 445 | } |
@@ -759,8 +764,19 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
759 | //pressTid = startTimer(80); | 764 | //pressTid = startTimer(80); |
760 | 765 | ||
761 | } | 766 | } |
762 | 767 | ||
768 | void Keyboard::receive(const QCString &msg, const QByteArray &data) | ||
769 | { | ||
770 | if (msg == "setmultikey(QString)") { | ||
771 | QDataStream stream(data, IO_ReadOnly); | ||
772 | QString map; | ||
773 | stream >> map; | ||
774 | setMapToFile(map); | ||
775 | } else if (msg == "getmultikey()") { | ||
776 | reloadSw(); | ||
777 | } | ||
778 | } | ||
763 | 779 | ||
764 | /* Keyboard::mouseReleaseEvent {{{1 */ | 780 | /* Keyboard::mouseReleaseEvent {{{1 */ |
765 | void Keyboard::mouseReleaseEvent(QMouseEvent*) | 781 | void Keyboard::mouseReleaseEvent(QMouseEvent*) |
766 | { | 782 | { |
@@ -910,13 +926,24 @@ void Keyboard::toggleRepeat(bool on) { | |||
910 | 926 | ||
911 | void Keyboard::cleanupConfigDlg() { | 927 | void Keyboard::cleanupConfigDlg() { |
912 | 928 | ||
913 | if ( configdlg ) { | 929 | if ( configdlg ) { |
914 | delete (ConfigDlg *) configdlg; | 930 | delete configdlg; |
915 | configdlg = 0; | 931 | configdlg = 0; |
916 | } | 932 | } |
917 | } | 933 | } |
918 | 934 | ||
935 | void Keyboard::reloadSw() { | ||
936 | QCopEnvelope e("MultiKey/Switcher", "setsw(QString,QString)"); | ||
937 | |||
938 | Config* config = new Config("multikey"); | ||
939 | config->setGroup("keymaps"); | ||
940 | QString current_map = config->readEntry("current", "en.keymap"); | ||
941 | delete config; | ||
942 | |||
943 | e << ConfigDlg::loadSw().join("|") << current_map; | ||
944 | } | ||
945 | |||
919 | /* Keyboard::setMapTo ... {{{1 */ | 946 | /* Keyboard::setMapTo ... {{{1 */ |
920 | void Keyboard::setMapToDefault() { | 947 | void Keyboard::setMapToDefault() { |
921 | 948 | ||
922 | 949 | ||
@@ -925,8 +952,13 @@ void Keyboard::setMapToDefault() { | |||
925 | config->setGroup( "Language" ); | 952 | config->setGroup( "Language" ); |
926 | QString l = config->readEntry( "Language" , "en" ); | 953 | QString l = config->readEntry( "Language" , "en" ); |
927 | delete config; | 954 | delete config; |
928 | 955 | ||
956 | /* if Language represents as en_US, ru_RU, etc... */ | ||
957 | int d = l.find('_'); | ||
958 | if (d != -1) { | ||
959 | l.remove(d, l.length()-d); | ||
960 | } | ||
929 | QString key_map = QPEApplication::qpeDir() + "share/multikey/" | 961 | QString key_map = QPEApplication::qpeDir() + "share/multikey/" |
930 | + l + ".keymap"; | 962 | + l + ".keymap"; |
931 | 963 | ||
932 | /* save change to multikey config file */ | 964 | /* save change to multikey config file */ |
@@ -1505,9 +1537,9 @@ void Keys::setKeysFromFile(const char * filename) { | |||
1505 | 1537 | ||
1506 | buf = t.readLine(); | 1538 | buf = t.readLine(); |
1507 | } | 1539 | } |
1508 | 1540 | ||
1509 | // other variables like lang & title | 1541 | // other variables like lang & title & sw |
1510 | else if (buf.contains(QRegExp("^\\s*[a-zA-Z]+\\s*=\\s*[a-zA-Z0-9/]+\\s*$", FALSE, FALSE))) { | 1542 | else if (buf.contains(QRegExp("^\\s*[a-zA-Z]+\\s*=\\s*[a-zA-Z0-9/]+\\s*$", FALSE, FALSE))) { |
1511 | 1543 | ||
1512 | QTextStream tmp (buf, IO_ReadOnly); | 1544 | QTextStream tmp (buf, IO_ReadOnly); |
1513 | QString name, equals, value; | 1545 | QString name, equals, value; |
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 20c5cee..0b56988 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h | |||
@@ -129,11 +129,13 @@ private slots: | |||
129 | void toggleRepeat(bool on_off); | 129 | void toggleRepeat(bool on_off); |
130 | void setMapToDefault(); | 130 | void setMapToDefault(); |
131 | void setMapToFile(QString map); | 131 | void setMapToFile(QString map); |
132 | void cleanupConfigDlg(); | 132 | void cleanupConfigDlg(); |
133 | void reloadSw(); | ||
133 | 134 | ||
134 | // used to redraw keyboard after edited colors | 135 | // used to redraw keyboard after edited colors |
135 | void reloadKeyboard(); | 136 | void reloadKeyboard(); |
137 | void receive( const QCString &msg, const QByteArray &data ); | ||
136 | 138 | ||
137 | private: | 139 | private: |
138 | int getKey( int &w, int j = -1 ); | 140 | int getKey( int &w, int j = -1 ); |
139 | void clearHighlight(); | 141 | void clearHighlight(); |