summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
authordrw <drw>2005-04-05 22:45:37 (UTC)
committer drw <drw>2005-04-05 22:45:37 (UTC)
commit2a9ee3ea1d8d978b735f0ce3f2e54a15e37c87b3 (patch) (side-by-side diff)
tree9d53a71c9a250f0c54f098093013cf3964e3858d /libopie2/opiepim
parent0f7b159f0a4972b6ffdc292f5eb4d2169c7fa75d (diff)
downloadopie-2a9ee3ea1d8d978b735f0ce3f2e54a15e37c87b3.zip
opie-2a9ee3ea1d8d978b735f0ce3f2e54a15e37c87b3.tar.gz
opie-2a9ee3ea1d8d978b735f0ce3f2e54a15e37c87b3.tar.bz2
Use OResource for loading images
Diffstat (limited to 'libopie2/opiepim') (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 @@
/* 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,4 +329,5 @@ void OPimMainWindow::initBars( const QString &itemName ) {
- m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
- QString::null, 0, m_itemMenuGroup1, 0 );
+ 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()) );
@@ -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 );