Diffstat (limited to 'noncore/apps/opie-console/function_keyboard.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
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 @@ -50,9 +50,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : } -FunctionKeyboard::~FunctionKeyboard() { - -} +FunctionKeyboard::~FunctionKeyboard() {} void FunctionKeyboard::changeRows(int r) { @@ -189,11 +187,11 @@ QSize FunctionKeyboard::sizeHint() const { void FunctionKeyboard::loadDefaults() { - keys.insert( "r0c0", FKey ("Enter", "enter.png", Qt::Key_Enter, 0)); - keys.insert( "r0c1", FKey ("Space", "space.png", Qt::Key_Space, Qt::Key_Space)); - keys.insert( "r0c2", FKey ("Tab", "tab.png", Qt::Key_Tab, 0)); - keys.insert( "r0c3", FKey ("Up", "up.png", Qt::Key_Up, 0)); - keys.insert( "r0c4", FKey ("Down", "down.png", Qt::Key_Down, 0)); + keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0)); + keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space)); + keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0)); + keys.insert( "r0c3", FKey ("Up", "up", Qt::Key_Up, 0)); + keys.insert( "r0c4", FKey ("Down", "down", Qt::Key_Down, 0)); keys.insert( "r0c7", FKey ("Ho", 0, 4112, 0)); keys.insert( "r0c8", FKey ("End", 0, 4113, 0)); @@ -293,7 +291,7 @@ void FunctionKeyboardConfig::load (const Profile& prof) { // load pixmap if used if (!l[1].isEmpty()) { - kb->keys[h].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + l[1]); + kb->keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); } } } @@ -370,7 +368,7 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { // is a pixmap m_labels->setEditable(false); kb->keys[selectedHandle].pixFile = m_labels->currentText(); - kb->keys[selectedHandle].pix = new QPixmap(QPEApplication::qpeDir() + "pics/console/keys/" + m_labels->currentText()); + kb->keys[selectedHandle].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + m_labels->currentText() ) ); } kb->paintKey(selectedRow, selectedCol); } |