Resource -> OResource

5 files changed, 65 insertions, 67 deletions

diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp
index 5d61342..1e87e64 100644
--- a/noncore/settings/packagemanager/entrydlg.cpp
+++ b/noncore/settings/packagemanager/entrydlg.cpp
@@ -33,5 +33,5 @@
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
@@ -55,5 +55,5 @@ EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, boo
 
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    QPushButton *btn = new QPushButton( pic, QString::null, this );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
+                                        QString::null, this );
+    btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     btn->setMaximumWidth( btn->height() );
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 205d7ed..15d88ad 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -33,5 +33,5 @@
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 
 #include <qpe/fileselector.h>
-#include <qpe/resource.h>
 #include <qpe/storage.h>
@@ -132,5 +132,4 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
 
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "packagemanager/apply" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_btnStart = new QPushButton( pic, tr( "Start" ), this );
+    m_btnStart = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply",
+                                  Opie::Core::OResource::SmallIcon ), tr( "Start" ), this );
     m_btnStart->setMinimumHeight( AppLnk::smallIconSize() );
@@ -139,4 +138,4 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
 
-    pic.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_btnOptions = new QPushButton( pic, tr( "Options" ), this );
+    m_btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+                                    tr( "Options" ), this );
     m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() );
@@ -225,5 +224,3 @@ void InstallDlg::slotBtnStart()
         m_btnStart->setText( tr( "Close" ) );
-        QPixmap pic;
-        pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-        m_btnStart->setIconSet( pic );
+        m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
         return;
@@ -249,5 +246,3 @@ void InstallDlg::slotBtnStart()
         m_btnStart->setText( tr( "Abort" ) );
-        QPixmap pic;
-        pic.convertFromImage( Resource::loadImage( "reset" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-        m_btnStart->setIconSet( pic );
+        m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon ) );
     }
@@ -268,5 +263,3 @@ void InstallDlg::slotBtnStart()
     m_btnStart->setText( tr( "Close" ) );
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_btnStart->setIconSet( pic );
+    m_btnStart->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
 
@@ -274,4 +267,3 @@ void InstallDlg::slotBtnStart()
     m_btnOptions->setText( tr( "Save output" ) );
-    pic.convertFromImage( Resource::loadImage( "save" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_btnOptions->setIconSet( pic );
+    m_btnOptions->setIconSet( Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ) );
 }
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 0e40c01..e0e5e04 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -38,2 +38,3 @@
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 
@@ -41,3 +42,2 @@
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
@@ -66,4 +66,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
     , m_statusBar( &m_statusWidget )
-    , m_iconUpdated( Resource::loadPixmap( "packagemanager/updated" ) )
-    , m_iconInstalled( Resource::loadPixmap( "installed" ) )
+    , m_iconUpdated( Opie::Core::OResource::loadPixmap( "packagemanager/updated" ) )
+    , m_iconInstalled( Opie::Core::OResource::loadPixmap( "installed" ) )
     , m_iconNull( m_iconUpdated.size() )
@@ -161,3 +161,4 @@ void MainWindow::initUI()
 
