4 files changed, 137 insertions, 52 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index b2f1c78..71cdea8 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -30,13 +30,13 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
 
             if (value_list.isEmpty()) continue;
 
             keys.insert(
 
                  handle,
-                 FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort())
+                 FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort())
             );
         }
     //qWarning("loaded %d keys", keys.count());
     if (keys.isEmpty()) loadDefaults();
 
 
@@ -56,12 +56,19 @@ void FunctionKeyboard::changeCols(int c) {
 
     numCols = c;
     keyWidth = (double)width()/numCols; // have to reset this thing too
     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);
     p.setClipRect(e->rect());
     p.fillRect(0, 0, width(), height(), QColor(255,255,255));
 
@@ -88,31 +95,31 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
             if (keys.contains(handle)) {
 
                 p.drawText(
                                 c * keyWidth + 1, r * keyHeight + 1,
                                 keyWidth, keyHeight,
                                 Qt::AlignHCenter | Qt::AlignVCenter,
-                                keys[handle].getL()
+                                keys[handle].label
                 );
             }
         }
     }
 }
 
-void FunctionKeyboard::paintKey(int row, int col) {
+void FunctionKeyboard::paintKey(uint row, uint 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()
+                    keys["r" + QString::number(row) + "c" + QString::number(col)].label
     );
 
     if (row == numRows) {
 
         // sometimes it doesnt draw the last line
         p.drawLine((col+1) * keyWidth -2, row * keyHeight,
@@ -128,26 +135,26 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
     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, pressedRow, pressedCol);
+    emit keyPressed(k, pressedRow, pressedCol, 1);
 
 }
 
 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, pressedRow, pressedCol);
+        emit keyPressed(k, row, col, 0);
     }
 
 }
 
 
 void FunctionKeyboard::resizeEvent(QResizeEvent*) {
@@ -163,79 +170,125 @@ QSize FunctionKeyboard::sizeHint() const {
 
     return QSize(width(), keyHeight * numRows + 1);
 }
 
 void FunctionKeyboard::loadDefaults() {
 
-    /* what keys should be default? */
-    keys.insert( "r0c0", FKey ("F1", 4144, 0));
-    keys.insert( "r0c1", FKey ("F2", 4145, 0));
-    keys.insert( "r0c2", FKey ("F3", 4145, 0));
-    keys.insert( "r0c3", FKey ("F4", 4146, 0));
-    keys.insert( "r0c4", FKey ("F5", 4147, 0));
-    keys.insert( "r0c5", FKey ("F6", 4148, 0));
-    keys.insert( "r0c6", FKey ("F7", 4149, 0));
-    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));
+    /* 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));
+    */
 
 }
 
 /* FunctionKeyboardConfig {{{1 */
 
+<<<<<<< function_keyboard.cpp
+FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
+    ProfileDialogKeyWidget(name, parent),
+    selectedRow(0), selectedCol(0) 
+{
+=======
 FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
     : ProfileDialogKeyWidget(name, parent, na) {
     qWarning("FunctionKeyboardConfig");
+>>>>>>> 1.11
 
 
     kb = new FunctionKeyboard(this);
+    connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), 
+             this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool)));
 
     QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this);
     QLabel *l = new QLabel("Rows", dimentions);
     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");
+    m_labels = new QComboBox(true, editKey);
+    m_labels->setInsertionPolicy(QComboBox::AtCurrent);
+    m_labels->insertItem("custom");
 
     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)));
