-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 | |||
@@ -10,6 +10,4 @@ Send/receive: lrzsz behaves strange when trying to use | |||
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 |
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 | |||
@@ -51,7 +51,5 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : | |||
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) { |
@@ -190,9 +188,9 @@ QSize FunctionKeyboard::sizeHint() const { | |||
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)); |
@@ -294,5 +292,5 @@ void FunctionKeyboardConfig::load (const Profile& prof) { | |||
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 | } |
@@ -371,5 +369,5 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { | |||
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); |
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 | |||
@@ -3,4 +3,5 @@ | |||
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> |
@@ -22,6 +23,5 @@ struct FKey { | |||
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 | }; |