Diffstat (limited to 'noncore/graphics/opie-eye/gui/iconview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 29 |
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 | |||
@@ -16,8 +16,8 @@ | |||
16 | #include <opie2/okeyconfigwidget.h> | 16 | #include <opie2/okeyconfigwidget.h> |
17 | #include <opie2/odebug.h> | 17 | #include <opie2/odebug.h> |
18 | #include <opie2/oimagescrollview.h> | 18 | #include <opie2/oimagescrollview.h> |
19 | #include <opie2/oresource.h> | ||
19 | 20 | ||
20 | #include <qpe/resource.h> | ||
21 | #include <qpe/qpemessagebox.h> | 21 | #include <qpe/qpemessagebox.h> |
22 | #include <qpe/ir.h> | 22 | #include <qpe/ir.h> |
23 | #include <qpe/qcopenvelope_qws.h> | 23 | #include <qpe/qcopenvelope_qws.h> |
@@ -102,11 +102,11 @@ namespace { | |||
102 | m_iconsize = a_iconsize; | 102 | m_iconsize = a_iconsize; |
103 | if ( isDir ) { | 103 | if ( isDir ) { |
104 | if (!_dirPix ) { | 104 | if (!_dirPix ) { |
105 | _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser")); | 105 | _dirPix = new QPixmap( Opie::Core::OResource::loadPixmap("advancedfm/FileBrowser", Opie::Core::OResource::SmallIcon)); |
106 | } | 106 | } |
107 | } else { | 107 | } else { |
108 | if (!_unkPix ) { | 108 | if (!_unkPix ) { |
109 | _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); | 109 | _unkPix = new QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon ) ); |
110 | } | 110 | } |
111 | } | 111 | } |
112 | check_pix(); | 112 | check_pix(); |
@@ -270,24 +270,24 @@ void PIconView::initKeys() { | |||
270 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "View-KeyBoard-Config", | 270 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "View-KeyBoard-Config", |
271 | lst, false,this, "keyconfig name" ); | 271 | lst, false,this, "keyconfig name" ); |
272 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam", | 272 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam", |
273 | Resource::loadPixmap("beam"), BeamItem, | 273 | Opie::Core::OResource::loadPixmap("beam", Opie::Core::OResource::SmallIcon), |
274 | Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton), | 274 | BeamItem, Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton), |
275 | this, SLOT(slotBeam())) ); | 275 | this, SLOT(slotBeam())) ); |
276 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete", | 276 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete", |
277 | Resource::loadPixmap("trash"), DeleteItem, | 277 | Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), |
278 | Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton), | 278 | DeleteItem, Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton), |
279 | this, SLOT(slotTrash())) ); | 279 | this, SLOT(slotTrash())) ); |
280 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view", | 280 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view", |
281 | Resource::loadPixmap("1to1"), ViewItem, | 281 | Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), |
282 | Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), | 282 | ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), |
283 | this, SLOT(slotShowImage()))); | 283 | this, SLOT(slotShowImage()))); |
284 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Show Image Info") , "info", | 284 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Show Image Info") , "info", |
285 | Resource::loadPixmap("DocumentTypeWord"), InfoItem, | 285 | Opie::Core::OResource::loadPixmap("DocumentTypeWord", Opie::Core::OResource::SmallIcon), |
286 | Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ), | 286 | InfoItem, Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ), |
287 | this, SLOT(slotImageInfo()) ) ); | 287 | this, SLOT(slotImageInfo()) ) ); |
288 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Start slideshow"), "slideshow", | 288 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Start slideshow"), "slideshow", |
289 | Resource::loadPixmap("1to1"), SlideItem, | 289 | Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), |
290 | Opie::Core::OKeyPair(Qt::Key_S, Qt::ShiftButton), | 290 | SlideItem, Opie::Core::OKeyPair(Qt::Key_S, Qt::ShiftButton), |
291 | this, SLOT(slotStartSlide()))); | 291 | this, SLOT(slotStartSlide()))); |
292 | m_viewManager->load(); | 292 | m_viewManager->load(); |
293 | m_viewManager->handleWidget( m_view ); | 293 | m_viewManager->handleWidget( m_view ); |
@@ -642,7 +642,8 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { | |||
642 | } | 642 | } |
643 | 643 | ||
644 | } else { | 644 | } else { |
645 | PPixmapCache::self()->insertImage( _path, Resource::loadPixmap( "UnknownDocument" ), m_iconsize, m_iconsize ); | 645 | PPixmapCache::self()->insertImage( _path, Opie::Core::OResource::loadPixmap( "UnknownDocument", |
646 | Opie::Core::OResource::SmallIcon ), m_iconsize, m_iconsize ); | ||
646 | } | 647 | } |
647 | g_stringPix.remove( _path ); | 648 | g_stringPix.remove( _path ); |
648 | m_view->arrangeItemsInGrid(true); | 649 | m_view->arrangeItemsInGrid(true); |