| -rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp index a6d574b..efb45ca 100644 --- a/libopie2/opiepim/ui/opimmainwindow.cpp +++ b/libopie2/opiepim/ui/opimmainwindow.cpp @@ -32,4 +32,5 @@ /* OPIE */ -#include <opie2/opimresolver.h> #include <opie2/odebug.h> +#include <opie2/opimresolver.h> +#include <opie2/oresource.h> @@ -39,3 +40,2 @@ #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/sound.h> @@ -329,3 +329,4 @@ void OPimMainWindow::initBars( const QString &itemName ) { - m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), + m_itemNewAction = new QAction( tr( "New" ), + Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -335,3 +336,4 @@ void OPimMainWindow::initBars( const QString &itemName ) { - m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), + m_itemEditAction = new QAction( tr( "Edit" ), + Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -341,3 +343,4 @@ void OPimMainWindow::initBars( const QString &itemName ) { - m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ), + m_itemDuplicateAction = new QAction( tr( "Duplicate" ), + Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -347,3 +350,4 @@ void OPimMainWindow::initBars( const QString &itemName ) { if ( Ir::supported() ) { - m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), + m_itemBeamAction = new QAction( tr( "Beam" ), + Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -354,3 +358,4 @@ void OPimMainWindow::initBars( const QString &itemName ) { - m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), + m_itemDeleteAction = new QAction( tr( "Delete" ), + Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -366,3 +371,4 @@ void OPimMainWindow::initBars( const QString &itemName ) { - m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), + m_configureAction = new QAction( tr( "Configure" ), + Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), QString::null, 0, m_itemMenuGroup2, 0 ); |