author | drw <drw> | 2005-05-16 18:56:02 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-16 18:56:02 (UTC) |
commit | 348314c7411500e23ca467289ed92e446be9121b (patch) (side-by-side diff) | |
tree | f2eea2bec6b6e49f66d4a373b94d2e73f6937c46 /noncore/apps | |
parent | 17b9be61d7de14dea0d662a496e3d08bc9b1662e (diff) | |
download | opie-348314c7411500e23ca467289ed92e446be9121b.zip opie-348314c7411500e23ca467289ed92e446be9121b.tar.gz opie-348314c7411500e23ca467289ed92e446be9121b.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 36 |
3 files changed, 27 insertions, 23 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 0abe0d9..389618c 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp @@ -83,7 +83,7 @@ void FunctionKeyboard::load (const Profile& prof) { // load pixmap if used if (!l[1].isEmpty()) { - keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); + keys[h].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + l[1] ) ); } } } @@ -277,8 +277,7 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par QStringList files = QDir( QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); for (uint i = 0; i < files.count(); i++) { - - m_labels->insertItem( Resource::loadPixmap("console/keys/" + files[i]), files[i]); + m_labels->insertItem( Opie::Core::OResource::loadPixmap("console/keys/" + files[i]), files[i]); } connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); connect (m_labels, SIGNAL(textChanged(const QString&)), this, SLOT(slotChangeLabelText(const QString&))); @@ -328,7 +327,7 @@ void FunctionKeyboardConfig::load (const Profile& prof) { // load pixmap if used if (!l[1].isEmpty()) { - kb->keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); + kb->keys[h].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + l[1] ) ); } } } @@ -403,7 +402,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( Resource::loadPixmap( "console/keys/" + m_labels->currentText() ) ); + kb->keys[selectedHandle].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + m_labels->currentText() ) ); } kb->paintKey(selectedRow, selectedCol); } diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index a60ff4b..b7e211c 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 <opie2/oresource.h> + #include <qpe/config.h> -#include <qpe/resource.h> #include <qpe/qpeapplication.h> #include <qframe.h> #include <qpainter.h> @@ -22,7 +23,7 @@ struct FKey { if (!f.isEmpty()) { - pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) ); + pix = new QPixmap ( Opie::Core::OResource::loadPixmap("console/keys/" + f ) ); } }; diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index eaa78c8..45a662c 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -13,6 +13,7 @@ /* OPIE */ #include <opie2/ofiledialog.h> +#include <opie2/oresource.h> #include <qpe/filemanager.h> using namespace Opie::Ui; @@ -76,7 +77,7 @@ void MainWindow::initUI() { * the settings action */ m_setProfiles = new QAction(tr("Configure Profiles"), - Resource::loadPixmap( "SettingsIcon" ), + Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0); m_setProfiles->addTo( m_console ); connect( m_setProfiles, SIGNAL(activated() ), @@ -87,7 +88,7 @@ void MainWindow::initUI() { * new Action for new sessions */ QAction* newCon = new QAction(tr("New Profile"), - Resource::loadPixmap( "new" ), + Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0); newCon->addTo( m_console ); connect( newCon, SIGNAL(activated() ), @@ -96,7 +97,7 @@ void MainWindow::initUI() { m_console->insertSeparator(); QAction *saveCon = new QAction( tr("Save Profile" ), - Resource::loadPixmap( "save" ), QString::null, + Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); saveCon->addTo( m_console ); connect( saveCon, SIGNAL(activated() ), @@ -106,8 +107,8 @@ void MainWindow::initUI() { /* * connect action */ - m_connect = new QAction( tr("Connect"), Resource::loadPixmap("console/connected"), - QString::null, 0, this, 0 ); + m_connect = new QAction( tr("Connect"), Opie::Core::OResource::loadPixmap("console/connected", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_connect->addTo( m_console ); connect(m_connect, SIGNAL(activated() ), this, SLOT(slotConnect() ) ); @@ -115,8 +116,8 @@ void MainWindow::initUI() { /* * disconnect action */ - m_disconnect = new QAction( tr("Disconnect"), Resource::loadPixmap("console/notconnected"), - QString::null, 0, this, 0 ); + m_disconnect = new QAction( tr("Disconnect"), Opie::Core::OResource::loadPixmap("console/notconnected", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_disconnect->addTo( m_console ); connect(m_disconnect, SIGNAL(activated() ), this, SLOT(slotDisconnect() ) ); @@ -124,7 +125,9 @@ void MainWindow::initUI() { m_console->insertSeparator(); #ifndef EAST - m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 ); + m_quickLaunch = new QAction( tr("QuickLaunch"), + Opie::Core::OResource::loadPixmap("console/konsole_mini", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); m_quickLaunch->addTo( m_icons ); connect( m_quickLaunch, SIGNAL( activated() ), this, SLOT( slotQuickLaunch() ) ); @@ -132,8 +135,8 @@ void MainWindow::initUI() { QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) ); - m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, - 0, this, 0 ); + m_transfer = new QAction( tr("Transfer file..."), Opie::Core::OResource::loadPixmap("pass", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); m_transfer->addTo( m_console ); connect(m_transfer, SIGNAL(activated() ), this, SLOT(slotTransfer() ) ); @@ -144,7 +147,8 @@ void MainWindow::initUI() { * immediate change of line wrap policy */ m_isWrapped = true; - m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0, true ); + m_wrap = new QAction( tr("Line wrap"), Opie::Core::OResource::loadPixmap( "linewrap", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0, true ); m_wrap->addTo( m_console ); m_wrap->setOn( true ); connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); @@ -154,8 +158,8 @@ void MainWindow::initUI() { */ m_isFullscreen = false; - m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) - , QString::null, 0, this, 0 ); + m_fullscreen = new QAction( tr("Full screen"), Opie::Core::OResource::loadPixmap( "fullscreen", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_fullscreen->addTo( m_console ); connect( m_fullscreen, SIGNAL( activated() ), this, SLOT( slotFullscreen() ) ); @@ -211,7 +215,7 @@ void MainWindow::initUI() { * action that open/closes the keyboard */ m_openKeys = new QAction (tr("Open Keyboard..."), - Resource::loadPixmap( "console/keys/keyboard_icon" ), + Opie::Core::OResource::loadPixmap( "console/keys/keyboard_icon", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0); m_openKeys->setToggleAction(true); connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); @@ -244,14 +248,14 @@ void MainWindow::initUI() { a = new QAction(tr("Copy"), - Resource::loadPixmap("copy"), QString::null, + Opie::Core::OResource::loadPixmap("copy", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); //a->addTo( m_icons ); connect( a, SIGNAL(activated() ), this, SLOT(slotCopy() ) ); QAction *paste = new QAction(tr("Paste"), - Resource::loadPixmap("paste"), QString::null, + Opie::Core::OResource::loadPixmap("paste", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); connect( paste, SIGNAL(activated() ), this, SLOT(slotPaste() ) ); |