summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp43
-rw-r--r--noncore/apps/opie-console/function_keyboard.h9
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp2
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
@@ -5,7 +5,7 @@
5#include <qapplication.h> 5#include <qapplication.h>
6 6
7FunctionKeyboard::FunctionKeyboard(QWidget *parent) : 7FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
8 QFrame(parent), numRows(1), numCols(11), 8 QFrame(parent), numRows(2), numCols(11),
9 pressedRow(0), pressedCol(0) { 9 pressedRow(0), pressedCol(0) {
10 10
11 setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); 11 setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
@@ -26,7 +26,8 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
26 FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort()) 26 FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort())
27 ); 27 );
28 } 28 }
29 qWarning("loaded %d keys", keys.count()); 29 //qWarning("loaded %d keys", keys.count());
30 if (keys.isEmpty()) loadDefaults();
30 31
31 32
32 33
@@ -101,15 +102,6 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
101 // emit that sucker! 102 // emit that sucker!
102 FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)]; 103 FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)];
103 emit keyPressed(k.getU(), k.getQ(), 0, 1, 0); 104 emit keyPressed(k.getU(), k.getQ(), 0, 1, 0);
104 /*
105 *
106 QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 1, 0);
107 qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 1, 0);
108 qwsServer->sendKeyEvent(0x41, 0, 0, 1, 0);
109
110 QKeyEvent ke(QEvent::KeyPress, k.getQ(), k.getU(), 0);
111 QApplication::sendEvent((QObject *)parent, &ke);
112 */
113 105
114} 106}
115 107
@@ -123,14 +115,6 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
123 115
124 FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)]; 116 FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)];
125 emit keyPressed(k.getU(), k.getQ(), 0, 0, 0); 117 emit keyPressed(k.getU(), k.getQ(), 0, 0, 0);
126
127 /*
128 QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0);
129 qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0);
130
131 QKeyEvent ke(QEvent::KeyRelease, k.getQ(), k.getU(), 0);
132 QApplication::sendEvent((QObject *)parent, &ke);
133 */
134 } 118 }
135 119
136} 120}
@@ -150,3 +134,24 @@ QSize FunctionKeyboard::sizeHint() const {
150 return QSize(width(), keyHeight * numRows + 1); 134 return QSize(width(), keyHeight * numRows + 1);
151} 135}
152 136
137void FunctionKeyboard::loadDefaults() {
138
139 /* what keys should be default? */
140 keys.insert( "r0c0", FKey ("F1", 4144, 0));
141 keys.insert( "r0c1", FKey ("F2", 4145, 0));
142 keys.insert( "r0c2", FKey ("F3", 4145, 0));
143 keys.insert( "r0c3", FKey ("F4", 4146, 0));
144 keys.insert( "r0c4", FKey ("F5", 4147, 0));
145 keys.insert( "r0c5", FKey ("F6", 4148, 0));
146 keys.insert( "r0c6", FKey ("F7", 4149, 0));
147 keys.insert( "r0c7", FKey ("F8", 4150, 0));
148 keys.insert( "r0c8", FKey ("F9", 4151, 0));
149 keys.insert( "r0c9", FKey ("F10", 4152, 0));
150 keys.insert( "r0c10", FKey ("F11", 4153, 0));
151
152 keys.insert( "r1c7", FKey ("Ho", 4112, 0));
153 keys.insert( "r1c8", FKey ("End", 4113, 0));
154 keys.insert( "r1c9", FKey ("PU", 4118, 0));
155 keys.insert( "r1c10", FKey ("PD", 4119, 0));
156
157}
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
@@ -17,6 +17,7 @@ public:
17 ushort getQ() { return qcode; } 17 ushort getQ() { return qcode; }
18 ushort getU() { return unicode; } 18 ushort getU() { return unicode; }
19 19
20
20private: 21private:
21 22
22 QString label; 23 QString label;
@@ -36,9 +37,6 @@ public:
36 void mousePressEvent(QMouseEvent*); 37 void mousePressEvent(QMouseEvent*);
37 void mouseReleaseEvent(QMouseEvent*); 38 void mouseReleaseEvent(QMouseEvent*);
38 void resizeEvent(QResizeEvent*); 39 void resizeEvent(QResizeEvent*);
39
40
41
42 QSize sizeHint() const; 40 QSize sizeHint() const;
43 41
44signals: 42signals:
@@ -47,6 +45,11 @@ signals:
47 45
48private: 46private:
49 47
48 void loadDefaults();
49
50
51private:
52
50 // thie key for the map is the row/col 53 // thie key for the map is the row/col
51 QMap<QString, FKey> keys; 54 QMap<QString, FKey> keys;
52 55
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
@@ -161,7 +161,7 @@ void MainWindow::initUI() {
161 * action that open/closes the keyboard 161 * action that open/closes the keyboard
162 */ 162 */
163 m_openKeys = new QAction (tr("Open Keyboard..."), 163 m_openKeys = new QAction (tr("Open Keyboard..."),
164 Resource::loadPixmap( "down" ), 164 Resource::loadPixmap( "console/keyboard_icon.png" ),
165 QString::null, 0, this, 0); 165 QString::null, 0, this, 0);
166 166
167 m_openKeys->setToggleAction(true); 167 m_openKeys->setToggleAction(true);