Resource -> OResource

7 files changed, 93 insertions, 64 deletions

diff --git a/noncore/graphics/opie-eye/gui/filesystem.cpp b/noncore/graphics/opie-eye/gui/filesystem.cpp
index 8efcdf7..d84e9f8 100644
--- a/noncore/graphics/opie-eye/gui/filesystem.cpp
+++ b/noncore/graphics/opie-eye/gui/filesystem.cpp
@@ -5,18 +5,19 @@
 #include <stdlib.h>
 #include <qpopupmenu.h>
 #include <qtoolbar.h>
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
 #include <qpe/storage.h>
 
 
 #include "filesystem.h"
 
 PFileSystem::PFileSystem(  QToolBar* bar)
     : QToolButton( bar )
 {
-    setIconSet( Resource::loadIconSet( "cardmon/pcmcia" ) );
+    setIconSet( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) );
 
     m_pop = new QPopupMenu( this );
     connect( m_pop, SIGNAL( activated( int ) ),
              this, SLOT(slotSelectDir( int ) ) );
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 59091a8..9365932 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -15,10 +15,10 @@
 #include <opie2/oconfig.h>
 #include <opie2/okeyconfigwidget.h>
 #include <opie2/odebug.h>
 #include <opie2/oimagescrollview.h>
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
@@ -101,13 +101,13 @@ namespace {
     {
         m_iconsize = a_iconsize;
         if ( isDir ) {
             if (!_dirPix ) {
-                _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser"));
+                _dirPix = new QPixmap( Opie::Core::OResource::loadPixmap("advancedfm/FileBrowser", Opie::Core::OResource::SmallIcon));
             }
         } else {
             if (!_unkPix ) {
-                _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) );
+                _unkPix = new QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon ) );
             }
         }
         check_pix();
     }
@@ -269,26 +269,26 @@ void PIconView::initKeys() {
 
     m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "View-KeyBoard-Config",
                                                     lst, false,this, "keyconfig name" );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam",
-                                                Resource::loadPixmap("beam"), BeamItem,
-                                                Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton),
+                                                Opie::Core::OResource::loadPixmap("beam", Opie::Core::OResource::SmallIcon),
+                                                BeamItem, Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton),
                                                 this, SLOT(slotBeam())) );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete",
-                                                Resource::loadPixmap("trash"), DeleteItem,
-                                                Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton),
+                                                Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),
+                                                DeleteItem, Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton),
                                                 this, SLOT(slotTrash())) );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view",
-                                                Resource::loadPixmap("1to1"), ViewItem,
-                                                Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
+                                                Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
+                                                ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
                                                 this, SLOT(slotShowImage())));
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Show Image Info") , "info",
-                                                Resource::loadPixmap("DocumentTypeWord"), InfoItem,
-                                                Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ),
+                                                Opie::Core::OResource::loadPixmap("DocumentTypeWord", Opie::Core::OResource::SmallIcon),
+                                                InfoItem, Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ),
                                                 this, SLOT(slotImageInfo()) ) );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Start slideshow"), "slideshow",
-                                                Resource::loadPixmap("1to1"), SlideItem,
-                                                Opie::Core::OKeyPair(Qt::Key_S, Qt::ShiftButton),
+                                                Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
+                                                SlideItem, Opie::Core::OKeyPair(Qt::Key_S, Qt::ShiftButton),
                                                 this, SLOT(slotStartSlide())));
     m_viewManager->load();
     m_viewManager->handleWidget( m_view );
 }
@@ -641,9 +641,10 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) {
             item->setPixmap(pix,true);
         }
 
     } else {
-        PPixmapCache::self()->insertImage( _path, Resource::loadPixmap( "UnknownDocument" ), m_iconsize, m_iconsize );
+        PPixmapCache::self()->insertImage( _path, Opie::Core::OResource::loadPixmap( "UnknownDocument",
+                                           Opie::Core::OResource::SmallIcon ), m_iconsize, m_iconsize );
     }
     g_stringPix.remove( _path );
     m_view->arrangeItemsInGrid(true);
 }
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
index 7afb62d..8f70602 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
@@ -18,11 +18,11 @@
 
 #include <opie2/oconfig.h>
 #include <opie2/okeyconfigwidget.h>
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
 
 static const int THUMBSIZE = 128;
 
 using namespace Opie::Core;
