summaryrefslogtreecommitdiff
path: root/inputmethods
authorhash <hash>2002-08-22 06:49:40 (UTC)
committer hash <hash>2002-08-22 06:49:40 (UTC)
commit8eee5a5dc6a43ed3cdd77095c3a91128fe76589e (patch) (unidiff)
treec6ea5f00744921a0da52111dd7daf8e76374cc63 /inputmethods
parent4ed706f6a327e06403e1def058b7290dcde3e634 (diff)
downloadopie-8eee5a5dc6a43ed3cdd77095c3a91128fe76589e.zip
opie-8eee5a5dc6a43ed3cdd77095c3a91128fe76589e.tar.gz
opie-8eee5a5dc6a43ed3cdd77095c3a91128fe76589e.tar.bz2
comments behind shift and meta key map definitions was making it ingore the whole line
Diffstat (limited to 'inputmethods') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 1c17172..89937cf 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -284,79 +284,81 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
284 unicode = keys->uni(row, col); 284 unicode = keys->uni(row, col);
285 285
286 // might need to repaint if two or more of the same keys. 286 // might need to repaint if two or more of the same keys.
287 // should be faster if just paint one key even though multiple keys exist. 287 // should be faster if just paint one key even though multiple keys exist.
288 bool need_repaint = FALSE; 288 bool need_repaint = FALSE;
289 289
290 if (unicode == 0) { // either Qt char, or nothing 290 if (unicode == 0) { // either Qt char, or nothing
291 291
292 if (qkeycode == Qt::Key_F1) { // toggle the pickboard 292 if (qkeycode == Qt::Key_F1) { // toggle the pickboard
293 293
294 if ( configdlg ) { 294 if ( configdlg ) {
295 delete (ConfigDlg *) configdlg; 295 delete (ConfigDlg *) configdlg;
296 configdlg = 0; 296 configdlg = 0;
297 } 297 }
298 else { 298 else {
299 configdlg = new ConfigDlg (); 299 configdlg = new ConfigDlg ();
300 connect(configdlg, SIGNAL(setMapToDefault()), 300 connect(configdlg, SIGNAL(setMapToDefault()),
301 this, SLOT(setMapToDefault())); 301 this, SLOT(setMapToDefault()));
302 connect(configdlg, SIGNAL(setMapToFile(QString)), 302 connect(configdlg, SIGNAL(setMapToFile(QString)),
303 this, SLOT(setMapToFile(QString))); 303 this, SLOT(setMapToFile(QString)));
304 connect(configdlg, SIGNAL(pickboardToggled(bool)), 304 connect(configdlg, SIGNAL(pickboardToggled(bool)),
305 this, SLOT(togglePickboard(bool))); 305 this, SLOT(togglePickboard(bool)));
306 connect(configdlg, SIGNAL(repeatToggled(bool)), 306 connect(configdlg, SIGNAL(repeatToggled(bool)),
307 this, SLOT(toggleRepeat(bool))); 307 this, SLOT(toggleRepeat(bool)));
308 connect(configdlg, SIGNAL(reloadKeyboard()), 308 connect(configdlg, SIGNAL(reloadKeyboard()),
309 this, SLOT(reloadKeyboard())); 309 this, SLOT(reloadKeyboard()));
310 configdlg->showMaximized(); 310 configdlg->showMaximized();
311 configdlg->show(); 311 configdlg->show();
312 configdlg->raise(); 312 configdlg->raise();
313 } 313 }
314 314
315 } else if (qkeycode == Qt::Key_Control) { 315 } else if (qkeycode == Qt::Key_Control) {
316 need_repaint = TRUE;
316 317
317 if (ctrl) { 318 if (ctrl) {
318 319
319 *ctrl = 0; 320 *ctrl = 0;
320 ctrl = 0; 321 ctrl = 0;
321 322
322 } else { 323 } else {
323 324
324 ctrl = keys->pressedPtr(row, col); 325 ctrl = keys->pressedPtr(row, col);
325 need_repaint = TRUE; 326 need_repaint = TRUE;
326 *ctrl = !keys->pressed(row, col); 327 *ctrl = !keys->pressed(row, col);
327 328
328 } 329 }
329 330
330 } else if (qkeycode == Qt::Key_Alt) { 331 } else if (qkeycode == Qt::Key_Alt) {
332 need_repaint = TRUE;
331 333
332 if (alt) { 334 if (alt) {
333 *alt = 0; 335 *alt = 0;
334 alt = 0; 336 alt = 0;
335 337
336 } else { 338 } else {
337 339
338 alt = keys->pressedPtr(row, col); 340 alt = keys->pressedPtr(row, col);
339 need_repaint = TRUE; 341 need_repaint = TRUE;
340 *alt = !keys->pressed(row, col); 342 *alt = !keys->pressed(row, col);
341 } 343 }
342 344
343 } else if (qkeycode == Qt::Key_Shift) { 345 } else if (qkeycode == Qt::Key_Shift) {
344 need_repaint = TRUE; 346 need_repaint = TRUE;
345 347
346 if (shift) { 348 if (shift) {
347 *shift = 0; 349 *shift = 0;
348 shift = 0; 350 shift = 0;
349 } 351 }
350 else { 352 else {
351 shift = keys->pressedPtr(row, col); 353 shift = keys->pressedPtr(row, col);
352 *shift = 1; 354 *shift = 1;
353 if (lock) { 355 if (lock) {
354 *lock = 0; 356 *lock = 0;
355 lock = 0; 357 lock = 0;
356 } 358 }
357 } 359 }
358 if (meta) { 360 if (meta) {
359 361
360 *meta = 0; 362 *meta = 0;
361 meta = 0; 363 meta = 0;
362 } 364 }