author | harlekin <harlekin> | 2002-10-24 16:14:42 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-24 16:14:42 (UTC) |
commit | 07811d76c261ece00a45589a2eb9d2bb8971943e (patch) (side-by-side diff) | |
tree | 15a9c09878ff84c91b6ca0de7b7ed3ba4ff393ae /noncore/apps | |
parent | 1cc47fb5ca1516eb1c427666ca2bb650af271d0a (diff) | |
download | opie-07811d76c261ece00a45589a2eb9d2bb8971943e.zip opie-07811d76c261ece00a45589a2eb9d2bb8971943e.tar.gz opie-07811d76c261ece00a45589a2eb9d2bb8971943e.tar.bz2 |
better use resource::
-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 @@ -8,10 +8,8 @@ Send/receive: lrzsz behaves strange when trying to use - transfer dialog is still a top dialog instead on the widgetstack of of the connection its used on -- keys and buttonbar merge - - keys really working mc is working but F11 on bar seems to be the F10 key and so on F9 is F8... -zecke 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 @@ -49,11 +49,9 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : } -FunctionKeyboard::~FunctionKeyboard() { - -} +FunctionKeyboard::~FunctionKeyboard() {} void FunctionKeyboard::changeRows(int r) { numRows = r; @@ -188,13 +186,13 @@ 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)); keys.insert( "r0c9", FKey ("PU", 0, 4118, 0)); @@ -292,9 +290,9 @@ 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] ) ); } } } @@ -369,9 +367,9 @@ 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); } void FunctionKeyboardConfig::slotChangeLabelText(const QString &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,8 +1,9 @@ #ifndef OPIE_FUNCTION_KEYBOARD_H #define OPIE_FUNCTION_KEYBOARD_H #include <qpe/config.h> +#include <qpe/resource.h> #include <qpe/qpeapplication.h> #include <qframe.h> #include <qpainter.h> #include <qvbox.h> @@ -20,10 +21,9 @@ struct FKey { label(l), pixFile(f), qcode(q), unicode(u) { if (!f.isEmpty()) { - pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f); - + pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) ); } }; QString label; |