2 files changed, 108 insertions, 48 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 9d58383..538bed4 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -8,6 +8,7 @@
 #include <qapplication.h>
 #include <qlayout.h>
 #include <qspinbox.h>
+#include <qlistbox.h>
 #include <qlabel.h>
 #include <qcombobox.h>
 #include <qdir.h>
@@ -20,6 +21,11 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
 
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
 
+    /*
+     * all the saving/loading is now done in a profile. downside is that you cant modify
+     * the keyboard for all profiles, but must do it on a profile-basis
+     *
+
     Config conf("opie-console-keys");
     conf.setGroup("keys");
     for (uint r = 0; r < numRows; r++)
@@ -37,6 +43,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
             );
         }
     //qWarning("loaded %d keys", keys.count());
+    */
     if (keys.isEmpty()) loadDefaults();
 
 
@@ -59,13 +66,6 @@ void FunctionKeyboard::changeCols(int c) {
     repaint(false);
 }
 
-/*
-Key getKey(int row, int col) {
-
-    return keys[ "r" + QString::number(row) + "c" + QString::number(col) ];
-}
-*/
-
 void FunctionKeyboard::paintEvent(QPaintEvent *e) {
 
     QPainter p(this);
@@ -94,12 +94,18 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
             QString handle = "r" + QString::number(r) + "c" + QString::number(c);
             if (keys.contains(handle)) {
 
-                p.drawText(
-                                c * keyWidth + 1, r * keyHeight + 1,
+                if (keys[handle].pixFile.isEmpty())
+                    p.drawText( c * keyWidth + 1, r * keyHeight + 1,
                                 keyWidth, keyHeight,
                                 Qt::AlignHCenter | Qt::AlignVCenter,
                                 keys[handle].label
-                );
+                    );
+                else  {
+
+                    ushort centerX = c *keyWidth + (keyWidth - keys[handle].pix->width()) / 2;
+                    ushort centerY = r * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
+                    p.drawPixmap(centerX, centerY, *keys[handle].pix);
+                }
             }
         }
     }
