-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 | |||
@@ -31,6 +31,7 @@ | |||
31 | 31 | ||
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 | ||
36 | #include <qpe/categoryselect.h> | 37 | #include <qpe/categoryselect.h> |
@@ -38,5 +39,4 @@ | |||
38 | #include <qpe/qcopenvelope_qws.h> | 39 | #include <qpe/qcopenvelope_qws.h> |
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> |
42 | 42 | ||
@@ -328,5 +328,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
328 | m_itemMenuGroup1 = new QActionGroup( this, QString::null, false ); | 328 | m_itemMenuGroup1 = new QActionGroup( this, QString::null, false ); |
329 | 329 | ||
330 | m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), | 330 | m_itemNewAction = new QAction( tr( "New" ), |
331 | Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), | ||
331 | QString::null, 0, m_itemMenuGroup1, 0 ); | 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()) ); |
@@ -334,5 +335,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
334 | m_itemNewAction->addTo( toolbar ); | 335 | m_itemNewAction->addTo( toolbar ); |
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 ); |
338 | connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) ); | 340 | connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) ); |
@@ -340,5 +342,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
340 | m_itemEditAction->addTo( toolbar ); | 342 | m_itemEditAction->addTo( toolbar ); |
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 ); |
344 | connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); | 347 | connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); |
@@ -346,5 +349,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
346 | 349 | ||
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 ); |
350 | connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) ); | 354 | connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) ); |
@@ -353,5 +357,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
353 | } | 357 | } |
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 ); |
357 | connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); | 362 | connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); |
@@ -365,5 +370,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
365 | m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); | 370 | m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); |
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 ); |
369 | connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) ); | 375 | connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) ); |