-rw-r--r-- | noncore/apps/opie-console/BUGS | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 18 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 4 |
3 files changed, 10 insertions, 14 deletions
diff --git a/noncore/apps/opie-console/BUGS b/noncore/apps/opie-console/BUGS index 8195dc5..ac2ce03 100644 --- a/noncore/apps/opie-console/BUGS +++ b/noncore/apps/opie-console/BUGS | |||
@@ -6,14 +6,12 @@ and we need to work around some compiler bugs!! -zecke | |||
6 | Send/receive: lrzsz behaves strange when trying to use | 6 | Send/receive: lrzsz behaves strange when trying to use |
7 | --overwrite or --rename. | 7 | --overwrite or --rename. |
8 | 8 | ||
9 | - transfer dialog is still a top dialog instead on the widgetstack of of the | 9 | - transfer dialog is still a top dialog instead on the widgetstack of of the |
10 | connection its used on | 10 | connection its used on |
11 | 11 | ||
12 | - keys and buttonbar merge | ||
13 | |||
14 | - keys really working | 12 | - keys really working |
15 | mc is working | 13 | mc is working |
16 | but F11 on bar seems to be the F10 key and so on | 14 | but F11 on bar seems to be the F10 key and so on |
17 | F9 is F8... -zecke | 15 | F9 is F8... -zecke |
18 | Should be fixed -zecke | 16 | Should be fixed -zecke |
19 | 17 | ||
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 538bed4..fa11701 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -47,15 +47,13 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | |||
47 | if (keys.isEmpty()) loadDefaults(); | 47 | if (keys.isEmpty()) loadDefaults(); |
48 | 48 | ||
49 | 49 | ||
50 | 50 | ||
51 | } | 51 | } |
52 | 52 | ||
53 | FunctionKeyboard::~FunctionKeyboard() { | 53 | FunctionKeyboard::~FunctionKeyboard() {} |
54 | |||
55 | } | ||
56 | 54 | ||
57 | void FunctionKeyboard::changeRows(int r) { | 55 | void FunctionKeyboard::changeRows(int r) { |
58 | 56 | ||
59 | numRows = r; | 57 | numRows = r; |
60 | repaint(false); | 58 | repaint(false); |
61 | } | 59 | } |
@@ -186,17 +184,17 @@ QSize FunctionKeyboard::sizeHint() const { | |||
186 | 184 | ||
187 | return QSize(width(), keyHeight * numRows + 1); | 185 | return QSize(width(), keyHeight * numRows + 1); |
188 | } | 186 | } |
189 | 187 | ||
190 | void FunctionKeyboard::loadDefaults() { | 188 | void FunctionKeyboard::loadDefaults() { |
191 | 189 | ||
192 | keys.insert( "r0c0", FKey ("Enter", "enter.png", Qt::Key_Enter, 0)); | 190 | keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0)); |
193 | keys.insert( "r0c1", FKey ("Space", "space.png", Qt::Key_Space, Qt::Key_Space)); | 191 | keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space)); |
194 | keys.insert( "r0c2", FKey ("Tab", "tab.png", Qt::Key_Tab, 0)); | 192 | keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0)); |
195 | keys.insert( "r0c3", FKey ("Up", "up.png", Qt::Key_Up, 0)); | 193 | keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0)); |
196 | keys.insert( "r0c4", FKey ("Down", "down.png", Qt::Key_Down, 0)); | 194 | keys.insert( "r0c4", FKey ("Down", "down", Qt::Key_Down, 0)); |
197 | 195 | ||
198 | keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); | 196 | keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); |
199 | keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); | 197 | keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); |
200 | keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); | 198 | keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); |
201 | keys.insert( "r0c10", FKey ("PD", 0, 4119, 0)); | 199 | keys.insert( "r0c10", FKey ("PD", 0, 4119, 0)); |
202 | 200 | ||
@@ -290,13 +288,13 @@ void FunctionKeyboardConfig::load (const Profile& prof) { | |||
290 | QStringList l = QStringList::split(QChar('|'), values, TRUE); | 288 | QStringList l = QStringList::split(QChar('|'), values, TRUE); |
291 | kb->keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt()); | 289 | kb->keys[h] = FKey(l[0], l[1], l[2].toInt(), l[3].toInt()); |
292 | 290 | ||
293 | // load pixmap if used | 291 | // load pixmap if used |
294 | if (!l[1].isEmpty()) { | 292 | if (!l[1].isEmpty()) { |
295 | 293 | ||
296 | kb->keys[h].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + l[1]); | 294 | kb->keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); |
297 | } | 295 | } |
298 | } | 296 | } |
299 | } | 297 | } |
300 | 298 | ||
301 | } | 299 | } |
302 | void FunctionKeyboardConfig::save (Profile& prof) { | 300 | void FunctionKeyboardConfig::save (Profile& prof) { |
@@ -367,13 +365,13 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { | |||
367 | 365 | ||
368 | } else { | 366 | } else { |
369 | 367 | ||
370 | // is a pixmap | 368 | // is a pixmap |
371 | m_labels->setEditable(false); | 369 | m_labels->setEditable(false); |
372 | kb->keys[selectedHandle].pixFile = m_labels->currentText(); | 370 | kb->keys[selectedHandle].pixFile = m_labels->currentText(); |
373 | kb->keys[selectedHandle].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + m_labels->currentText()); | 371 | kb->keys[selectedHandle].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + m_labels->currentText() ) ); |
374 | } | 372 | } |
375 | kb->paintKey(selectedRow, selectedCol); | 373 | kb->paintKey(selectedRow, selectedCol); |
376 | } | 374 | } |
377 | void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) { | 375 | void FunctionKeyboardConfig::slotChangeLabelText(const QString &label) { |
378 | 376 | ||
379 | kb->keys[selectedHandle].label = label; | 377 | kb->keys[selectedHandle].label = label; |
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index 7f313d6..80d9f29 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h | |||
@@ -1,10 +1,11 @@ | |||
1 | #ifndef OPIE_FUNCTION_KEYBOARD_H | 1 | #ifndef OPIE_FUNCTION_KEYBOARD_H |
2 | #define OPIE_FUNCTION_KEYBOARD_H | 2 | #define OPIE_FUNCTION_KEYBOARD_H |
3 | 3 | ||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | #include <qpe/resource.h> | ||
5 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
6 | #include <qframe.h> | 7 | #include <qframe.h> |
7 | #include <qpainter.h> | 8 | #include <qpainter.h> |
8 | #include <qvbox.h> | 9 | #include <qvbox.h> |
9 | #include <qgroupbox.h> | 10 | #include <qgroupbox.h> |
10 | #include <qmap.h> | 11 | #include <qmap.h> |
@@ -18,14 +19,13 @@ struct FKey { | |||
18 | FKey(): qcode(0), unicode(0) {}; | 19 | FKey(): qcode(0), unicode(0) {}; |
19 | FKey(const QString &l, const QString &f, ushort q, ushort u): | 20 | FKey(const QString &l, const QString &f, ushort q, ushort u): |
20 | label(l), pixFile(f), qcode(q), unicode(u) { | 21 | label(l), pixFile(f), qcode(q), unicode(u) { |
21 | 22 | ||
22 | if (!f.isEmpty()) { | 23 | if (!f.isEmpty()) { |
23 | 24 | ||
24 | pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f); | 25 | pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) ); |
25 | |||
26 | } | 26 | } |
27 | }; | 27 | }; |
28 | 28 | ||
29 | QString label; | 29 | QString label; |
30 | QPixmap *pix; | 30 | QPixmap *pix; |
31 | QString pixFile; | 31 | QString pixFile; |