Diffstat (limited to 'noncore/apps/opie-console/function_keyboard.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 43 |
1 files changed, 24 insertions, 19 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 | |||
@@ -7,3 +7,3 @@ | |||
7 | FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | 7 | FunctionKeyboard::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) { |
@@ -28,3 +28,4 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | |||
28 | } | 28 | } |
29 | qWarning("loaded %d keys", keys.count()); | 29 | //qWarning("loaded %d keys", keys.count()); |
30 | if (keys.isEmpty()) loadDefaults(); | ||
30 | 31 | ||
@@ -103,11 +104,2 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) { | |||
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 | ||
@@ -125,10 +117,2 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) { | |||
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 | } |
@@ -152 +136,22 @@ QSize FunctionKeyboard::sizeHint() const { | |||
152 | 136 | ||
137 | void 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 | } | ||