1 files changed, 86 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 100fdfc..977a384 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -1,12 +1,21 @@
 #include "function_keyboard.h"
+
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
 #include <qsizepolicy.h>
 #include <qevent.h>
 #include <qwindowsystem_qws.h>
 #include <qapplication.h>
 #include <qlayout.h>
+#include <qspinbox.h>
+#include <qlabel.h>
+#include <qcombobox.h>
+#include <qdir.h>
+
+/* FunctionKeyboard {{{1 */
 
 FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
     QFrame(parent), numRows(2), numCols(11),
     pressedRow(0), pressedCol(0) {
 
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
@@ -35,12 +44,24 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
 }
 
 FunctionKeyboard::~FunctionKeyboard() {
 
 }
 
+void FunctionKeyboard::changeRows(int r) {
+
+    numRows = r;
+    repaint(false);
+}
+void FunctionKeyboard::changeCols(int c) {
+
+    numCols = c;
+    keyWidth = (double)width()/numCols; // have to reset this thing too
+    repaint(false);
+}
+
 void FunctionKeyboard::paintEvent(QPaintEvent *e) {
 
     QPainter p(this);
     p.setClipRect(e->rect());
     p.fillRect(0, 0, width(), height(), QColor(255,255,255));
 
@@ -88,37 +109,45 @@ void FunctionKeyboard::paintKey(int row, int col) {
                     col * keyWidth + 1, row * keyHeight + 1,
                     keyWidth, keyHeight,
                     Qt::AlignHCenter | Qt::AlignVCenter,
                     keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
     );
 
+    if (row == numRows) {
+
+        // sometimes it doesnt draw the last line
+        p.drawLine((col+1) * keyWidth -2, row * keyHeight, 
+                   (col+1) * keyWidth -2, (row + 1) * keyHeight
+        );
+    }
+
 }
 
 void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
 
     pressedRow = e->y() / keyHeight;
     pressedCol = (int) (e->x() / keyWidth);
 
     paintKey(pressedRow, pressedCol);
 
     // emit that sucker!
     FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)];
-    emit keyPressed(k.getU(), k.getQ(), 0, 1, 0);
+    emit keyPressed(k.getU(), k.getQ(), 0, 1, 0, pressedRow, pressedCol);
 
 }
 
 void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
 
     if (pressedRow != -1 && pressedRow != -1) {
 
         int row = pressedRow; pressedRow = -1;
         int col = pressedCol; pressedCol = -1;
         paintKey(row, col);
 
         FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)];
-        emit keyPressed(k.getU(), k.getQ(), 0, 0, 0);
+        emit keyPressed(k.getU(), k.getQ(), 0, 0, 0, pressedRow, pressedCol);
     }
 
 }
 
 
 void FunctionKeyboard::resizeEvent(QResizeEvent*) {
@@ -154,29 +183,80 @@ void FunctionKeyboard::loadDefaults() {
     keys.insert( "r1c8", FKey ("End", 4113, 0));
     keys.insert( "r1c9", FKey ("PU", 4118, 0));
     keys.insert( "r1c10", FKey ("PD", 4119, 0));
 
 }
 
+/* FunctionKeyboardConfig {{{1 */
 
 FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
     ProfileDialogKeyWidget(name, parent) {
 
 
-    FunctionKeyboard *kb = new FunctionKeyboard(this);
+    kb = new FunctionKeyboard(this);
+
     QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this);
-    QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit"), this);
+    QLabel *l = new QLabel("Rows", dimentions);
+    QSpinBox *m_rowBox = new QSpinBox(1, 15, 1, dimentions);
+    connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int)));
+    l = new QLabel("Columns", dimentions);
+    m_colBox = new QSpinBox(1, 15, 1, dimentions);
+    connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int)));
+
+    QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this);
+    l = new QLabel("Label", editKey);
+    /*
+    m_labels = new QComboBox(false, editKey);
+    labels->insertItem("text");
+
+    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]));
+    }
+    connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int)));
+    */
 
     QVBoxLayout *root = new QVBoxLayout(this, 2);
     root->addWidget(kb);
     root->addWidget(dimentions);
     root->addWidget(editKey);
 }
 FunctionKeyboardConfig::~FunctionKeyboardConfig() {
 
 }
-void FunctionKeyboardConfig::load (const Profile& ) {
+void FunctionKeyboardConfig::load (const Profile& prof) {
+    int i = prof.readNumEntry("keb_rows", 1);
+    //m_rowBox->setValue(i);
+}
+void FunctionKeyboardConfig::save (Profile& prof) {
+
+    //prof.writeEntry("keb_rows", m_rowBox->value());
+
+}
+void FunctionKeyboardConfig::slotChangeRows(int r) {
+
+    kb->changeRows(r);
+
+    // have to do this so the whole thing gets redrawn
+    kb->hide(); kb->show();
+}
+void FunctionKeyboardConfig::slotChangeCols(int c) {
+
+    kb->changeCols(c);
+}
+void FunctionKeyboardConfig::slotKeyPressed(ushort, ushort, bool, bool, bool, ushort row, ushort col) {
 
 }
-void FunctionKeyboardConfig::save (Profile& ) {
+void FunctionKeyboardConfig::slotChangeIcon(int index) {
 
+    if (index == 0) {
+
+        // is text
+        //if(!labels->editable()) labels->setEditable(true);
+    } else {
+
+        // is a pixmap
+        //if (labels->editable()) labels->setEditable(false);
+    }
 }