@@ -71,10 +71,10 @@ void imageinfo::initKeys()
 
     m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys",
                                                     lst, false,this, "keyconfig name" );
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview",
-                                                            Resource::loadPixmap("1to1"), ViewItem,
-                                                            Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
+                                                            Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
+                                                            ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
                                                             this, SLOT(slotShowImage())));
     m_viewManager->load();
     m_viewManager->handleWidget( this );
     m_viewManager->handleWidget( TextView1 );
@@ -134,9 +134,9 @@ void imageinfo::slotChangeName(const QString&_path)
     SlaveMaster::self()->imageInfo( currentFile );
 
     QPixmap*m_pix = PPixmapCache::self()->cachedImage( _path, THUMBSIZE,THUMBSIZE );
     if (!m_pix) {
-        PixmapLabel1->setPixmap(QPixmap( Resource::loadPixmap( "UnknownDocument" )));
+        PixmapLabel1->setPixmap(QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon )));
         SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE);
     } else {
         PixmapLabel1->setPixmap(*m_pix);
     }
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index b919ca8..cda1a96 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -2,10 +2,10 @@
 
 #include <opie2/odebug.h>
 #include <opie2/oconfig.h>
 #include <opie2/okeyconfigwidget.h>
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qpopupmenu.h>
@@ -162,45 +162,45 @@ void ImageView::initKeys()
      */
     m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed );
 
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
-                                                Resource::loadPixmap("1to1"), ViewInfo,
-                                                Opie::Core::OKeyPair(Qt::Key_I,0),
+                                                Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
+                                                ViewInfo, Opie::Core::OKeyPair(Qt::Key_I,0),
                                                 this, SLOT(slotShowImageInfo())));
 
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate",
-                                                Resource::loadPixmap("rotate"), Autorotate,
-                                                Opie::Core::OKeyPair(Qt::Key_R,0),
+                                                Opie::Core::OResource::loadPixmap("rotate", Opie::Core::OResource::SmallIcon),
+                                                Autorotate, Opie::Core::OKeyPair(Qt::Key_R,0),
                                                 this, SIGNAL(toggleAutorotate())));
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale",
-                                                Resource::loadPixmap("1to1"), Autoscale,
-                                                Opie::Core::OKeyPair(Qt::Key_S,0),
+                                                Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
+                                                Autoscale, Opie::Core::OKeyPair(Qt::Key_S,0),
                                                 this, SIGNAL(toggleAutoscale())));
 
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext",
-                                                Resource::loadPixmap("forward"), ShowNext,
-                                                Opie::Core::OKeyPair(Qt::Key_Return,0),
+                                                Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon),
+                                                ShowNext, Opie::Core::OKeyPair(Qt::Key_Return,0),
                                                 this, SIGNAL(dispNext())));
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev",
-                                                Resource::loadPixmap("back"), ShowPrevious,
-                                                Opie::Core::OKeyPair(Qt::Key_P,0),
+                                                Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon),
+                                                ShowPrevious, Opie::Core::OKeyPair(Qt::Key_P,0),
                                                 this, SIGNAL(dispPrev())));
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle fullscreen"), "imagefullscreen",
-                                                Resource::loadPixmap("fullscreen"), FullScreen,
-                                                Opie::Core::OKeyPair(Qt::Key_F,0),
+                                                Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon),
+                                                FullScreen, Opie::Core::OKeyPair(Qt::Key_F,0),
                                                 this, SIGNAL(toggleFullScreen())));
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle thumbnail"), "imagezoomer",
-                                                Resource::loadPixmap("mag"), Zoomer,
-                                                Opie::Core::OKeyPair(Qt::Key_T,0),
+                                                Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon),
+                                                Zoomer, Opie::Core::OKeyPair(Qt::Key_T,0),
                                                 this, SIGNAL(toggleZoomer())));
 
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Increase brightness"), "incbrightness",
-                                                Resource::loadPixmap("up"), Incbrightness,
-                                                Opie::Core::OKeyPair(Qt::Key_B,0),
+                                                Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon),
+                                                Incbrightness, Opie::Core::OKeyPair(Qt::Key_B,0),
                                                 this, SIGNAL(incBrightness())));
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Decrease brightness"), "decbrightness",
-                                                Resource::loadPixmap("down"), Decbrightness,
-                                                Opie::Core::OKeyPair(Qt::Key_D,0),
+                                                Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon),
+                                                Decbrightness, Opie::Core::OKeyPair(Qt::Key_D,0),
                                                 this, SIGNAL(decBrightness())));
     m_viewManager->handleWidget( this );
     m_viewManager->load();
 }
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 3efbb53..d4c5b42 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -20,10 +20,10 @@
 #include <opie2/otabwidget.h>
 #include <opie2/okeyconfigwidget.h>
 #include <opie2/owait.h>
 #include <opie2/oapplication.h>
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/ir.h>
 #include <qpe/storage.h>
 #include <qpe/applnk.h>
