summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dvorak/config.in4
-rw-r--r--inputmethods/handwriting/config.in2
-rw-r--r--inputmethods/jumpx/config.in2
-rw-r--r--inputmethods/keyboard/config.in4
-rw-r--r--inputmethods/kjumpx/config.in2
-rw-r--r--inputmethods/multikey/config.in2
-rw-r--r--inputmethods/multikey/configdlg.cpp14
-rw-r--r--inputmethods/multikey/multikey.pro2
-rw-r--r--inputmethods/pickboard/config.in2
-rw-r--r--inputmethods/unikeyboard/config.in2
10 files changed, 19 insertions, 17 deletions
diff --git a/inputmethods/dvorak/config.in b/inputmethods/dvorak/config.in
index 13042b6..ed31b6a 100644
--- a/inputmethods/dvorak/config.in
+++ b/inputmethods/dvorak/config.in
@@ -1,6 +1,6 @@
1 config DVORAK 1 config DVORAK
2 boolean "opie-dvorak (keyboard in DVORAK layout)" 2 boolean "opie-dvorak (keyboard in DVORAK layout)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD 4 depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD
5 comment "opie-dvorak needs opie-pickboard" 5 comment "opie-dvorak needs opie-pickboard"
6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD) 6 depends !(( LIBQPE || LIBQPE-X11 ) && PICKBOARD)
diff --git a/inputmethods/handwriting/config.in b/inputmethods/handwriting/config.in
index 5aa4229..3a5fddb 100644
--- a/inputmethods/handwriting/config.in
+++ b/inputmethods/handwriting/config.in
@@ -1,8 +1,8 @@
1 config HANDWRITING 1 config HANDWRITING
2 boolean "opie-handwriting (Handwriting recognition)" 2 boolean "opie-handwriting (Handwriting recognition)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
5 comment "opie-handwriting-classicset automatically selected" 5 comment "opie-handwriting-classicset automatically selected"
6 depends HANDWRITING 6 depends HANDWRITING
7 comment "opie-handwriting-graffitiset automatically selected" 7 comment "opie-handwriting-graffitiset automatically selected"
8 depends HANDWRITING 8 depends HANDWRITING
diff --git a/inputmethods/jumpx/config.in b/inputmethods/jumpx/config.in
index 8358fab..f2779f8 100644
--- a/inputmethods/jumpx/config.in
+++ b/inputmethods/jumpx/config.in
@@ -1,4 +1,4 @@
1 config JUMPX 1 config JUMPX
2 boolean "opie-jumpx (keyboard optimized for single finger/stylus input)" 2 boolean "opie-jumpx (keyboard optimized for single finger/stylus input)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/inputmethods/keyboard/config.in b/inputmethods/keyboard/config.in
index 6673439..0fbb535 100644
--- a/inputmethods/keyboard/config.in
+++ b/inputmethods/keyboard/config.in
@@ -1,6 +1,6 @@
1 config KEYBOARD 1 config KEYBOARD
2 boolean "opie-keyboard (keyboard in QWERTY layout)" 2 boolean "opie-keyboard (keyboard in QWERTY layout)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD 4 depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD
5 comment "opie-keyboard needs opie-pickboard" 5 comment "opie-keyboard needs opie-pickboard"
6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD) 6 depends !(( LIBQPE || LIBQPE-X11 ) && PICKBOARD)
diff --git a/inputmethods/kjumpx/config.in b/inputmethods/kjumpx/config.in
index 7ba966c..8ccef5b 100644
--- a/inputmethods/kjumpx/config.in
+++ b/inputmethods/kjumpx/config.in
@@ -1,4 +1,4 @@
1 config KJUMPX 1 config KJUMPX
2 boolean "opie-kjumpx (korean keyboard optimized for single finger/stylus input)" 2 boolean "opie-kjumpx (korean keyboard optimized for single finger/stylus input)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/inputmethods/multikey/config.in b/inputmethods/multikey/config.in
index b34bd3d..ad7d1e8 100644
--- a/inputmethods/multikey/config.in
+++ b/inputmethods/multikey/config.in
@@ -1,4 +1,4 @@
1 config MULTIKEY 1 config MULTIKEY
2 boolean "opie-multikey (OnScreen keyboard for multiple languages)" 2 boolean "opie-multikey (OnScreen keyboard for multiple languages)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && PICKBOARD 4 depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX2 && LIBOPIEUI2
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 3e39415..1fba9bc 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -1,131 +1,133 @@
1/* 1/*
2 * TODO 2 * TODO
3 * make a font selection thing (size too) 3 * make a font selection thing (size too)
4 * make a keymap editor 4 * make a keymap editor
5 * make keys translucent 5 * make keys translucent
6 * make vertical keys possible 6 * make vertical keys possible
7 * 7 *
8 * 8 *
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#include <qpe/resource.h>
14 14
15#include <qlayout.h> 15#include <qlayout.h>
16#include <qwidget.h> 16#include <qwidget.h>
17#include <qdialog.h> 17#include <qdialog.h>
18#include <qtabwidget.h> 18#include <qtabwidget.h>
19#include <qvbox.h> 19#include <qvbox.h>
20#include <qgrid.h> 20#include <qgrid.h>
21#include <qgroupbox.h> 21#include <qgroupbox.h>
22#include <qlabel.h> 22#include <qlabel.h>
23#include <qcheckbox.h> 23#include <qcheckbox.h>
24#include <qsizepolicy.h> 24#include <qsizepolicy.h>
25#include <qpushbutton.h> 25#include <qpushbutton.h>
26#include <qlistbox.h> 26#include <qlistbox.h>
27#include <qstringlist.h> 27#include <qstringlist.h>
28#include <qtoolbutton.h> 28#include <qtoolbutton.h>
29#include <opie/ofiledialog.h> 29#include <opie2/ofiledialog.h>
30#include <opie/colordialog.h> 30#include <opie2/qcolordialog.h>
31#include <qdir.h> 31#include <qdir.h>
32#include <qfileinfo.h> 32#include <qfileinfo.h>
33#include "configdlg.h" 33#include "configdlg.h"
34#include "keyboard.h" 34#include "keyboard.h"
35 35
36using namespace Opie;
37using namespace Opie::Ui;
36// ConfigDlg::ConfigDlg() {{{1 38// ConfigDlg::ConfigDlg() {{{1
37ConfigDlg::ConfigDlg () : QDialog () 39ConfigDlg::ConfigDlg () : QDialog ()
38{ 40{
39 setCaption( tr("Multikey Configuration") ); 41 setCaption( tr("Multikey Configuration") );
40 Config config ("multikey"); 42 Config config ("multikey");
41 config.setGroup("keymaps"); 43 config.setGroup("keymaps");
42 QString current_map = config.readEntry("current", 0); 44 QString current_map = config.readEntry("current", 0);
43 45
44 /* 46 /*
45 * 'general config' tab 47 * 'general config' tab
46 */ 48 */
47 49
48 QVBoxLayout *base_lay = new QVBoxLayout(this); 50 QVBoxLayout *base_lay = new QVBoxLayout(this);
49 51
50 QTabWidget *tabs = new QTabWidget(this, "tabs"); 52 QTabWidget *tabs = new QTabWidget(this, "tabs");
51 53
52 QWidget *gen_box = new QWidget(tabs, "gen_tab"); 54 QWidget *gen_box = new QWidget(tabs, "gen_tab");
53 QVBoxLayout *gen_lay = new QVBoxLayout(gen_box); 55 QVBoxLayout *gen_lay = new QVBoxLayout(gen_box);
54 gen_lay->setMargin(3); 56 gen_lay->setMargin(3);
55 QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); 57 QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box);
56 58
57 QHBox *hbox1 = new QHBox(map_group); 59 QHBox *hbox1 = new QHBox(map_group);
58 keymaps = new QListBox(hbox1); 60 keymaps = new QListBox(hbox1);
59 keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); 61 keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
60 QVBox *vbox1 = new QVBox(hbox1); 62 QVBox *vbox1 = new QVBox(hbox1);
61 63
62 QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up")); 64 QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up"));
63 tb1->setPixmap(Resource::loadPixmap("up")); 65 tb1->setPixmap(Resource::loadPixmap("up"));
64 tb1->setAutoRaise(TRUE); 66 tb1->setAutoRaise(TRUE);
65 tb1->setFocusPolicy(QWidget::NoFocus); 67 tb1->setFocusPolicy(QWidget::NoFocus);
66 tb1->setToggleButton(FALSE); 68 tb1->setToggleButton(FALSE);
67 connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp())); 69 connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp()));
68 70
69 QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down")); 71 QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down"));
70 tb2->setPixmap(Resource::loadPixmap("down")); 72 tb2->setPixmap(Resource::loadPixmap("down"));
71 tb2->setAutoRaise(TRUE); 73 tb2->setAutoRaise(TRUE);
72 tb2->setFocusPolicy(QWidget::NoFocus); 74 tb2->setFocusPolicy(QWidget::NoFocus);
73 tb2->setToggleButton(FALSE); 75 tb2->setToggleButton(FALSE);
74 connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown())); 76 connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown()));
75 77
76 QString cur(tr("Current Language")); 78 QString cur(tr("Current Language"));
77 keymaps->insertItem(cur); 79 keymaps->insertItem(cur);
78 keymaps->setSelected(0, true); 80 keymaps->setSelected(0, true);
79 81
80 QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); 82 QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap");
81 default_maps = map_dir.entryList(); // so i can access it in other places 83 default_maps = map_dir.entryList(); // so i can access it in other places
82 custom_maps = config.readListEntry("maps", QChar('|')); 84 custom_maps = config.readListEntry("maps", QChar('|'));
83 sw_maps = ConfigDlg::loadSw(); 85 sw_maps = ConfigDlg::loadSw();
84 86
85 QStringList sw_copy(sw_maps); 87 QStringList sw_copy(sw_maps);
86 for (uint i = 0; i < sw_copy.count(); i++) { 88 for (uint i = 0; i < sw_copy.count(); i++) {
87 89
88 QString keymap_map; 90 QString keymap_map;
89 if (sw_copy[i][0] != '/') { /* share/multikey */ 91 if (sw_copy[i][0] != '/') { /* share/multikey */
90 92
91 keymap_map = map_dir.absPath() + "/" + sw_copy[i]; 93 keymap_map = map_dir.absPath() + "/" + sw_copy[i];
92 } else { 94 } else {
93 95
94 if (map_dir.exists(QFileInfo(sw_copy[i]).fileName(), false) 96 if (map_dir.exists(QFileInfo(sw_copy[i]).fileName(), false)
95 || !QFile::exists(sw_copy[i])) { 97 || !QFile::exists(sw_copy[i])) {
96 98
97 custom_maps.remove(sw_copy[i]); 99 custom_maps.remove(sw_copy[i]);
98 sw_maps.remove(sw_copy[i]); 100 sw_maps.remove(sw_copy[i]);
99 101
100 // remove it from the list too 102 // remove it from the list too
101 config.writeEntry("maps", custom_maps.join("|")); 103 config.writeEntry("maps", custom_maps.join("|"));
102 104
103 continue; 105 continue;
104 } 106 }
105 keymap_map = sw_copy[i]; 107 keymap_map = sw_copy[i];
106 } 108 }
107 109
108 QFile map(keymap_map); 110 QFile map(keymap_map);
109 if (map.open(IO_ReadOnly)) { 111 if (map.open(IO_ReadOnly)) {
110 112
111 QString line; bool found = 0; 113 QString line; bool found = 0;
112 114
113 map.readLine(line, 1024); 115 map.readLine(line, 1024);
114 while (!map.atEnd()) { 116 while (!map.atEnd()) {
115 117
116 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { 118 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
117 119
118 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); 120 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
119 found = 1; 121 found = 1;
120 break; 122 break;
121 } 123 }
122 map.readLine(line, 1024); 124 map.readLine(line, 1024);
123 } 125 }
124 if (!found) 126 if (!found)
125 keymaps->insertItem(keymap_map); 127 keymaps->insertItem(keymap_map);
126 128
127 map.close(); 129 map.close();
128 } 130 }
129 131
130 if (keymap_map == current_map) { 132 if (keymap_map == current_map) {
131 keymaps->setSelected(i + 1, true); 133 keymaps->setSelected(i + 1, true);
@@ -342,165 +344,165 @@ void ConfigDlg::moveSelectedDown()
342 int i = keymaps->currentItem(); 344 int i = keymaps->currentItem();
343 /* Ignore Current Language */ 345 /* Ignore Current Language */
344 if (i > 0 && i < (int)keymaps->count() - 1) { 346 if (i > 0 && i < (int)keymaps->count() - 1) {
345 QString t = sw_maps[i-1]; 347 QString t = sw_maps[i-1];
346 sw_maps[i-1] = sw_maps[i]; 348 sw_maps[i-1] = sw_maps[i];
347 sw_maps[i] = t; 349 sw_maps[i] = t;
348 350
349 QString item = keymaps->currentText(); 351 QString item = keymaps->currentText();
350 keymaps->removeItem(i); 352 keymaps->removeItem(i);
351 keymaps->insertItem(item, i+1); 353 keymaps->insertItem(item, i+1);
352 keymaps->setCurrentItem(i+1); 354 keymaps->setCurrentItem(i+1);
353 } 355 }
354} 356}
355 357
356void ConfigDlg::closeEvent(QCloseEvent *) { 358void ConfigDlg::closeEvent(QCloseEvent *) {
357 359
358 // tell the parent it was closed, so delete me 360 // tell the parent it was closed, so delete me
359 emit configDlgClosed(); 361 emit configDlgClosed();
360} 362}
361 363
362void ConfigDlg::setMap(int index) { 364void ConfigDlg::setMap(int index) {
363 365
364 if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) { 366 if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) {
365 remove_button->setDisabled(true); 367 remove_button->setDisabled(true);
366 } else { 368 } else {
367 remove_button->setEnabled(true); 369 remove_button->setEnabled(true);
368 } 370 }
369} 371}
370 372
371// ConfigDlg::addMap() {{{1 373// ConfigDlg::addMap() {{{1
372void ConfigDlg::addMap() { 374void ConfigDlg::addMap() {
373 375
374 QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); 376 QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
375 377
376 if (map.isNull()) return; 378 if (map.isNull()) return;
377 379
378 Config config ("multikey"); 380 Config config ("multikey");
379 config.setGroup("keymaps"); 381 config.setGroup("keymaps");
380 QStringList maps = config.readListEntry("maps", QChar('|')); 382 QStringList maps = config.readListEntry("maps", QChar('|'));
381 maps.append(map); 383 maps.append(map);
382 custom_maps.append(map); 384 custom_maps.append(map);
383 if (sw_maps.find(map) == sw_maps.end()) 385 if (sw_maps.find(map) == sw_maps.end())
384 sw_maps.append(map); 386 sw_maps.append(map);
385 387
386 QFile map_file (map); 388 QFile map_file (map);
387 if (map_file.open(IO_ReadOnly)) { 389 if (map_file.open(IO_ReadOnly)) {
388 390
389 QString line; bool found = 0; 391 QString line; bool found = 0;
390 392
391 map_file.readLine(line, 1024); 393 map_file.readLine(line, 1024);
392 while (!map_file.atEnd()) { 394 while (!map_file.atEnd()) {
393 395
394 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { 396 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
395 397
396 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); 398 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
397 found = 1; 399 found = 1;
398 break; 400 break;
399 } 401 }
400 map_file.readLine(line, 1024); 402 map_file.readLine(line, 1024);
401 } 403 }
402 if (!found) keymaps->insertItem(map); 404 if (!found) keymaps->insertItem(map);
403 405
404 map_file.close(); 406 map_file.close();
405 } 407 }
406 408
407 keymaps->setSelected(keymaps->count() - 1, true); 409 keymaps->setSelected(keymaps->count() - 1, true);
408} 410}
409 411
410// ConfigDlg::removeMap() {{{1 412// ConfigDlg::removeMap() {{{1
411void ConfigDlg::removeMap() { 413void ConfigDlg::removeMap() {
412 414
413 // move selection up one 415 // move selection up one
414 keymaps->setSelected(keymaps->currentItem() - 1, true); 416 keymaps->setSelected(keymaps->currentItem() - 1, true);
415 // delete the next selected item cus you just moved it up 417 // delete the next selected item cus you just moved it up
416 keymaps->removeItem(keymaps->currentItem() + 1); 418 keymaps->removeItem(keymaps->currentItem() + 1);
417 419
418 custom_maps.remove(sw_maps[keymaps->currentItem()]); 420 custom_maps.remove(sw_maps[keymaps->currentItem()]);
419 sw_maps.remove(sw_maps.at(keymaps->currentItem())); 421 sw_maps.remove(sw_maps.at(keymaps->currentItem()));
420} 422}
421 423
422/* ConfigDlg::slots for the color buttons {{{1 424/* ConfigDlg::slots for the color buttons {{{1
423 * 425 *
424 * these four slots are almost the same, except for the names. i was thinking 426 * these four slots are almost the same, except for the names. i was thinking
425 * of making a map with pointers to the buttons and names of the configEntry 427 * of making a map with pointers to the buttons and names of the configEntry
426 * so it could be one slot, but then there would be no way of telling which 428 * so it could be one slot, but then there would be no way of telling which
427 * of the buttons was clicked if they all connect to the same slot. 429 * of the buttons was clicked if they all connect to the same slot.
428 * 430 *
429 */ 431 */
430 432
431void ConfigDlg::keyColorClicked() { 433void ConfigDlg::keyColorClicked() {
432 434
433 Config config ("multikey"); 435 Config config ("multikey");
434 config.setGroup ("colors"); 436 config.setGroup ("colors");
435 437
436 QStringList color = config.readListEntry("keycolor", QChar(',')); 438 QStringList color = config.readListEntry("keycolor", QChar(','));
437 439
438 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 440 QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
439 441
440 color[0].setNum(newcolor.red()); 442 color[0].setNum(newcolor.red());
441 color[1].setNum(newcolor.green()); 443 color[1].setNum(newcolor.green());
442 color[2].setNum(newcolor.blue()); 444 color[2].setNum(newcolor.blue());
443 445
444 config.writeEntry("keycolor", color, QChar(',')); 446 config.writeEntry("keycolor", color, QChar(','));
445 config.write(); 447 config.write();
446 448
447 keycolor_button->setPalette(QPalette(newcolor)); 449 keycolor_button->setPalette(QPalette(newcolor));
448 emit reloadKeyboard(); 450 emit reloadKeyboard();
449} 451}
450void ConfigDlg::keyColorPressedClicked() { 452void ConfigDlg::keyColorPressedClicked() {
451 453
452 Config config ("multikey"); 454 Config config ("multikey");
453 config.setGroup ("colors"); 455 config.setGroup ("colors");
454 456
455 QStringList color = config.readListEntry("keycolor_pressed", QChar(',')); 457 QStringList color = config.readListEntry("keycolor_pressed", QChar(','));
456 458
457 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 459 QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
458 460
459 color[0].setNum(newcolor.red()); 461 color[0].setNum(newcolor.red());
460 color[1].setNum(newcolor.green()); 462 color[1].setNum(newcolor.green());
461 color[2].setNum(newcolor.blue()); 463 color[2].setNum(newcolor.blue());
462 464
463 config.writeEntry("keycolor_pressed", color, QChar(',')); 465 config.writeEntry("keycolor_pressed", color, QChar(','));
464 config.write(); 466 config.write();
465 467
466 keycolor_pressed_button->setPalette(QPalette(newcolor)); 468 keycolor_pressed_button->setPalette(QPalette(newcolor));
467 emit reloadKeyboard(); 469 emit reloadKeyboard();
468} 470}
469void ConfigDlg::keyColorLinesClicked() { 471void ConfigDlg::keyColorLinesClicked() {
470 472
471 Config config ("multikey"); 473 Config config ("multikey");
472 config.setGroup ("colors"); 474 config.setGroup ("colors");
473 475
474 QStringList color = config.readListEntry("keycolor_lines", QChar(',')); 476 QStringList color = config.readListEntry("keycolor_lines", QChar(','));
475 477
476 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 478 QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
477 479
478 color[0].setNum(newcolor.red()); 480 color[0].setNum(newcolor.red());
479 color[1].setNum(newcolor.green()); 481 color[1].setNum(newcolor.green());
480 color[2].setNum(newcolor.blue()); 482 color[2].setNum(newcolor.blue());
481 483
482 config.writeEntry("keycolor_lines", color, QChar(',')); 484 config.writeEntry("keycolor_lines", color, QChar(','));
483 config.write(); 485 config.write();
484 486
485 keycolor_lines_button->setPalette(QPalette(newcolor)); 487 keycolor_lines_button->setPalette(QPalette(newcolor));
486 emit reloadKeyboard(); 488 emit reloadKeyboard();
487} 489}
488void ConfigDlg::textColorClicked() { 490void ConfigDlg::textColorClicked() {
489 491
490 Config config ("multikey"); 492 Config config ("multikey");
491 config.setGroup ("colors"); 493 config.setGroup ("colors");
492 494
493 QStringList color = config.readListEntry("textcolor", QChar(',')); 495 QStringList color = config.readListEntry("textcolor", QChar(','));
494 496
495 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 497 QColor newcolor = QColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
496 498
497 color[0].setNum(newcolor.red()); 499 color[0].setNum(newcolor.red());
498 color[1].setNum(newcolor.green()); 500 color[1].setNum(newcolor.green());
499 color[2].setNum(newcolor.blue()); 501 color[2].setNum(newcolor.blue());
500 502
501 config.writeEntry("textcolor", color, QChar(',')); 503 config.writeEntry("textcolor", color, QChar(','));
502 config.write(); 504 config.write();
503 505
504 textcolor_button->setPalette(QPalette(newcolor)); 506 textcolor_button->setPalette(QPalette(newcolor));
505 emit reloadKeyboard(); 507 emit reloadKeyboard();
506} 508}
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 0901006..3a7de06 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -1,18 +1,18 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt plugin warn_on release 2 CONFIG += qt plugin warn_on release
3 HEADERS= keyboard.h \ 3 HEADERS= keyboard.h \
4 configdlg.h \ 4 configdlg.h \
5 keyboardimpl.h 5 keyboardimpl.h
6 SOURCES= keyboard.cpp \ 6 SOURCES= keyboard.cpp \
7 configdlg.cpp \ 7 configdlg.cpp \
8 keyboardimpl.cpp 8 keyboardimpl.cpp
9 TARGET = qmultikey 9 TARGET = qmultikey
10 DESTDIR = $(OPIEDIR)/plugins/inputmethods 10 DESTDIR = $(OPIEDIR)/plugins/inputmethods
11INCLUDEPATH += $(OPIEDIR)/include 11INCLUDEPATH += $(OPIEDIR)/include
12DEPENDPATH += ../$(OPIEDIR)/include ../../launcher 12DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
13LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard 13LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2
14 QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods 14 QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
15 VERSION = 1.0.0 15 VERSION = 1.0.0
16 16
17include ( $(OPIEDIR)/include.pro ) 17include ( $(OPIEDIR)/include.pro )
18target.path = $$prefix/plugins/inputmethods 18target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/pickboard/config.in b/inputmethods/pickboard/config.in
index 376d3a7..96676fa 100644
--- a/inputmethods/pickboard/config.in
+++ b/inputmethods/pickboard/config.in
@@ -1,4 +1,4 @@
1 config PICKBOARD 1 config PICKBOARD
2 boolean "opie-pickboard (lets you dictionary-based pick whole words based on partial input)" 2 boolean "opie-pickboard (lets you dictionary-based pick whole words based on partial input)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/inputmethods/unikeyboard/config.in b/inputmethods/unikeyboard/config.in
index 923e941..e913bea 100644
--- a/inputmethods/unikeyboard/config.in
+++ b/inputmethods/unikeyboard/config.in
@@ -1,4 +1,4 @@
1 config UNIKEYBOARD 1 config UNIKEYBOARD
2 boolean "opie-unikeyboard (basic method to enter arbitrary unicode characters)" 2 boolean "opie-unikeyboard (basic method to enter arbitrary unicode characters)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )