author | hash <hash> | 2002-10-31 18:18:41 (UTC) |
---|---|---|
committer | hash <hash> | 2002-10-31 18:18:41 (UTC) |
commit | 1004c5930b3dfdb37e4d8ea2e143b4a3d0246f7a (patch) (unidiff) | |
tree | 50ca8adbad6632d8f6dbd2846b2e4cae47928b8f | |
parent | f567e3bfc77cf2c28f0b195ed5f7a4ae5b9610d4 (diff) | |
download | opie-1004c5930b3dfdb37e4d8ea2e143b4a3d0246f7a.zip opie-1004c5930b3dfdb37e4d8ea2e143b4a3d0246f7a.tar.gz opie-1004c5930b3dfdb37e4d8ea2e143b4a3d0246f7a.tar.bz2 |
added esc and F12 in default configuration
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 5f3b5ec..e7f3c21 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -1,33 +1,33 @@ | |||
1 | #include "function_keyboard.h" | 1 | #include "function_keyboard.h" |
2 | 2 | ||
3 | #include <qpe/resource.h> | 3 | #include <qpe/resource.h> |
4 | #include <qpe/qpeapplication.h> | 4 | #include <qpe/qpeapplication.h> |
5 | #include <qsizepolicy.h> | 5 | #include <qsizepolicy.h> |
6 | #include <qevent.h> | 6 | #include <qevent.h> |
7 | #include <qwindowsystem_qws.h> | 7 | #include <qwindowsystem_qws.h> |
8 | #include <qapplication.h> | 8 | #include <qapplication.h> |
9 | #include <qlayout.h> | 9 | #include <qlayout.h> |
10 | #include <qspinbox.h> | 10 | #include <qspinbox.h> |
11 | #include <qlistbox.h> | 11 | #include <qlistbox.h> |
12 | #include <qlabel.h> | 12 | #include <qlabel.h> |
13 | #include <qcombobox.h> | 13 | #include <qcombobox.h> |
14 | #include <qdir.h> | 14 | #include <qdir.h> |
15 | 15 | ||
16 | #define DEFAULT_ROWS 2 | 16 | #define DEFAULT_ROWS 2 |
17 | #define DEFAULT_COLS 11 | 17 | #define DEFAULT_COLS 12 |
18 | 18 | ||
19 | /* FunctionKeyboard {{{1 */ | 19 | /* FunctionKeyboard {{{1 */ |
20 | 20 | ||
21 | FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | 21 | FunctionKeyboard::FunctionKeyboard(QWidget *parent) : |
22 | QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS), | 22 | QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS), |
23 | pressedRow(0), pressedCol(0) { | 23 | pressedRow(0), pressedCol(0) { |
24 | 24 | ||
25 | setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); | 25 | setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * all the saving/loading is now done in a profile. downside is that you cant modify | 28 | * all the saving/loading is now done in a profile. downside is that you cant modify |
29 | * the keyboard for all profiles, but must do it on a profile-basis | 29 | * the keyboard for all profiles, but must do it on a profile-basis |
30 | * | 30 | * |
31 | 31 | ||
32 | Config conf("opie-console-keys"); | 32 | Config conf("opie-console-keys"); |
33 | conf.setGroup("keys"); | 33 | conf.setGroup("keys"); |
@@ -227,44 +227,46 @@ QSize FunctionKeyboard::sizeHint() const { | |||
227 | void FunctionKeyboard::loadDefaults() { | 227 | void FunctionKeyboard::loadDefaults() { |
228 | 228 | ||
229 | numRows = DEFAULT_ROWS; | 229 | numRows = DEFAULT_ROWS; |
230 | numCols = DEFAULT_COLS; | 230 | numCols = DEFAULT_COLS; |
231 | keyWidth = (double)width()/numCols; // have to reset this thing too | 231 | keyWidth = (double)width()/numCols; // have to reset this thing too |
232 | 232 | ||
233 | keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0)); | 233 | keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0)); |
234 | keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space)); | 234 | keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space)); |
235 | keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0)); | 235 | keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0)); |
236 | keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0)); | 236 | keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0)); |
237 | keys.insert( "r0c4", FKey ("Down", "down", Qt::Key_Down, 0)); | 237 | keys.insert( "r0c4", FKey ("Down", "down", Qt::Key_Down, 0)); |
238 | 238 | ||
239 | keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); | 239 | keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); |
240 | keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); | 240 | keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); |
241 | keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); | 241 | keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); |
242 | keys.insert( "r0c10", FKey ("PD", 0, 4119, 0)); | 242 | keys.insert( "r0c10", FKey ("PD", 0, 4119, 0)); |
243 | keys.insert( "r0c11", FKey ("esc", 0, Qt::Key_Escape, 0xfff)); | ||
243 | 244 | ||
244 | keys.insert( "r1c0", FKey ("F1", 0, 4144, 0)); | 245 | keys.insert( "r1c0", FKey ("F1", 0, 4144, 0)); |
245 | keys.insert( "r1c1", FKey ("F2", 0, 4145, 0)); | 246 | keys.insert( "r1c1", FKey ("F2", 0, 4145, 0)); |
246 | keys.insert( "r1c2", FKey ("F3", 0, 4146, 0)); | 247 | keys.insert( "r1c2", FKey ("F3", 0, 4146, 0)); |
247 | keys.insert( "r1c3", FKey ("F4", 0, 4147, 0)); | 248 | keys.insert( "r1c3", FKey ("F4", 0, 4147, 0)); |
248 | keys.insert( "r1c4", FKey ("F5", 0, 4148, 0)); | 249 | keys.insert( "r1c4", FKey ("F5", 0, 4148, 0)); |
249 | keys.insert( "r1c5", FKey ("F6", 0, 4149, 0)); | 250 | keys.insert( "r1c5", FKey ("F6", 0, 4149, 0)); |
250 | keys.insert( "r1c6", FKey ("F7", 0, 4150, 0)); | 251 | keys.insert( "r1c6", FKey ("F7", 0, 4150, 0)); |
251 | keys.insert( "r1c7", FKey ("F8", 0, 4151, 0)); | 252 | keys.insert( "r1c7", FKey ("F8", 0, 4151, 0)); |
252 | keys.insert( "r1c8", FKey ("F9", 0, 4152, 0)); | 253 | keys.insert( "r1c8", FKey ("F9", 0, 4152, 0)); |
253 | keys.insert( "r1c9", FKey ("F10", 0, 4153, 0)); | 254 | keys.insert( "r1c9", FKey ("F10", 0, 4153, 0)); |
254 | keys.insert( "r1c10", FKey ("F11", 0, 4154, 0)); | 255 | keys.insert( "r1c10", FKey ("F11", 0, 4154, 0)); |
256 | keys.insert( "r1c11", FKey ("F12", 0, 4155, 0)); | ||
255 | 257 | ||
256 | 258 | ||
257 | } | 259 | } |
258 | 260 | ||
259 | /* FunctionKeyboardConfig {{{1 */ | 261 | /* FunctionKeyboardConfig {{{1 */ |
260 | 262 | ||
261 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) | 263 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) |
262 | : ProfileDialogKeyWidget(name, parent, na), | 264 | : ProfileDialogKeyWidget(name, parent, na), |
263 | selectedRow(0), selectedCol(0) | 265 | selectedRow(0), selectedCol(0) |
264 | { | 266 | { |
265 | qWarning("FunctionKeyboardConfig"); | 267 | qWarning("FunctionKeyboardConfig"); |
266 | 268 | ||
267 | 269 | ||
268 | kb = new FunctionKeyboard(this); | 270 | kb = new FunctionKeyboard(this); |
269 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), | 271 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), |
270 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); | 272 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); |