@@ -112,18 +118,28 @@ void FunctionKeyboard::paintKey(uint row, uint col) {
     p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1),
                      QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)),
                (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
-    p.drawText(
+
+    QString handle ("r" + QString::number(row) + "c" + QString::number(col));
+    if (keys[handle].pixFile.isEmpty())
+        p.drawText(
                     col * keyWidth + 1, row * keyHeight + 1,
                     keyWidth, keyHeight,
                     Qt::AlignHCenter | Qt::AlignVCenter,
-                    keys["r" + QString::number(row) + "c" + QString::number(col)].label
-    );
+                    keys[handle].label
+        );
+    else {
+
+        ushort centerX = col *keyWidth + (keyWidth - keys[handle].pix->width()) / 2;
+        ushort centerY = row * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
+        p.drawPixmap(centerX, centerY, *keys[handle].pix);
+    }
 
-    if (row == numRows) {
+    if (col == numCols - 1) {
 
         // sometimes it doesnt draw the last line
-        p.drawLine((col+1) * keyWidth -2, row * keyHeight,
-                   (col+1) * keyWidth -2, (row + 1) * keyHeight
+
+        p.drawLine((col+1) * keyWidth -1, row * keyHeight,
+                   (col+1) * keyWidth -1, (row + 1) * keyHeight
         );
     }
 
@@ -173,32 +189,37 @@ QSize FunctionKeyboard::sizeHint() const {
 
 void FunctionKeyboard::loadDefaults() {
 
-    /* what keys should be default? 
-    keys.insert( "r0c0", FKey ("F1", 0, 4144, 0));
-    keys.insert( "r0c1", FKey ("F2", 0, 4145, 0));
-    keys.insert( "r0c2", FKey ("F3", 0, 4146, 0));
-    keys.insert( "r0c3", FKey ("F4", 0, 4147, 0));
-    keys.insert( "r0c4", FKey ("F5", 0, 4148, 0));
-    keys.insert( "r0c5", FKey ("F6", 0, 4149, 0));
-    keys.insert( "r0c6", FKey ("F7", 0, 4150, 0));
-    keys.insert( "r0c7", FKey ("F8", 0, 4151, 0));
-    keys.insert( "r0c8", FKey ("F9", 0, 4152, 0));
-    keys.insert( "r0c9", FKey ("F10", 0, 4153, 0));
-    keys.insert( "r0c10", FKey ("F11", 0, 4154, 0));
-
-    keys.insert( "r1c7", FKey ("Ho", 0, 4112, 0));
-    keys.insert( "r1c8", FKey ("End", 0, 4113, 0));
-    keys.insert( "r1c9", FKey ("PU", 0, 4118, 0));
-    keys.insert( "r1c10", FKey ("PD", 0, 4119, 0));
-    */
+    keys.insert( "r0c0", FKey ("Enter", "enter.png", Qt::Key_Enter, 0));
+    keys.insert( "r0c1", FKey ("Space", "space.png", Qt::Key_Space, Qt::Key_Space));
+    keys.insert( "r0c2", FKey ("Tab", "tab.png", Qt::Key_Tab, 0));
+    keys.insert( "r0c3", FKey ("Up", "up.png", Qt::Key_Up, 0));
+    keys.insert( "r0c4", FKey ("Down", "down.png", Qt::Key_Down, 0));
+
+    keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0));
+    keys.insert( "r0c8", FKey ("End", 0, 4113, 0));
+    keys.insert( "r0c9", FKey ("PU", 0, 4118, 0));
+    keys.insert( "r0c10", FKey ("PD", 0, 4119, 0));
+
+    keys.insert( "r1c0", FKey ("F1", 0, 4144, 0));
+    keys.insert( "r1c1", FKey ("F2", 0, 4145, 0));
+    keys.insert( "r1c2", FKey ("F3", 0, 4146, 0));
+    keys.insert( "r1c3", FKey ("F4", 0, 4147, 0));
+    keys.insert( "r1c4", FKey ("F5", 0, 4148, 0));
+    keys.insert( "r1c5", FKey ("F6", 0, 4149, 0));
+    keys.insert( "r1c6", FKey ("F7", 0, 4150, 0));
+    keys.insert( "r1c7", FKey ("F8", 0, 4151, 0));
+    keys.insert( "r1c8", FKey ("F9", 0, 4152, 0));
+    keys.insert( "r1c9", FKey ("F10", 0, 4153, 0));
+    keys.insert( "r1c10", FKey ("F11", 0, 4154, 0));
+
 
 }
 
 /* FunctionKeyboardConfig {{{1 */
 
 FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
-    : ProfileDialogKeyWidget(name, parent, na), 
-    selectedRow(0), selectedCol(0) 
+    : ProfileDialogKeyWidget(name, parent, na),
+      selectedRow(0), selectedCol(0)
 {
     qWarning("FunctionKeyboardConfig");
 
@@ -219,21 +240,30 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
     l = new QLabel("Label", editKey);
     m_labels = new QComboBox(true, editKey);
     m_labels->setInsertionPolicy(QComboBox::AtCurrent);
-    m_labels->insertItem("custom");
+    m_labels->insertItem("");
 
     QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
 
     for (uint i = 0; i < files.count(); i++) {
 
-        m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]));
+        m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]), files[i]);
     }
     connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int)));
     connect (m_labels, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeLabelText(const QString&)));
 