-    QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "packagemanager/update" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( tr( "Update lists" ), Opie::Core::OResource::loadPixmap( "packagemanager/update",
+                              Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Tap here to update package lists from servers." ) );
@@ -167,3 +168,4 @@ void MainWindow::initUI()
 
-    QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "packagemanager/upgrade" ), QString::null, 0, this, 0 );
+    QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Opie::Core::OResource::loadPixmap( "packagemanager/upgrade",
+                                          Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     actionUpgrade->setWhatsThis( tr( "Tap here to upgrade all installed packages if a newer version is available." ) );
@@ -173,4 +175,4 @@ void MainWindow::initUI()
 
-    QPixmap iconDownload = Resource::loadPixmap( "packagemanager/download" );
-    QPixmap iconRemove = Resource::loadPixmap( "packagemanager/remove" );
+    QPixmap iconDownload = Opie::Core::OResource::loadPixmap( "packagemanager/download", Opie::Core::OResource::SmallIcon );
+    QPixmap iconRemove = Opie::Core::OResource::loadPixmap( "packagemanager/remove", Opie::Core::OResource::SmallIcon );
     QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
@@ -181,3 +183,4 @@ void MainWindow::initUI()
 
-    a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "packagemanager/apply" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Apply changes" ), Opie::Core::OResource::loadPixmap( "packagemanager/apply",
+                     Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Tap here to install, remove or upgrade currently selected package(s)." ) );
@@ -187,3 +190,4 @@ void MainWindow::initUI()
 
-    a = new QAction( tr( "Install local package" ), Resource::loadPixmap( "folder" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Install local package" ), Opie::Core::OResource::loadPixmap( "folder",
+                     Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Tap here to install a package file located on device." ) );
@@ -195,3 +199,4 @@ void MainWindow::initUI()
 
-    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon",
+                     Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Tap here to configure this application." ) );
@@ -224,4 +229,4 @@ void MainWindow::initUI()
 
-    m_actionFilter = new QAction( tr( "Filter" ), Resource::loadPixmap( "packagemanager/filter" ),
-                                         QString::null, 0, this, 0 );
+    m_actionFilter = new QAction( tr( "Filter" ), Opie::Core::OResource::loadPixmap( "packagemanager/filter",
+                                  Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     m_actionFilter->setToggleAction( true );
@@ -238,3 +243,4 @@ void MainWindow::initUI()
 
-    a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Find" ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Tap here to search for text in package names." ) );
@@ -243,3 +249,4 @@ void MainWindow::initUI()
 
-    m_actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
+    m_actionFindNext = new QAction( tr( "Find next" ), Opie::Core::OResource::loadPixmap( "next",
+                                    Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
     m_actionFindNext->setEnabled( false );
@@ -253,3 +260,4 @@ void MainWindow::initUI()
     // Finish find toolbar creation
-    a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+    a = new QAction( QString::null, Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Tap here to hide the find toolbar." ) );
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 945571f..58c572b 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -33,5 +33,5 @@
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
@@ -184,6 +184,5 @@ void OIpkgConfigDlg::initServerWidget()
 
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    QPushButton *btn = new QPushButton( pic, tr( "New" ), container );
-    btn->setMinimumHeight( AppLnk::smallIconSize() );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "New" ), container );
+    btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
@@ -192,5 +191,5 @@ void OIpkgConfigDlg::initServerWidget()
 
-    pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_serverEditBtn = new QPushButton( pic, tr( "Edit" ), container );
-    m_serverEditBtn->setMinimumHeight( AppLnk::smallIconSize() );
+    m_serverEditBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+                                       tr( "Edit" ), container );
+    m_serverEditBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     m_serverEditBtn->setEnabled( false );
@@ -200,5 +199,5 @@ void OIpkgConfigDlg::initServerWidget()
 
-    pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_serverDeleteBtn = new QPushButton( pic, tr( "Delete" ), container );
-    m_serverDeleteBtn->setMinimumHeight( AppLnk::smallIconSize() );
+    m_serverDeleteBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
+                                         tr( "Delete" ), container );
+    m_serverDeleteBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     m_serverDeleteBtn->setEnabled( false );
@@ -229,6 +228,5 @@ void OIpkgConfigDlg::initDestinationWidget()
 
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    QPushButton *btn = new QPushButton( pic, tr( "New" ), container );
-    btn->setMinimumHeight( AppLnk::smallIconSize() );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "New" ), container );
+    btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
@@ -237,5 +235,5 @@ void OIpkgConfigDlg::initDestinationWidget()
 
-    pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_destEditBtn = new QPushButton( pic, tr( "Edit" ), container );
-    m_destEditBtn->setMinimumHeight( AppLnk::smallIconSize() );
+    m_destEditBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+                                     tr( "Edit" ), container );
+    m_destEditBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     m_destEditBtn->setEnabled( false );
@@ -245,5 +243,5 @@ void OIpkgConfigDlg::initDestinationWidget()
 
-    pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_destDeleteBtn = new QPushButton( pic, tr( "Delete" ), container );
-    m_destDeleteBtn->setMinimumHeight( AppLnk::smallIconSize() );
+    m_destDeleteBtn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
+                                       tr( "Delete" ), container );
+    m_destDeleteBtn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     m_destDeleteBtn->setEnabled( false );
@@ -359,5 +357,6 @@ void OIpkgConfigDlg::initOptionsWidget()
     layout->addWidget( m_optSourceLists, 7, 0 );
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    QPushButton *btn = new QPushButton( pic, QString::null, container );
+
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
+                                        QString::null, container );
+    btn->setMinimumHeight( AppLnk::smallIconSize()+4 );
     btn->setMaximumWidth( btn->height() );
@@ -664,5 +663,4 @@ OIpkgDestDlg::OIpkgDestDlg( OConfItem *dest, QWidget *parent )
     layout2->addWidget( m_location );
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    QPushButton *btn = new QPushButton( pic, QString::null, this );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
+                                        QString::null, this );
     btn->setMaximumWidth( btn->height() );
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index e034f34..8b1b203 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -34,6 +34,5 @@
 
+#include <opie2/oresource.h>
 #include <opie2/otabwidget.h>
 
-#include <qpe/resource.h>
-
 #include <qlayout.h>
@@ -98,4 +97,5 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr
         {
-            m_retrieveFiles = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
-                                            tr( "Retrieve file list" ), filesWidget );
+            m_retrieveFiles = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply",
+                                               Opie::Core::OResource::SmallIcon ), tr( "Retrieve file list" ),
+                                               filesWidget );
             QWhatsThis::add( m_retrieveFiles, tr( "Tap here to retrieve list of files contained in this package." ) );