summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp22
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
@@ -31,6 +31,7 @@
/* OPIE */
-#include <opie2/opimresolver.h>
#include <opie2/odebug.h>
+#include <opie2/opimresolver.h>
+#include <opie2/oresource.h>
#include <qpe/categoryselect.h>
@@ -38,5 +39,4 @@
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qpe/sound.h>
@@ -328,5 +328,6 @@ void OPimMainWindow::initBars( const QString &itemName ) {
m_itemMenuGroup1 = new QActionGroup( this, QString::null, false );
- 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 );
connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) );
@@ -334,5 +335,6 @@ void OPimMainWindow::initBars( const QString &itemName ) {
m_itemNewAction->addTo( toolbar );
- 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 );
connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) );
@@ -340,5 +342,6 @@ void OPimMainWindow::initBars( const QString &itemName ) {
m_itemEditAction->addTo( toolbar );
- 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 );
connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) );
@@ -346,5 +349,6 @@ 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 );
connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) );
@@ -353,5 +357,6 @@ 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 );
connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) );
@@ -365,5 +370,6 @@ void OPimMainWindow::initBars( const QString &itemName ) {
m_itemMenuGroup2 = new QActionGroup( this, QString::null, false );
- 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 );
connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) );