-    l = new QLabel("KeyValue", editKey);
-    m_qvalues = new QComboBox(false, editKey);
-    m_qvalues->setInsertionPolicy(QComboBox::AtCurrent);
-    m_qvalues->insertItem("custom");
+    l = new QLabel("Q Keycode", editKey);
+    m_qvalues = new QComboBox(true, editKey);
+    m_qvalues->setInsertionPolicy(QComboBox::AtTop);
+    m_qvalues->setDuplicatesEnabled(false);
+    m_qvalues->insertItem("");
+    connect (m_qvalues, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeQCode(const QString&)));
+
+    l = new QLabel("Unicode Value", editKey);
+    m_uniValues = new QComboBox(true, editKey);
+    m_uniValues->setInsertionPolicy(QComboBox::AtTop);
+    m_uniValues->setDuplicatesEnabled(false);
+    m_uniValues->insertItem("");
+    connect (m_uniValues, SIGNAL(textChanged(const QString &)), this, SLOT(slotChangeUnicode(const QString&)));
 
     QVBoxLayout *root = new QVBoxLayout(this, 2);
     root->addWidget(kb);
@@ -259,7 +289,12 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
 
                 QStringList l = QStringList::split(QChar('|'), values, TRUE);
                 kb->keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt());
-                //qWarning("loading key... %s %s %s %d %d", values.ascii(), l[0].ascii(), l[1].ascii(), l[2].toInt(), l[3].toInt());
+
+                // load pixmap if used
+                if (!l[1].isEmpty()) {
+
+                    kb->keys[h].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + l[1]);
+                }
             }
         }
 
@@ -298,16 +333,25 @@ void FunctionKeyboardConfig::slotKeyPressed(FKey k, ushort r, ushort c, bool pre
 
     if (!pressed) return;
 
-    selectedRow = r, selectedCol = c;
+    selectedHandle = "r" + QString::number(r) + 
+                     "c" + QString::number(c);
+    selectedRow = r;
+    selectedCol = c;
 
     if (k.pixFile.isEmpty()) {
 
+        m_labels->setEditable(true);
         m_labels->setCurrentItem(0);
         m_labels->changeItem(k.label, 0);
-        m_labels->setEditable(true);
 
+    } else {
+
+        // any better way to select the pixmap?
+        m_labels->setCurrentItem((m_labels->listBox())->index((m_labels->listBox())->findItem(kb->keys[selectedHandle].pixFile)));
+        m_labels->setEditable(false);
     }
     m_qvalues->changeItem(QString::number(k.qcode), 0);
+    m_uniValues->changeItem(QString::number(k.unicode), 0);
 }
 void FunctionKeyboardConfig::slotChangeIcon(int index) {
 
@@ -318,16 +362,29 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
         // why tf does the text get erased unless i do this?
         m_labels->changeItem(m_labels->text(0), 0); 
 
+        kb->keys[selectedHandle].pixFile = "";
+        delete kb->keys[selectedHandle].pix;
+
     } else {
 
         // is a pixmap
         m_labels->setEditable(false);
+        kb->keys[selectedHandle].pixFile = m_labels->currentText();
+        kb->keys[selectedHandle].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + m_labels->currentText());
     }
+    kb->paintKey(selectedRow, selectedCol);
 }
 void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) {
 
-    kb->keys["r" + QString::number(selectedRow) + 
-             "c" + QString::number(selectedCol)].label = label;
+    kb->keys[selectedHandle].label = label;
 
     kb->paintKey(selectedRow, selectedCol);
 }
+void FunctionKeyboardConfig::slotChangeQCode(const QString& qcode) {
+
+    kb->keys[selectedHandle].qcode = qcode.toUInt();
+}
+void FunctionKeyboardConfig::slotChangeUnicode(const QString& uni) {
+
+    kb->keys[selectedHandle].unicode = uni.toUInt();
+}
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index 496d932..7f313d6 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -98,14 +98,17 @@ private slots:
     void slotChangeCols(int);
     void slotChangeIcon(int);
     void slotChangeLabelText(const QString &);
+    void slotChangeQCode(const QString &);
+    void slotChangeUnicode(const QString &);
 
 private:
 
+    QString selectedHandle;
     ushort selectedRow, selectedCol;
 
     FunctionKeyboard *kb;
     QSpinBox *m_rowBox, *m_colBox;
-    QComboBox *m_labels, *m_qvalues;
+    QComboBox *m_labels, *m_qvalues, *m_uniValues;
 
 };