still a work in progress

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
@@ -35,3 +35,3 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
                  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())
             );
@@ -61,2 +61,9 @@ void FunctionKeyboard::changeCols(int c) {
 
+/*
+Key getKey(int row, int col) {
+
+    return keys[ "r" + QString::number(row) + "c" + QString::number(col) ];
+}
+*/
+
 void FunctionKeyboard::paintEvent(QPaintEvent *e) {
@@ -93,3 +100,3 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
                                 Qt::AlignHCenter | Qt::AlignVCenter,
-                                keys[handle].getL()
+                                keys[handle].label
                 );
@@ -100,3 +107,3 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
 
-void FunctionKeyboard::paintKey(int row, int col) {
+void FunctionKeyboard::paintKey(uint row, uint col) {
 
@@ -111,3 +118,3 @@ void FunctionKeyboard::paintKey(int row, int col) {
                     Qt::AlignHCenter | Qt::AlignVCenter,
-                    keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
+                    keys["r" + QString::number(row) + "c" + QString::number(col)].label
     );
@@ -133,3 +140,3 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
     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);
 
@@ -146,3 +153,3 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
         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);
     }
@@ -168,19 +175,20 @@ 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));
+    */
 
@@ -190,2 +198,8 @@ void FunctionKeyboard::loadDefaults() {
 
+<<<<<<< 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 )
@@ -193,2 +207,3 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
     qWarning("FunctionKeyboardConfig");
+>>>>>>> 1.11
 
@@ -196,2 +211,4 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
     kb = new FunctionKeyboard(this);
+    connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), 
+             this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool)));
 
@@ -207,5 +224,5 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
     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");
 
@@ -218,3 +235,8 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
     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");
 
@@ -229,4 +251,21 @@ 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());
+            }
+        }
+
 }
@@ -235,2 +274,16 @@ 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);
+
+    }
 
@@ -248,4 +301,16 @@ void FunctionKeyboardConfig::slotChangeCols(int 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);
 }
@@ -256,3 +321,6 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
         // 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 {
@@ -260,4 +328,11 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
         // 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
@@ -4,2 +4,3 @@
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 #include <qframe.h>
@@ -14,17 +15,18 @@
 
-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;
@@ -40,2 +42,4 @@ public:
 
+    friend class FunctionKeyboardConfig;
+
     void changeRows(int);
@@ -43,4 +47,6 @@ public:
 
+    //Key getKey(int, int);
+
     void paintEvent(QPaintEvent *);
-    void paintKey(int, int);
+    void paintKey(uint, uint);
     void mousePressEvent(QMouseEvent*);
@@ -52,3 +58,3 @@ signals:
 
-    void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+    void keyPressed(FKey, ushort, ushort, bool);
 
@@ -89,3 +95,3 @@ private slots:
 
-    void slotKeyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
+    void slotKeyPressed(FKey, ushort, ushort, bool);
     void slotChangeRows(int);
@@ -93,2 +99,3 @@ private slots:
     void slotChangeIcon(int);
+    void slotChangeLabelText(const QString &);
 
@@ -96,5 +103,7 @@ private:
 
+    ushort selectedRow, selectedCol;
+
     FunctionKeyboard *kb;
     QSpinBox *m_rowBox, *m_colBox;
-    QComboBox *m_labels;
+    QComboBox *m_labels, *m_qvalues;
 
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
@@ -210,4 +210,4 @@ void MainWindow::initUI() {
     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)));
 
@@ -218,2 +218,3 @@ void MainWindow::initUI() {
 
+    /*
     m_qb = new QuickButton( m_buttonBar );
@@ -221,2 +222,3 @@ void MainWindow::initUI() {
             this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) );
+    */
 
@@ -522,5 +524,3 @@ void MainWindow::slotFullscreen() {
 
-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) {
 
@@ -533,3 +533,3 @@ void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, u
 
-        QKeyEvent ke(state, q, u, 0, QString(QChar(u)));
+        QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
 
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
@@ -22,2 +22,3 @@ class Profile;
 class FunctionKeyboard;
+class FKey;
 class QuickButton;
@@ -69,3 +70,3 @@ private slots:
     void slotSessionChanged( Session* );
-    void slotKeyReceived(ushort, ushort, bool, bool, bool, ushort,  ushort);
+    void slotKeyReceived(FKey, ushort, ushort, bool);