1 files changed, 15 insertions, 14 deletions

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
@@ -1,44 +1,44 @@
 /*
  * GPLv2 zecke@handhelds.org
  * No WArranty...
  */
 
 #include "iconview.h"
 #include "messagebox.h"
 
 #include <lib/imagecache.h>
 #include <gui/imageinfoui.h>
 
 #include <iface/dirview.h>
 #include <iface/dirlister.h>
 
 #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>
 
 #include <qiconview.h>
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qtimer.h>
 #include <qstyle.h>
 
 
 using Opie::Core::OKeyConfigItem;
 
 const int PIconView::sMAX_ICON_SIZE = 128;
 const int PIconView::sMIN_ICON_SIZE = 12;
 const int PIconView::sDEF_ICON_SIZE = 64;
 
 /*
  * The Icons, Request Cache and IconViewItem for the IconView
@@ -81,53 +81,53 @@ namespace {
         void setText( const QString& );
     };
     class ThumbViewItem : public IconViewItem {
         ThumbViewItem( QIconView*, const QString& path, const QString& name, int a_iconsize, bool isDir = false );
         QPixmap *pixmap()const;
         void setText( const QString& );
     };
 
 
 /*
  * If we request an Image or String
  * we add it to the map
  */
     static QMap<QString, IconViewItem*> g_stringInf;
     static QMap<QString, IconViewItem*> g_stringPix;
 
     IconViewItem::IconViewItem( QIconView* view,const QString& path,
                                 const QString& name, int a_iconsize, bool isDir)
         : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ),
           m_noInfo( false ),m_textOnly(false),m_Pixset(false)
     {
         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();
     }
 
     inline void IconViewItem::check_pix()const
     {
         if (_dirPix && _dirPix->width()>m_iconsize) {
             QImage Pix = _dirPix->convertToImage();
             *_dirPix = Pix.smoothScale(m_iconsize,m_iconsize);
         }
         if (!_cpyPix && _unkPix) {
             if (_unkPix->width()>=m_iconsize) {
                 QImage Pix = _unkPix->convertToImage();
                 _cpyPix = new QPixmap();
                 if (_unkPix->width()>m_iconsize) {
                     *_cpyPix = Pix.smoothScale(m_iconsize,m_iconsize);
                 } else {
                     _cpyPix->convertFromImage(Pix);
                 }
 
             } else {
                 _cpyPix = new QPixmap(m_iconsize,m_iconsize);
                 _cpyPix->fill();
@@ -249,66 +249,66 @@ PIconView::~PIconView() {
     m_viewManager->save();
     delete m_viewManager;
 }
 
 Opie::Core::OKeyConfigManager* PIconView::manager() {
     return m_viewManager;
 }
 
 
 /*
  * init the KeyBoard Shortcuts
  * called from the c'tor
  */
 void PIconView::initKeys() {
     Opie::Core::OKeyPair::List lst;
     lst.append( Opie::Core::OKeyPair::upArrowKey() );
     lst.append( Opie::Core::OKeyPair::downArrowKey() );
     lst.append( Opie::Core::OKeyPair::leftArrowKey() );
     lst.append( Opie::Core::OKeyPair::rightArrowKey() );
     lst.append( Opie::Core::OKeyPair::returnKey() );
 
     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 );
 }
 
 
 /*
  * change one dir up
  */
 void PIconView::slotDirUp()
 {
     slotChangeDir( currentView()->dirLister()->dirUp( m_path ) );
 }
 
 /*
  * change the dir
  */
 void PIconView::slotChangeDir(const QString& path) {
     if ( !currentView() )
         return;
 
     PDirLister *lister = currentView()->dirLister();
     if (!lister )
         return;
@@ -621,49 +621,50 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) {
         return;
 
     if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(),
                                  m_view->contentsWidth(), m_view->contentsHeight() ) ) )
         m_updatet = true;
 
     if (pix.width()>0) {
         if (pix.width()<m_iconsize) {
             QPixmap p(m_iconsize,m_iconsize);
             p.fill();
             QPainter pa(&p);
             int offset = (m_iconsize-pix.width())/2;
             int offy = (m_iconsize-pix.height())/2;
             if (offy<0) offy=0;
             pa.drawPixmap(offset,offy,pix);
             pa.end();
             PPixmapCache::self()->insertImage( _path, p, m_iconsize, m_iconsize );
             item->setPixmap(p,true);
         } else {
             PPixmapCache::self()->insertImage( _path, pix, m_iconsize, m_iconsize );
             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);
 }
 
 
 /*
  * FIXME rename
  */
 void PIconView::slotRename() {
 
 }
 
 
 /*
  * BEAM the current file
  */
 void PIconView::slotBeam() {
     bool isDir;
     QString pa = currentFileName( isDir );
     if ( isDir && pa.isEmpty() )
         return;
 
     Ir* ir = new Ir( this );