Diffstat (limited to 'inputmethods/multikey/configdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
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 | |||
@@ -25,15 +25,17 @@ | |||
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 | ||
36 | using namespace Opie; | ||
37 | using namespace Opie::Ui; | ||
36 | // ConfigDlg::ConfigDlg() {{{1 | 38 | // ConfigDlg::ConfigDlg() {{{1 |
37 | ConfigDlg::ConfigDlg () : QDialog () | 39 | ConfigDlg::ConfigDlg () : QDialog () |
38 | { | 40 | { |
39 | setCaption( tr("Multikey Configuration") ); | 41 | setCaption( tr("Multikey Configuration") ); |
@@ -434,9 +436,9 @@ void ConfigDlg::keyColorClicked() { | |||
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()); |
@@ -453,9 +455,9 @@ void ConfigDlg::keyColorPressedClicked() { | |||
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()); |
@@ -472,9 +474,9 @@ void ConfigDlg::keyColorLinesClicked() { | |||
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()); |
@@ -491,9 +493,9 @@ void ConfigDlg::textColorClicked() { | |||
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()); |