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
@@ -21,23 +21,25 @@
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
@@ -430,17 +432,17 @@ void ConfigDlg::removeMap() {
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
@@ -449,17 +451,17 @@ void ConfigDlg::keyColorClicked() {
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
@@ -468,17 +470,17 @@ void ConfigDlg::keyColorPressedClicked() {
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
@@ -487,17 +489,17 @@ void ConfigDlg::keyColorLinesClicked() {
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
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
@@ -5,14 +5,14 @@ HEADERS = keyboard.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 )