-    */
+    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");
 
     QVBoxLayout *root = new QVBoxLayout(this, 2);
     root->addWidget(kb);
     root->addWidget(dimentions);
     root->addWidget(editKey);
 }
 FunctionKeyboardConfig::~FunctionKeyboardConfig() {
 
 }
 void FunctionKeyboardConfig::load (const Profile& prof) {
-    //int i = prof.readNumEntry("keb_rows", 1);
-    m_rowBox->setValue( 2 );
+
+    m_rowBox->setValue(prof.readNumEntry("keb_rows", 2));
+    m_colBox->setValue(prof.readNumEntry("keb_cols", 10));
+
+    /* load all the keys to the keyboard */
+    for (int i = 0; i <= m_rowBox->value() -1; i++) 
+        for (int j = 0; j <= m_colBox->value() -1; j++) {
+
+            QString h = "r" + QString::number(i) + "c" + QString::number(j);
+            QString values = prof.readEntry("keb_" + h);
+
+            if (!values.isEmpty()) {
+
+                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());
+            }
+        }
+
 }
 void FunctionKeyboardConfig::save (Profile& prof) {
 
     prof.writeEntry("keb_rows", m_rowBox->value());
+    prof.writeEntry("keb_cols", m_colBox->value());
+
+    QMap<QString, FKey>::Iterator it;
+    for ( it = kb->keys.begin(); it != kb->keys.end(); it++) {
+
+        FKey k = it.data();
+        QString entry = k.label + "|"  
+                        + k.pixFile + "|" 
+                        + QString::number(k.qcode) + "|" 
+                        + QString::number(k.unicode);
+
+        prof.writeEntry("keb_" + it.key(), entry);
+
+    }
 
 }
 void FunctionKeyboardConfig::slotChangeRows(int r) {
 
     kb->changeRows(r);
 
@@ -243,21 +296,43 @@ void FunctionKeyboardConfig::slotChangeRows(int r) {
     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::slotKeyPressed(FKey k, ushort r, ushort c, bool pressed) {
+
+    if (!pressed) return;
+
+    selectedRow = r, selectedCol = c;
 
+    if (k.pixFile.isEmpty()) {
+
+        m_labels->setCurrentItem(0);
+        m_labels->changeItem(k.label, 0);
+        m_labels->setEditable(true);
+
+    }
+    m_qvalues->changeItem(QString::number(k.qcode), 0);
 }
 void FunctionKeyboardConfig::slotChangeIcon(int index) {
 
     if (index == 0) {
 
         // is text
-        //if(!labels->editable()) labels->setEditable(true);
+        m_labels->setEditable(true);
+        // why tf does the text get erased unless i do this?
+        m_labels->changeItem(m_labels->text(0), 0); 
+
     } else {
 
         // is a pixmap
-        //if (labels->editable()) labels->setEditable(false);
+        m_labels->setEditable(false);
     }
 }
+void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) {
+
+    kb->keys["r" + QString::number(selectedRow) + 
+             "c" + QString::number(selectedCol)].label = label;
+
+    kb->paintKey(selectedRow, selectedCol);
+}
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index 05b991d..496d932 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -1,59 +1,65 @@
 #ifndef OPIE_FUNCTION_KEYBOARD_H
 #define OPIE_FUNCTION_KEYBOARD_H
 
 #include <qpe/config.h>
+#include <qpe/qpeapplication.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:
+struct FKey {
 
     FKey(): qcode(0), unicode(0) {};
-    FKey(const QString &l, ushort q, ushort u): label(l), qcode(q), unicode(u) {};
+    FKey(const QString &l, const QString &f, ushort q, ushort u): 
+            label(l), pixFile(f), qcode(q), unicode(u) {
+            
+        if (!f.isEmpty()) {
 
-    QString getL() { return label; }
-    ushort getQ() { return qcode; }
-    ushort getU() { return unicode; }
+            pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f);
 
-
-private:
+        }
+    };
 
     QString label;
+    QPixmap *pix;
+    QString pixFile;
     ushort qcode;
     ushort unicode;
 };
 
 class FunctionKeyboard : public QFrame {
     Q_OBJECT
 
 public:
     FunctionKeyboard(QWidget *parent = 0);
     ~FunctionKeyboard();
 
+    friend class FunctionKeyboardConfig;
+
     void changeRows(int);
     void changeCols(int);
 
+    //Key getKey(int, int);
+
     void paintEvent(QPaintEvent *);
-    void paintKey(int, int);
+    void paintKey(uint, uint);
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     QSize sizeHint() const;
 
 signals:
 
-    void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+    void keyPressed(FKey, ushort, ushort, bool);
 
 private:
 
     void loadDefaults();
 
 
@@ -84,20 +90,23 @@ public:
 
     void load(const Profile&);
     void save(Profile&);
 
 private slots:
 
-    void slotKeyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+    void slotKeyPressed(FKey, ushort, ushort, bool);
     void slotChangeRows(int);
     void slotChangeCols(int);
     void slotChangeIcon(int);
+    void slotChangeLabelText(const QString &);
 
 private:
 
+    ushort selectedRow, selectedCol;
+
     FunctionKeyboard *kb;
     QSpinBox *m_rowBox, *m_colBox;
-    QComboBox *m_labels;
+    QComboBox *m_labels, *m_qvalues;
 
 };
 
 #endif
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index c1020fa..8e529a3 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -205,23 +205,25 @@ void MainWindow::initUI() {
     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, ushort, ushort)),
-            this, SLOT(slotKeyReceived(ushort, ushort, bool, bool, bool, ushort, ushort)));
+    connect(m_kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),
+            this, SLOT(slotKeyReceived(FKey, ushort, ushort, bool)));
 
     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 );
     m_disconnect->setEnabled( false );
     m_terminate->setEnabled( false );
     m_transfer->setEnabled( false );
@@ -517,24 +519,22 @@ void MainWindow::slotFullscreen() {
     }
 
     m_isFullscreen = !m_isFullscreen;
 }
 
 
-void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) {
-
-    //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released");
+void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
 
     if ( m_curSession ) {
 
         QEvent::Type state;
 
         if (pressed) state = QEvent::KeyPress;
         else state = QEvent::KeyRelease;
 
-        QKeyEvent ke(state, q, u, 0, QString(QChar(u)));
+        QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
 
         // where should i send this event? doesnt work sending it here
         QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
         ke.ignore();
     }
 }
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 68f6fa8..0f52e76 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -17,12 +17,13 @@ class QMenuBar;
 class QAction;
 class MetaFactory;
 class TabWidget;
 class ProfileManager;
 class Profile;
 class FunctionKeyboard;
+class FKey;
 class QuickButton;
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
@@ -64,13 +65,13 @@ private slots:
     void slotOpenButtons(bool);
     void slotRecordScript();
     void slotSaveScript();
     void slotRunScript();
     void slotFullscreen();
     void slotSessionChanged( Session* );
-    void slotKeyReceived(ushort, ushort, bool, bool, bool, ushort,  ushort);
+    void slotKeyReceived(FKey, ushort, ushort, bool);
 
 private:
     void initUI();
     void populateProfiles();
     void create( const Profile& );
     /**