summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp54
-rw-r--r--inputmethods/multikey/configdlg.h7
-rw-r--r--inputmethods/multikey/keyboard.cpp63
-rw-r--r--inputmethods/multikey/keyboard.h10
4 files changed, 119 insertions, 15 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index ac132d3..1e104a6 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -3,2 +3,3 @@
* make a font selection thing (size too)
+ * make a cursor thing
*
@@ -26,2 +27,3 @@
#include <opie/ofiledialog.h>
+#include <opie/colordialog.h>
#include <qdir.h>
@@ -31,2 +33,3 @@
+// ConfigDlg::ConfigDlg() {{{1
ConfigDlg::ConfigDlg () : QTabWidget ()
@@ -106,2 +109,4 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
remove_button->setFlat((bool)1);
+ if ((int)map_dir.count() >= keymaps->currentItem())
+ remove_button->setDisabled(true);
connect(remove_button, SIGNAL(clicked()), SLOT(removeMap()));
@@ -131,8 +136,21 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
QLabel *label;
+ QStringList color;
label = new QLabel(tr("Key Color"), color_box);
- QPushButton *button = new QPushButton(color_box);
- button->setFlat((bool)1);
+ key_color_button = new QPushButton(color_box);
+ connect(key_color_button, SIGNAL(clicked()), SLOT(keyColorButtonClicked()));
+ key_color_button->setFlat((bool)1);
+
+ config.setGroup("colors");
+ color = config.readListEntry("keycolor", QChar(','));
+ if (color.isEmpty()) {
+ color = QStringList::split(",", "240,240,240");
+ config.writeEntry("keycolor", color.join(","));
+
+ }
+ key_color_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
+
+
label = new QLabel(tr("Key Pressed Color"), color_box);
- button = new QPushButton(color_box);
+ QPushButton *button = new QPushButton(color_box);
button->setFlat((bool)1);
@@ -166,2 +184,3 @@ void ConfigDlg::pickTog() {
+// ConfigDlg::setMap {{{1
void ConfigDlg::setMap(int index) {
@@ -171,3 +190,2 @@ void ConfigDlg::setMap(int index) {
remove_button->setDisabled(true);
-
emit setMapToDefault();
@@ -177,3 +195,2 @@ void ConfigDlg::setMap(int index) {
remove_button->setDisabled(true);
-
emit setMapToFile(keymaps->text(index));
@@ -183,3 +200,2 @@ void ConfigDlg::setMap(int index) {
remove_button->setEnabled(true);
-
emit setMapToFile(keymaps->text(index));
@@ -188,2 +204,3 @@ void ConfigDlg::setMap(int index) {
+// ConfigDlg::addMap() {{{1
void ConfigDlg::addMap() {
@@ -199,3 +216,3 @@ void ConfigDlg::addMap() {
- config.writeEntry("maps", maps.join("|"));
+ config.writeEntry("maps", maps, QChar('|'));
config.writeEntry("current", map);
@@ -204,2 +221,3 @@ void ConfigDlg::addMap() {
+// ConfigDlg::removeMap() {{{1
void ConfigDlg::removeMap() {
@@ -219,3 +237,23 @@ void ConfigDlg::removeMap() {
config.setGroup("keymaps");
- config.writeEntry("maps", custom_maps.join("|"));
+ config.writeEntry("maps", custom_maps, QChar('|'));
+}
+
+// ConfigDlg::color {{{1
+void ConfigDlg::keyColorButtonClicked() {
+
+ Config config ("multikey");
+ config.setGroup ("colors");
+
+ QStringList color = config.readListEntry("keycolor", QChar(','));
+
+ QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
+
+ color[0].setNum(newcolor.red());
+ color[1].setNum(newcolor.green());
+ color[2].setNum(newcolor.blue());
+
+ config.writeEntry("keycolor", color, QChar(','));
+
+ key_color_button->setBackgroundColor(newcolor);
+ emit reloadKeyboard();
}
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h
index 07d109c..ae7afe2 100644
--- a/inputmethods/multikey/configdlg.h
+++ b/inputmethods/multikey/configdlg.h
@@ -20,2 +20,3 @@ signals:
void setMapToFile(QString map);
+ void reloadKeyboard();
@@ -27,2 +28,5 @@ private slots:
+ // all those required slots for the color push buttons
+ void keyColorButtonClicked();
+
private:
@@ -37,2 +41,5 @@ private:
+ /* color buttons */
+ QPushButton *key_color_button;
+
};
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index ac3d9be..68918a6 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -51,2 +51,3 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
{
+
// get the default font
@@ -74,2 +75,4 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
+ loadKeyboardColors();
+
keys = new Keys();
@@ -80,2 +83,3 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
}
+
Keyboard::~Keyboard() {
@@ -158,7 +162,2 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
{
- QColor keycolor =
- QColor(240,240,240);
- QColor keycolor_pressed = QColor(171,183,198);
- QColor keycolor_lines = QColor(138,148,160);
- QColor textcolor = QColor(43,54,68);
@@ -184,4 +183,4 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
- if (!pix) {
p.setPen(textcolor);
+ if (!pix)
p.drawText(x, y,
@@ -189,3 +188,2 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
AlignCenter, ((shift || lock) && keys->shift(c)) ? (QChar)keys->shift(c) : (QChar)c);
- }
else
@@ -294,2 +292,4 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
this, SLOT(setMapToFile(QString)));
+ connect(configdlg, SIGNAL(reloadKeyboard()),
+ this, SLOT(reloadKeyboard()));
configdlg->showMaximized();
@@ -550,2 +550,51 @@ void Keyboard::setMapToFile(QString map) {
+/* Keybaord::setColor {{{1 */
+void Keyboard::reloadKeyboard() {
+
+ // reload colors and redraw
+ loadKeyboardColors();
+ repaint();
+
+}
+
+void Keyboard::loadKeyboardColors() {
+
+ Config config ("multikey");
+ config.setGroup("colors");
+
+ QStringList color;
+ color = config.readListEntry("keycolor", QChar(','));
+ if (color.isEmpty()) {
+ color = QStringList::split(",", "240,240,240");
+ config.writeEntry("keycolor", color.join(","));
+
+ }
+ keycolor = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt());
+
+ color = config.readListEntry("keycolor_pressed", QChar(','));
+ if (color.isEmpty()) {
+ color = QStringList::split(",", "171,183,198");
+ config.writeEntry("keycolor_pressed", color.join(","));
+
+ }
+ keycolor_pressed = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt());
+
+ color = config.readListEntry("keycolor_lines", QChar(','));
+ if (color.isEmpty()) {
+ color = QStringList::split(",", "138,148,160");
+ config.writeEntry("keycolor_lines", color.join(","));
+
+ }
+ keycolor_lines = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt());
+
+ color = config.readListEntry("textcolor", QChar(','));
+ if (color.isEmpty()) {
+ color = QStringList::split(",", "43,54,68");
+ config.writeEntry("textcolor", color.join(","));
+
+ }
+ textcolor = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt());
+
+}
+
/* korean input functions {{{1
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index 8c4e666..6e577ab 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -117,2 +117,5 @@ private slots:
+ // used to redraw keyboard after edited colors
+ void reloadKeyboard();
+
private:
@@ -154,2 +157,9 @@ private:
+ /* colors */
+ void loadKeyboardColors();
+ QColor keycolor;
+ QColor keycolor_pressed;
+ QColor keycolor_lines;
+ QColor textcolor;
+
ConfigDlg *configdlg;