summaryrefslogtreecommitdiff
path: root/inputmethods/multikey
authorzecke <zecke>2004-03-14 19:35:00 (UTC)
committer zecke <zecke>2004-03-14 19:35:00 (UTC)
commit05c8d999941989a97a581fb5822437034ec10fd7 (patch) (unidiff)
tree28ba32dcf84bf8297550bf0f79fc504855caf341 /inputmethods/multikey
parentcbb87c7c24dfe46462602c73b10bd76ce81a3baf (diff)
downloadopie-05c8d999941989a97a581fb5822437034ec10fd7.zip
opie-05c8d999941989a97a581fb5822437034ec10fd7.tar.gz
opie-05c8d999941989a97a581fb5822437034ec10fd7.tar.bz2
Input Methods -> ODP
Diffstat (limited to 'inputmethods/multikey') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/config.in2
-rw-r--r--inputmethods/multikey/configdlg.cpp14
-rw-r--r--inputmethods/multikey/multikey.pro2
3 files changed, 10 insertions, 8 deletions
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
@@ -17,31 +17,33 @@
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
@@ -426,81 +428,81 @@ void ConfigDlg::removeMap() {
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