4 files changed, 108 insertions, 11 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,18 +1,27 @@
 #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));
 
     Config conf("opie-console-keys");
     conf.setGroup("keys");
     for (uint r = 0; r < numRows; r++)
         for (uint c = 0; c < numCols; c++) {
 
@@ -29,24 +38,36 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
         }
     //qWarning("loaded %d keys", keys.count());
     if (keys.isEmpty()) loadDefaults();
 
 
 
 }
 
 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));
 
     p.setPen(QColor(0,0,0));
 
     /* those decimals do count! becomes short if use plain int */
     for (double i = 0; i <= width(); i += keyWidth) {
 
         p.drawLine((int)i, 0, (int)i, height());
@@ -82,49 +103,57 @@ void FunctionKeyboard::paintKey(int row, int col) {
     QPainter p(this);
 
     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(
                     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*) {
 
     /* set he default font height/width */
     QFontMetrics fm=fontMetrics();
     keyHeight = fm.lineSpacing() + 2;
     keyWidth = (double)width()/numCols;
 
@@ -148,35 +177,86 @@ void FunctionKeyboard::loadDefaults() {
     keys.insert( "r0c7", FKey ("F8", 4150, 0));
     keys.insert( "r0c8", FKey ("F9", 4151, 0));
     keys.insert( "r0c9", FKey ("F10", 4152, 0));
     keys.insert( "r0c10", FKey ("F11", 4153, 0));
 
     keys.insert( "r1c7", FKey ("Ho", 4112, 0));
     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);
+    }
 }
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index 2be74b4..efeff6d 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -1,23 +1,26 @@
 #ifndef OPIE_FUNCTION_KEYBOARD_H
 #define OPIE_FUNCTION_KEYBOARD_H
 
 #include <qpe/config.h>
 #include <qframe.h>
 #include <qpainter.h>
 #include <qvbox.h>
 #include <qgroupbox.h>
 #include <qmap.h>
+#include <qspinbox.h>
+#include <qcombobox.h>
 #include "profiledialogwidget.h"
 
+
 class FKey {
 
 public:
 
     FKey(): qcode(0), unicode(0) {};
     FKey(const QString &l, ushort q, ushort u): label(l), qcode(q), unicode(u) {};
 
     QString getL() { return label; }
     ushort getQ() { return qcode; }
     ushort getU() { return unicode; }
 
 
@@ -26,34 +29,37 @@ private:
     QString label;
     ushort qcode;
     ushort unicode;
 };
 
 class FunctionKeyboard : public QFrame {
     Q_OBJECT
 
 public:
     FunctionKeyboard(QWidget *parent = 0);
     ~FunctionKeyboard();
 
+    void changeRows(int);
+    void changeCols(int);
+
     void paintEvent(QPaintEvent *);
     void paintKey(int, int);
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     QSize sizeHint() const;
 
 signals:
 
-    void keyPressed(ushort, ushort, bool, bool, bool);
+    void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
 
 private:
 
     void loadDefaults();
 
 
 private:
 
     // thie key for the map is the row/col
     QMap<QString, FKey> keys;
 
     uint numRows;
@@ -67,17 +73,28 @@ private:
 
 };
 
 class FunctionKeyboardConfig : public ProfileDialogKeyWidget {
     Q_OBJECT
 public:
     FunctionKeyboardConfig(const QString& name, QWidget *wid);
     ~FunctionKeyboardConfig();
 
     void load(const Profile&);
     void save(Profile&);
 
+private slots:
+
+    void slotKeyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+    void slotChangeRows(int);
+    void slotChangeCols(int);
+    void slotChangeIcon(int);
+
 private:
 
+    FunctionKeyboard *kb;
+    QSpinBox *m_rowBox, *m_colBox;
+    QComboBox *m_labels;
+
 };
 
 #endif
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 89f3516..30dd21c 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -199,26 +199,26 @@ void MainWindow::initUI() {
     m_bar->insertItem( tr("Scripts"), m_scripts );
 
     /* the settings menu */
     // m_bar->insertItem( tr("Settings"), m_settings );
 
     /* and the keyboard */
     m_keyBar = new QToolBar(this);
     addToolBar( m_keyBar,  "Keyboard", QMainWindow::Top, TRUE );
     m_keyBar->setHorizontalStretchable( TRUE );
     m_keyBar->hide();
 
     m_kb = new FunctionKeyboard(m_keyBar);
-    connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool)),
-            this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool)));
+    connect(m_kb, SIGNAL(keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort)),
+            this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort)));
 
     m_buttonBar = new QToolBar( this );
     addToolBar( m_buttonBar, "Buttons",  QMainWindow::Top, TRUE );
     m_buttonBar->setHorizontalStretchable( TRUE );
     m_buttonBar->hide();
 
     m_qb = new QuickButton( m_buttonBar );
     connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ),
             this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) );
 
 
     m_connect->setEnabled( false );
@@ -514,25 +514,25 @@ void MainWindow::slotFullscreen() {
         ( m_curSession->widgetStack() )->setFocus();
         ( m_curSession->widgetStack() )->show();
 
         ( ( m_curSession->emulationHandler() )->cornerButton() )->show();
 
         connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
     }
 
     m_isFullscreen = !m_isFullscreen;
 }
 
 
-void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool) {
+void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) {
 
     //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released");
 
     if ( m_curSession ) {
 
         QEvent::Type state;
 
         if (pressed) state = QEvent::KeyPress;
         else state = QEvent::KeyRelease;
 
         QKeyEvent ke(state, q, u, 0, QString(QChar(u)));
 
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index cc4ef76..68f6fa8 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -58,25 +58,25 @@ private slots:
     void slotTerminate();
     void slotConfigure();
     void slotClose();
     void slotProfile(int);
     void slotTransfer();
     void slotOpenKeb(bool);
     void slotOpenButtons(bool);
     void slotRecordScript();
     void slotSaveScript();
     void slotRunScript();
     void slotFullscreen();
     void slotSessionChanged( Session* );
-    void slotKeyReceived(ushort, ushort, bool, bool, bool);
+    void slotKeyReceived(ushort, ushort, bool, bool, bool, ushort,  ushort);
 
 private:
     void initUI();
     void populateProfiles();
     void create( const Profile& );
     /**
      * the current session
      */
     Session* m_curSession;
 
     /**
      * the session list