@@ -516,52 +516,63 @@ void PMainWindow::showToolbar(bool how)
 }
 
 void PMainWindow::setupActions()
 {
-    m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true );
+    m_aDirUp = new QAction( tr( "Go dir up" ), Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ),
+                            0, 0, this, 0, true );
     m_aDirUp->setToggleAction(false);
     connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp()));
 
     if ( Ir::supported() ) {
-        m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true );
+        m_aBeam = new QAction( tr( "Beam file" ), Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ),
+                               0, 0, this, 0, true );
         m_aBeam->setToggleAction(false);
         connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam()));
     } else {
         m_aBeam = 0;
     }
 
-    m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true );
+    m_aShowInfo = new QAction( tr( "Show imageinfo" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+                               0, 0, this, 0, true );
     m_aShowInfo->setToggleAction(false);
     connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo()));
 
-    m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true );
+    m_aTrash = new QAction( tr( "Delete file" ), Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),
+                            0, 0, this, 0, true );
     m_aTrash->setToggleAction(false);
     connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash()));
 
-    m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true );
+    m_aViewfile = new QAction( tr( "Display image" ), Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon),
+                               0, 0, this, 0, true );
     m_aViewfile->setToggleAction(false);
     connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage()));
 
-    m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true );
+    m_aStartSlide = new QAction( tr( "Start slideshow" ), Opie::Core::OResource::loadPixmap("play", Opie::Core::OResource::SmallIcon),
+                                 0, 0, this, 0, true );
     m_aStartSlide->setToggleAction(false);
     connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide()));
 
-    m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true );
+    m_aHideToolbar = new QAction( tr( "Show toolbar" ), Opie::Core::OResource::loadPixmap( "UtilsIcon",
+                                  Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true );
     m_aHideToolbar->setOn (true);
     connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool)));
 
-    m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true );
+    m_aSetup = new QAction( tr( "Settings" ), Opie::Core::OResource::loadPixmap("SettingsIcon", Opie::Core::OResource::SmallIcon),
+                            0, 0, this, 0, true );
     m_aSetup->setToggleAction(false);
     connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig()));
 
     m_gListViewMode = new QActionGroup(this,"Select listmode",true);
     connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*)));
 
-    m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true );
+    m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb",
+                              Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true );
     m_aDirLong->setToggleAction(true);
-    m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true );
+    m_aDirShort = new QAction( tr( "Thumbnail and name" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumbonly",
+                               Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true );
     m_aDirShort->setToggleAction(true);
-    m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true );
+    m_aDirName = new QAction( tr( "Name only" ), Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-textview",
+                              Opie::Core::OResource::SmallIcon),0, 0, this, 0, true );
     m_aDirName->setToggleAction(true);
     int mode = m_cfg->readNumEntry("ListViewMode", 1);
     if (mode < 1 || mode>3) mode = 1;
     switch (mode) {
@@ -579,19 +590,21 @@ void PMainWindow::setupActions()
     m_gListViewMode->insert(m_aDirShort);
     m_gListViewMode->insert(m_aDirName);
 
     m_gPrevNext = new QActionGroup(this,"imageprevnext",false);
-    m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true );
+    m_aNext = new QAction( tr( "Next image" ),Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon),
+                           0, 0, this, 0, true );
     m_aNext->setToggleAction(false);
     connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext()));
-    m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true );
+    m_aPrevious = new QAction( tr( "Previous image" ),Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon),
+                               0, 0, this, 0, true );
     m_aPrevious->setToggleAction(false);
     connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev()));
     m_gPrevNext->insert(m_aPrevious);
     m_gPrevNext->insert(m_aNext);
 
     m_aFullScreen = new QAction( tr( "Show images fullscreen" ),
-        Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true );
+       Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true );
     m_aFullScreen->setToggleAction(true);
     if (autoSave) {
         m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false));
     } else {
@@ -599,9 +612,11 @@ void PMainWindow::setupActions()
     }
     connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool)));
 
     m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false);
