summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/filesystem.cpp5
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp29
-rw-r--r--noncore/graphics/opie-eye/gui/imageinfoui.cpp8
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp38
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp73
-rw-r--r--noncore/graphics/opie-eye/gui/viewmodebutton.cpp2
-rw-r--r--noncore/graphics/opie-eye/gui/viewmodebutton.h2
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
@@ -6,7 +6,8 @@
6#include <qpopupmenu.h> 6#include <qpopupmenu.h>
7#include <qtoolbar.h> 7#include <qtoolbar.h>
8 8
9#include <qpe/resource.h> 9#include <opie2/oresource.h>
10
10#include <qpe/storage.h> 11#include <qpe/storage.h>
11 12
12 13
@@ -15,7 +16,7 @@
15PFileSystem::PFileSystem( QToolBar* bar) 16PFileSystem::PFileSystem( QToolBar* bar)
16 : QToolButton( bar ) 17 : QToolButton( bar )
17{ 18{
18 setIconSet( Resource::loadIconSet( "cardmon/pcmcia" ) ); 19 setIconSet( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) );
19 20
20 m_pop = new QPopupMenu( this ); 21 m_pop = new QPopupMenu( this );
21 connect( m_pop, SIGNAL( activated( int ) ), 22 connect( m_pop, SIGNAL( activated( 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
@@ -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);
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
@@ -19,9 +19,9 @@
19#include <opie2/oconfig.h> 19#include <opie2/oconfig.h>
20#include <opie2/okeyconfigwidget.h> 20#include <opie2/okeyconfigwidget.h>
21#include <opie2/odebug.h> 21#include <opie2/odebug.h>
22#include <opie2/oresource.h>
22 23
23#include <qpe/qcopenvelope_qws.h> 24#include <qpe/qcopenvelope_qws.h>
24#include <qpe/resource.h>
25 25
26static const int THUMBSIZE = 128; 26static const int THUMBSIZE = 128;
27 27
@@ -72,8 +72,8 @@ void imageinfo::initKeys()
72 m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys", 72 m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys",
73 lst, false,this, "keyconfig name" ); 73 lst, false,this, "keyconfig name" );
74 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview", 74 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview",
75 Resource::loadPixmap("1to1"), ViewItem, 75 Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
76 Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), 76 ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
77 this, SLOT(slotShowImage()))); 77 this, SLOT(slotShowImage())));
78 m_viewManager->load(); 78 m_viewManager->load();
79 m_viewManager->handleWidget( this ); 79 m_viewManager->handleWidget( this );
@@ -135,7 +135,7 @@ void imageinfo::slotChangeName(const QString&_path)
135 135
136 QPixmap*m_pix = PPixmapCache::self()->cachedImage( _path, THUMBSIZE,THUMBSIZE ); 136 QPixmap*m_pix = PPixmapCache::self()->cachedImage( _path, THUMBSIZE,THUMBSIZE );
137 if (!m_pix) { 137 if (!m_pix) {
138 PixmapLabel1->setPixmap(QPixmap( Resource::loadPixmap( "UnknownDocument" ))); 138 PixmapLabel1->setPixmap(QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon )));
139 SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE); 139 SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE);
140 } else { 140 } else {
141 PixmapLabel1->setPixmap(*m_pix); 141 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
@@ -3,8 +3,8 @@
3#include <opie2/odebug.h> 3#include <opie2/odebug.h>
4#include <opie2/oconfig.h> 4#include <opie2/oconfig.h>
5#include <opie2/okeyconfigwidget.h> 5#include <opie2/okeyconfigwidget.h>
6#include <opie2/oresource.h>
6 7
7#include <qpe/resource.h>
8#include <qpe/qpeapplication.h> 8#include <qpe/qpeapplication.h>
9#include <qpe/qcopenvelope_qws.h> 9#include <qpe/qcopenvelope_qws.h>
10 10
@@ -163,43 +163,43 @@ void ImageView::initKeys()
163 m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed ); 163 m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed );
164 164
165 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo", 165 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
166 Resource::loadPixmap("1to1"), ViewInfo, 166 Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
167 Opie::Core::OKeyPair(Qt::Key_I,0), 167 ViewInfo, Opie::Core::OKeyPair(Qt::Key_I,0),
168 this, SLOT(slotShowImageInfo()))); 168 this, SLOT(slotShowImageInfo())));
169 169
170 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate", 170 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate",
171 Resource::loadPixmap("rotate"), Autorotate, 171 Opie::Core::OResource::loadPixmap("rotate", Opie::Core::OResource::SmallIcon),
172 Opie::Core::OKeyPair(Qt::Key_R,0), 172 Autorotate, Opie::Core::OKeyPair(Qt::Key_R,0),
173 this, SIGNAL(toggleAutorotate()))); 173 this, SIGNAL(toggleAutorotate())));
174 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale", 174 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale",
175 Resource::loadPixmap("1to1"), Autoscale, 175 Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon),
176 Opie::Core::OKeyPair(Qt::Key_S,0), 176 Autoscale, Opie::Core::OKeyPair(Qt::Key_S,0),
177 this, SIGNAL(toggleAutoscale()))); 177 this, SIGNAL(toggleAutoscale())));
178 178
179 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext", 179 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext",
180 Resource::loadPixmap("forward"), ShowNext, 180 Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon),
181 Opie::Core::OKeyPair(Qt::Key_Return,0), 181 ShowNext, Opie::Core::OKeyPair(Qt::Key_Return,0),
182 this, SIGNAL(dispNext()))); 182 this, SIGNAL(dispNext())));
183 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev", 183 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev",
184 Resource::loadPixmap("back"), ShowPrevious, 184 Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon),
185 Opie::Core::OKeyPair(Qt::Key_P,0), 185 ShowPrevious, Opie::Core::OKeyPair(Qt::Key_P,0),
186 this, SIGNAL(dispPrev()))); 186 this, SIGNAL(dispPrev())));
187 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle fullscreen"), "imagefullscreen", 187 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle fullscreen"), "imagefullscreen",
188 Resource::loadPixmap("fullscreen"), FullScreen, 188 Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon),
189 Opie::Core::OKeyPair(Qt::Key_F,0), 189 FullScreen, Opie::Core::OKeyPair(Qt::Key_F,0),
190 this, SIGNAL(toggleFullScreen()))); 190 this, SIGNAL(toggleFullScreen())));
191 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle thumbnail"), "imagezoomer", 191 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle thumbnail"), "imagezoomer",
192 Resource::loadPixmap("mag"), Zoomer, 192 Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon),
193 Opie::Core::OKeyPair(Qt::Key_T,0), 193 Zoomer, Opie::Core::OKeyPair(Qt::Key_T,0),
194 this, SIGNAL(toggleZoomer()))); 194 this, SIGNAL(toggleZoomer())));
195 195
196 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Increase brightness"), "incbrightness", 196 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Increase brightness"), "incbrightness",
197 Resource::loadPixmap("up"), Incbrightness, 197 Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon),
198 Opie::Core::OKeyPair(Qt::Key_B,0), 198 Incbrightness, Opie::Core::OKeyPair(Qt::Key_B,0),
199 this, SIGNAL(incBrightness()))); 199 this, SIGNAL(incBrightness())));
200 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Decrease brightness"), "decbrightness", 200 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Decrease brightness"), "decbrightness",
201 Resource::loadPixmap("down"), Decbrightness, 201 Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon),
202 Opie::Core::OKeyPair(Qt::Key_D,0), 202 Decbrightness, Opie::Core::OKeyPair(Qt::Key_D,0),
203 this, SIGNAL(decBrightness()))); 203 this, SIGNAL(decBrightness())));
204 m_viewManager->handleWidget( this ); 204 m_viewManager->handleWidget( this );
205 m_viewManager->load(); 205 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
@@ -21,8 +21,8 @@
21#include <opie2/okeyconfigwidget.h> 21#include <opie2/okeyconfigwidget.h>
22#include <opie2/owait.h> 22#include <opie2/owait.h>
23#include <opie2/oapplication.h> 23#include <opie2/oapplication.h>
24#include <opie2/oresource.h>
24 25
25#include <qpe/resource.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27#include <qpe/ir.h> 27#include <qpe/ir.h>
28#include <qpe/storage.h> 28#include <qpe/storage.h>
@@ -517,50 +517,61 @@ void PMainWindow::showToolbar(bool how)
517 517
518void PMainWindow::setupActions() 518void PMainWindow::setupActions()
519{ 519{
520 m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true ); 520 m_aDirUp = new QAction( tr( "Go dir up" ), Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ),
521 0, 0, this, 0, true );
521 m_aDirUp->setToggleAction(false); 522 m_aDirUp->setToggleAction(false);
522 connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp())); 523 connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp()));
523 524
524 if ( Ir::supported() ) { 525 if ( Ir::supported() ) {
525 m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true ); 526 m_aBeam = new QAction( tr( "Beam file" ), Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ),
527 0, 0, this, 0, true );
526 m_aBeam->setToggleAction(false); 528 m_aBeam->setToggleAction(false);
527 connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam())); 529 connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam()));
528 } else { 530 } else {
529 m_aBeam = 0; 531 m_aBeam = 0;
530 } 532 }
531 533
532 m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true ); 534 m_aShowInfo = new QAction( tr( "Show imageinfo" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
535 0, 0, this, 0, true );
533 m_aShowInfo->setToggleAction(false); 536 m_aShowInfo->setToggleAction(false);
534 connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo())); 537 connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo()));
535 538
536 m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true ); 539 m_aTrash = new QAction( tr( "Delete file" ), Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),
540 0, 0, this, 0, true );
537 m_aTrash->setToggleAction(false); 541 m_aTrash->setToggleAction(false);
538 connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash())); 542 connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash()));
539 543
540 m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true ); 544 m_aViewfile = new QAction( tr( "Display image" ), Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon),
545 0, 0, this, 0, true );
541 m_aViewfile->setToggleAction(false); 546 m_aViewfile->setToggleAction(false);
542 connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage())); 547 connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage()));
543 548
544 m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true ); 549 m_aStartSlide = new QAction( tr( "Start slideshow" ), Opie::Core::OResource::loadPixmap("play", Opie::Core::OResource::SmallIcon),
550 0, 0, this, 0, true );
545 m_aStartSlide->setToggleAction(false); 551 m_aStartSlide->setToggleAction(false);
546 connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide())); 552 connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide()));
547 553
548 m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true ); 554 m_aHideToolbar = new QAction( tr( "Show toolbar" ), Opie::Core::OResource::loadPixmap( "UtilsIcon",
555 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true );
549 m_aHideToolbar->setOn (true); 556 m_aHideToolbar->setOn (true);
550 connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool))); 557 connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool)));
551 558
552 m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true ); 559 m_aSetup = new QAction( tr( "Settings" ), Opie::Core::OResource::loadPixmap("SettingsIcon", Opie::Core::OResource::SmallIcon),
560 0, 0, this, 0, true );
553 m_aSetup->setToggleAction(false); 561 m_aSetup->setToggleAction(false);
554 connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig())); 562 connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig()));
555 563
556 m_gListViewMode = new QActionGroup(this,"Select listmode",true); 564 m_gListViewMode = new QActionGroup(this,"Select listmode",true);
557 connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*))); 565 connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*)));
558 566
559 m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true ); 567 m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb",
568 Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true );
560 m_aDirLong->setToggleAction(true); 569 m_aDirLong->setToggleAction(true);
561 m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true ); 570 m_aDirShort = new QAction( tr( "Thumbnail and name" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumbonly",
571 Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true );
562 m_aDirShort->setToggleAction(true); 572 m_aDirShort->setToggleAction(true);
563 m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true ); 573 m_aDirName = new QAction( tr( "Name only" ), Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-textview",
574 Opie::Core::OResource::SmallIcon),0, 0, this, 0, true );
564 m_aDirName->setToggleAction(true); 575 m_aDirName->setToggleAction(true);
565 int mode = m_cfg->readNumEntry("ListViewMode", 1); 576 int mode = m_cfg->readNumEntry("ListViewMode", 1);
566 if (mode < 1 || mode>3) mode = 1; 577 if (mode < 1 || mode>3) mode = 1;
@@ -580,17 +591,19 @@ void PMainWindow::setupActions()
580 m_gListViewMode->insert(m_aDirName); 591 m_gListViewMode->insert(m_aDirName);
581 592
582 m_gPrevNext = new QActionGroup(this,"imageprevnext",false); 593 m_gPrevNext = new QActionGroup(this,"imageprevnext",false);
583 m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true ); 594 m_aNext = new QAction( tr( "Next image" ),Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon),
595 0, 0, this, 0, true );
584 m_aNext->setToggleAction(false); 596 m_aNext->setToggleAction(false);
585 connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext())); 597 connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext()));
586 m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true ); 598 m_aPrevious = new QAction( tr( "Previous image" ),Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon),
599 0, 0, this, 0, true );
587 m_aPrevious->setToggleAction(false); 600 m_aPrevious->setToggleAction(false);
588 connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev())); 601 connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev()));
589 m_gPrevNext->insert(m_aPrevious); 602 m_gPrevNext->insert(m_aPrevious);
590 m_gPrevNext->insert(m_aNext); 603 m_gPrevNext->insert(m_aNext);
591 604
592 m_aFullScreen = new QAction( tr( "Show images fullscreen" ), 605 m_aFullScreen = new QAction( tr( "Show images fullscreen" ),
593 Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true ); 606 Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true );
594 m_aFullScreen->setToggleAction(true); 607 m_aFullScreen->setToggleAction(true);
595 if (autoSave) { 608 if (autoSave) {
596 m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false)); 609 m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false));
@@ -600,7 +613,9 @@ void PMainWindow::setupActions()
600 connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool))); 613 connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool)));
601 614
602 m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false); 615 m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false);
603 m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true ); 616 m_aAutoRotate = new QAction( tr( "Auto rotate images" ),
617 Opie::Core::OResource::loadPixmap( "rotate", Opie::Core::OResource::SmallIcon ),
618 0, 0, this, 0, true );
604 m_aAutoRotate->setToggleAction(true); 619 m_aAutoRotate->setToggleAction(true);
605 620
606 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { 621 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
@@ -613,7 +628,9 @@ void PMainWindow::setupActions()
613 } 628 }
614 connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); 629 connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
615 630
616 m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true ); 631 m_aUnscaled = new QAction( tr( "Show images unscaled" ),
632 Opie::Core::OResource::loadPixmap( "1to1", Opie::Core::OResource::SmallIcon ),
633 0, 0, this, 0, true );
617 m_aUnscaled->setToggleAction(true); 634 m_aUnscaled->setToggleAction(true);
618 connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); 635 connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
619 if (autoSave) { 636 if (autoSave) {
@@ -622,7 +639,9 @@ void PMainWindow::setupActions()
622 m_aUnscaled->setOn(false); 639 m_aUnscaled->setOn(false);
623 } 640 }
624 641
625 m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true ); 642 m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ),
643 Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon ),
644 0, 0, this, 0, true );
626 m_aZoomer->setToggleAction(true); 645 m_aZoomer->setToggleAction(true);
627 if (autoSave) { 646 if (autoSave) {
628 m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true)); 647 m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true));
@@ -638,7 +657,9 @@ void PMainWindow::setupActions()
638 m_hGroup->insert(m_aFullScreen); 657 m_hGroup->insert(m_aFullScreen);
639 658
640 if (!m_SmallWindow) { 659 if (!m_SmallWindow) {
641 m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true); 660 m_aForceSmall = new QAction(tr("Dont show seperate windows"),
661 Opie::Core::OResource::loadPixmap( "AppsIcon", Opie::Core::OResource::SmallIcon ),
662 0, 0, this, 0, true);
642 m_aForceSmall->setToggleAction(true); 663 m_aForceSmall->setToggleAction(true);
643 connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool))); 664 connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool)));
644 } else { 665 } else {
@@ -646,8 +667,12 @@ void PMainWindow::setupActions()
646 } 667 }
647 m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false); 668 m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false);
648 connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); 669 connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness()));
649 m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false); 670 m_IncBrightness = new QAction(tr("Increase brightness by 5"),
650 m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false); 671 Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ),
672 0, 0, this, 0, false);
673 m_DecBrightness = new QAction(tr("Decrease brightness by 5"),
674 Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ),
675 0, 0, this, 0, false);
651 m_hBright = new QActionGroup(this,"actioncollection",false), 676 m_hBright = new QActionGroup(this,"actioncollection",false),
652 m_hBright->insert(m_setCurrentBrightness); 677 m_hBright->insert(m_setCurrentBrightness);
653 m_hBright->insert(m_IncBrightness); 678 m_hBright->insert(m_IncBrightness);
@@ -720,7 +745,8 @@ void PMainWindow::setupMenu()
720 m_aDirUp->addTo( fileMenu ); 745 m_aDirUp->addTo( fileMenu );
721 746
722 fsMenu = new QPopupMenu(fileMenu); 747 fsMenu = new QPopupMenu(fileMenu);
723 fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu); 748 fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ),
749 tr("Select filesystem"),fsMenu);
724 connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); 750 connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) );
725 dirChanged(); 751 dirChanged();
726 752
@@ -732,7 +758,8 @@ void PMainWindow::setupMenu()
732 m_aTrash->addTo(fileMenu); 758 m_aTrash->addTo(fileMenu);
733 759
734 listviewMenu = new QPopupMenu(dispMenu); 760 listviewMenu = new QPopupMenu(dispMenu);
735 dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); 761 dispMenu->insertItem(Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb", Opie::Core::OResource::SmallIcon),
762 tr("Listview mode"),listviewMenu);
736 m_gListViewMode->addTo(listviewMenu); 763 m_gListViewMode->addTo(listviewMenu);
737 dispMenu->insertSeparator(); 764 dispMenu->insertSeparator();
738 m_aFullScreen->addTo(dispMenu); 765 m_aFullScreen->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
@@ -44,5 +44,5 @@ void ViewModeButton::slotChange( int i ) {
44 } 44 }
45 45
46 owarn << "foo " << name << oendl; 46 owarn << "foo " << name << oendl;
47 setIconSet( Resource::loadIconSet( name ) ); 47 setIconSet( Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
48} 48}
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
@@ -6,7 +6,7 @@
6#ifndef PHUNK_VIEW_MODE_BUTTON_H 6#ifndef PHUNK_VIEW_MODE_BUTTON_H
7#define PHUNK_VIEW_MODE_BUTTON_H 7#define PHUNK_VIEW_MODE_BUTTON_H
8 8
9#include <qpe/resource.h> 9#include <opie2/oresource.h>
10 10
11#include <qtoolbutton.h> 11#include <qtoolbutton.h>
12 12