| -rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 43 | ||||
| -rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 9 | ||||
| -rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 2 |
3 files changed, 31 insertions, 23 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index ac35d1c..4119ad4 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp @@ -2,13 +2,13 @@ #include <qsizepolicy.h> #include <qevent.h> #include <qwindowsystem_qws.h> #include <qapplication.h> FunctionKeyboard::FunctionKeyboard(QWidget *parent) : - QFrame(parent), numRows(1), numCols(11), + QFrame(parent), numRows(2), numCols(11), pressedRow(0), pressedCol(0) { setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); Config conf("opie-console-keys"); conf.setGroup("keys"); @@ -23,13 +23,14 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : keys.insert( handle, FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort()) ); } - qWarning("loaded %d keys", keys.count()); + //qWarning("loaded %d keys", keys.count()); + if (keys.isEmpty()) loadDefaults(); } FunctionKeyboard::~FunctionKeyboard() { @@ -98,21 +99,12 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) { 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); - /* - * - QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 1, 0); - qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 1, 0); - qwsServer->sendKeyEvent(0x41, 0, 0, 1, 0); - - QKeyEvent ke(QEvent::KeyPress, k.getQ(), k.getU(), 0); - QApplication::sendEvent((QObject *)parent, &ke); - */ } void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) { if (pressedRow != -1 && pressedRow != -1) { @@ -120,20 +112,12 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) { 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); - - /* - QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0); - qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0); - - QKeyEvent ke(QEvent::KeyRelease, k.getQ(), k.getU(), 0); - QApplication::sendEvent((QObject *)parent, &ke); - */ } } void FunctionKeyboard::resizeEvent(QResizeEvent*) { @@ -147,6 +131,27 @@ void FunctionKeyboard::resizeEvent(QResizeEvent*) { 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)); + +} diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index b8420ae..8d05e2b 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h @@ -14,12 +14,13 @@ public: 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; } + private: QString label; ushort qcode; ushort unicode; }; @@ -33,23 +34,25 @@ public: 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); private: + void loadDefaults(); + + +private: + // thie key for the map is the row/col QMap<QString, FKey> keys; uint numRows; uint numCols; uint keyHeight; diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 5900785..0c89620 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -158,13 +158,13 @@ void MainWindow::initUI() { connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript())); /* * action that open/closes the keyboard */ m_openKeys = new QAction (tr("Open Keyboard..."), - Resource::loadPixmap( "down" ), + Resource::loadPixmap( "console/keyboard_icon.png" ), QString::null, 0, this, 0); m_openKeys->setToggleAction(true); connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); |