Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 73 |
1 files changed, 50 insertions, 23 deletions
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 @@ -23,4 +23,4 @@ #include <opie2/oapplication.h> +#include <opie2/oresource.h> -#include <qpe/resource.h> #include <qpe/config.h> @@ -519,3 +519,4 @@ 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); @@ -524,3 +525,4 @@ void PMainWindow::setupActions() 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); @@ -531,3 +533,4 @@ void PMainWindow::setupActions() - 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); @@ -535,3 +538,4 @@ void PMainWindow::setupActions() - 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); @@ -539,3 +543,4 @@ void PMainWindow::setupActions() - 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); @@ -543,3 +548,4 @@ void PMainWindow::setupActions() - 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); @@ -547,3 +553,4 @@ void PMainWindow::setupActions() - 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); @@ -551,3 +558,4 @@ void PMainWindow::setupActions() - 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); @@ -558,7 +566,10 @@ void PMainWindow::setupActions() - 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); @@ -582,6 +593,8 @@ void PMainWindow::setupActions() 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); @@ -592,3 +605,3 @@ void PMainWindow::setupActions() 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); @@ -602,3 +615,5 @@ void PMainWindow::setupActions() 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); @@ -615,3 +630,5 @@ void PMainWindow::setupActions() - 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); @@ -624,3 +641,5 @@ void PMainWindow::setupActions() - 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); @@ -640,3 +659,5 @@ void PMainWindow::setupActions() 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); @@ -648,4 +669,8 @@ void PMainWindow::setupActions() 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), @@ -722,3 +747,4 @@ void PMainWindow::setupMenu() 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 ) ) ); @@ -734,3 +760,4 @@ void PMainWindow::setupMenu() 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); |