| -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 @@ -11,4 +11,2 @@ connection its used on -- keys and buttonbar merge - - keys really 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 @@ -52,5 +52,3 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : -FunctionKeyboard::~FunctionKeyboard() { - -} +FunctionKeyboard::~FunctionKeyboard() {} @@ -191,7 +189,7 @@ 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)); @@ -295,3 +293,3 @@ void FunctionKeyboardConfig::load (const Profile& prof) { - 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] ) ); } @@ -372,3 +370,3 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) { 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() ) ); } 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 @@ -4,2 +4,3 @@ #include <qpe/config.h> +#include <qpe/resource.h> #include <qpe/qpeapplication.h> @@ -23,4 +24,3 @@ struct FKey { - pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f); - + pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) ); } |