-    m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true );
+    m_aAutoRotate = new QAction( tr( "Auto rotate images" ),
+                                 Opie::Core::OResource::loadPixmap( "rotate", Opie::Core::OResource::SmallIcon ),
+                                 0, 0, this, 0, true );
     m_aAutoRotate->setToggleAction(true);
 
     if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
         m_aAutoRotate->setOn(true);
@@ -612,18 +627,22 @@ void PMainWindow::setupActions()
         m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn()));
     }
     connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
 
-    m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true );
+    m_aUnscaled = new QAction( tr( "Show images unscaled" ),
+                               Opie::Core::OResource::loadPixmap( "1to1", Opie::Core::OResource::SmallIcon ),
+                               0, 0, this, 0, true );
     m_aUnscaled->setToggleAction(true);
     connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
     if (autoSave) {
         m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false));
     } else {
         m_aUnscaled->setOn(false);
     }
 
-    m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true );
+    m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ),
+                             Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon ),
+                             0, 0, this, 0, true );
     m_aZoomer->setToggleAction(true);
     if (autoSave) {
         m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true));
     } else {
@@ -637,18 +656,24 @@ void PMainWindow::setupActions()
     m_hGroup = new QActionGroup(this,"actioncollection",false);
     m_hGroup->insert(m_aFullScreen);
 
     if (!m_SmallWindow) {
-        m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true);
+        m_aForceSmall = new QAction(tr("Dont show seperate windows"),
+                                    Opie::Core::OResource::loadPixmap( "AppsIcon", Opie::Core::OResource::SmallIcon ),
+                                    0, 0, this, 0, true);
         m_aForceSmall->setToggleAction(true);
         connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool)));
     } else {
         m_aForceSmall = 0;
     }
     m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false);
     connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness()));
-    m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false);
-    m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false);
+    m_IncBrightness = new QAction(tr("Increase brightness by 5"),
+                                  Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ),
+                                  0, 0, this, 0, false);
+    m_DecBrightness = new QAction(tr("Decrease brightness by 5"),
+                                  Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ),
+                                  0, 0, this, 0, false);
     m_hBright = new QActionGroup(this,"actioncollection",false),
     m_hBright->insert(m_setCurrentBrightness);
     m_hBright->insert(m_IncBrightness);
     m_hBright->insert(m_DecBrightness);
@@ -719,9 +744,10 @@ void PMainWindow::setupMenu()
     fileMenu->insertSeparator();
     m_aDirUp->addTo( fileMenu );
 
     fsMenu = new QPopupMenu(fileMenu);
-    fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu);
+    fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ),
+                         tr("Select filesystem"),fsMenu);
     connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) );
     dirChanged();
 
     if ( m_aBeam ) {
@@ -731,9 +757,10 @@ void PMainWindow::setupMenu()
     fileMenu->insertSeparator();
     m_aTrash->addTo(fileMenu);
 
     listviewMenu = new QPopupMenu(dispMenu);
-    dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu);
+    dispMenu->insertItem(Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb", Opie::Core::OResource::SmallIcon),
+                         tr("Listview mode"),listviewMenu);
     m_gListViewMode->addTo(listviewMenu);
     dispMenu->insertSeparator();
     m_aFullScreen->addTo(dispMenu);
     m_gDisplayType->addTo(dispMenu);
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
index aa15d31..5680454 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
@@ -43,6 +43,6 @@ void ViewModeButton::slotChange( int i ) {
         break;
     }
 
     owarn << "foo " << name << oendl;
-    setIconSet( Resource::loadIconSet( name ) );
+    setIconSet( Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
 }
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.h b/noncore/graphics/opie-eye/gui/viewmodebutton.h
index 48f0e67..1637888 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.h
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.h
@@ -5,9 +5,9 @@
 
 #ifndef PHUNK_VIEW_MODE_BUTTON_H
 #define PHUNK_VIEW_MODE_BUTTON_H
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 #include <qtoolbutton.h>
 
 class ViewModeButton : public QToolButton {