summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp24
1 files changed, 15 insertions, 9 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 @@
32/* OPIE */ 32/* OPIE */
33#include <opie2/opimresolver.h>
34#include <opie2/odebug.h> 33#include <opie2/odebug.h>
34#include <opie2/opimresolver.h>
35#include <opie2/oresource.h>
35 36
@@ -39,3 +40,2 @@
39#include <qpe/qpeapplication.h> 40#include <qpe/qpeapplication.h>
40#include <qpe/resource.h>
41#include <qpe/sound.h> 41#include <qpe/sound.h>
@@ -329,4 +329,5 @@ void OPimMainWindow::initBars( const QString &itemName ) {
329 329
330 m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), 330 m_itemNewAction = new QAction( tr( "New" ),
331 QString::null, 0, m_itemMenuGroup1, 0 ); 331 Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
332 QString::null, 0, m_itemMenuGroup1, 0 );
332 connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) ); 333 connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) );
@@ -335,3 +336,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
335 336
336 m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), 337 m_itemEditAction = new QAction( tr( "Edit" ),
338 Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
337 QString::null, 0, m_itemMenuGroup1, 0 ); 339 QString::null, 0, m_itemMenuGroup1, 0 );
@@ -341,3 +343,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
341 343
342 m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ), 344 m_itemDuplicateAction = new QAction( tr( "Duplicate" ),
345 Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ),
343 QString::null, 0, m_itemMenuGroup1, 0 ); 346 QString::null, 0, m_itemMenuGroup1, 0 );
@@ -347,3 +350,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
347 if ( Ir::supported() ) { 350 if ( Ir::supported() ) {
348 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), 351 m_itemBeamAction = new QAction( tr( "Beam" ),
352 Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ),
349 QString::null, 0, m_itemMenuGroup1, 0 ); 353 QString::null, 0, m_itemMenuGroup1, 0 );
@@ -354,3 +358,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
354 358
355 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), 359 m_itemDeleteAction = new QAction( tr( "Delete" ),
360 Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
356 QString::null, 0, m_itemMenuGroup1, 0 ); 361 QString::null, 0, m_itemMenuGroup1, 0 );
@@ -366,3 +371,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
366 371
367 m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), 372 m_configureAction = new QAction( tr( "Configure" ),
373 Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
368 QString::null, 0, m_itemMenuGroup2, 0 ); 374 QString::null, 0, m_itemMenuGroup2, 0 );