Use OResource for loading images

author: drw <drw> 2005-04-06 22:41:05 (UTC)
committer: drw <drw> 2005-04-06 22:41:05 (UTC)
commit: 6ea302df768201e4ab8dd2ec797a5cc9ea6589bf (patch) (unidiff)
tree: 9cffcfa9fecd49d0d6a0498de0cccd9aef52bf75
parent: cd1b15147d372d8786c855764d397553651c358d (diff)
download: opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.zip
opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.gz
opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.bz2
4 files changed, 37 insertions, 33 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 60f3177..539d6ba 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -23,5 +23,5 @@
 #include <opie2/opimrecordlist.h>
+#include <opie2/oresource.h>
 #include <qpe/timestring.h>
-#include <qpe/resource.h>
@@ -631,3 +631,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/email" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
                        break;
@@ -636,3 +636,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/email" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
                        break;
@@ -656,3 +656,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/phonehome" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome" );
                        break;
@@ -661,3 +661,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/faxhome" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome" );
                        break;
@@ -666,3 +666,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/mobilehome" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome" );
                        break;
@@ -671,3 +671,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/webpagehome" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome" );
                        break;
@@ -691,3 +691,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/webpagework" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework" );
                        break;
@@ -705,3 +705,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/phonework" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework" );
                        break;
@@ -710,3 +710,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/faxwork" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork" );
                        break;
@@ -715,3 +715,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
                        if ( !item.value.isEmpty() )
-                                item.icon = Resource::loadPixmap( "addressbook/mobilework" );
+                                item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework" );
                        break;
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index faae0a9..4fa9253 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -29,4 +29,4 @@
 #include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/oresource.h>
-#include <qpe/resource.h>
 #include <qpe/ir.h>
@@ -34,4 +34,2 @@
 #include <qmenubar.h>
-// #include <qtoolbar.h>
-// #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
@@ -95,3 +93,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
-    QAction *a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( tr( "Start Search" ),
+                              Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, this, 0 );
    connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
@@ -102,11 +102,14 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
-    m_actionMail = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "addressbook/sendmail" ),
+    m_actionMail = new QAction( tr( "Write Mail To" ),
-                              QString::null, 0, items, 0 );
+                                Opie::Core::OResource::loadPixmap( "addressbook/sendmail" ),
+                                QString::null, 0, items, 0 );
    connect( m_actionMail, SIGNAL(activated()), this, SLOT(writeMail()) );
-    a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"),
+    a = new QAction( tr("Import vCard"),
-                              QString::null, 0, items, 0 );
+                     Opie::Core::OResource::loadPixmap( "addressbook/fileimport" ),
+                     QString::null, 0, items, 0 );
    connect( a, SIGNAL(activated()), this, SLOT(importvCard()) );
-    a = new QAction( tr("Export vCard"), Resource::loadPixmap( "addressbook/fileexport"),
+    a = new QAction( tr("Export vCard"),
+                     Opie::Core::OResource::loadPixmap( "addressbook/fileexport" ),
                     QString::null, 0, items, 0 );
@@ -114,4 +117,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
-    m_actionPersonal = new QAction( tr("My Personal Details"), Resource::loadPixmap( "addressbook/identity" ),
+    m_actionPersonal = new QAction( tr("My Personal Details"),
-                                  QString::null, 0, items, 0 , true );
+                                    Opie::Core::OResource::loadPixmap( "addressbook/identity" ),
+                                    QString::null, 0, items, 0 , true );
    connect( m_actionPersonal, SIGNAL(activated()), this, SLOT(slotPersonalView()) );
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 61e6c7e..a491fc7 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -4,5 +4,4 @@
 #include <opie2/opimcontact.h>
-#include "opie2/opimcontactfields.h"
+#include <opie2/opimcontactfields.h>
+#include <opie2/oresource.h>
-#include <qpe/resource.h>
@@ -27,6 +26,6 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
        // Set Pics to Buttons and Tabs
-        m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );
+        m_upButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/up" ) ) );
-        m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );
+        m_downButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/down" ) ) );
-        m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
+        m_addButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/add" ) ) );
-        m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
+        m_removeButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/sub" ) ) );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index dec4c7c..4a0059a 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -26,2 +26,3 @@
 #include <opie2/opimcontact.h>
+#include <opie2/oresource.h>
@@ -30,3 +31,2 @@
 #include <qpe/qpedialog.h>
-#include <qpe/resource.h>
@@ -219,3 +219,4 @@ void ContactEditor::init() {
-        btnNote = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Notes..." ), container );
+        btnNote = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+                               tr( "Notes..." ), container );
        gl->addWidget( btnNote, 9, 1 );
@@ -532,3 +533,3 @@ void ContactEditor::init() {
-        QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
+        QPushButton* deleteButton = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
                                                     tr( "Delete" ),
@@ -557,3 +558,3 @@ void ContactEditor::init() {
-        deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
+        deleteButton = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
                                                     tr( "Delete" ),
author	drw <drw>	2005-04-06 22:41:05 (UTC)
committer	drw <drw>	2005-04-06 22:41:05 (UTC)
commit	6ea302df768201e4ab8dd2ec797a5cc9ea6589bf (patch) (unidiff)
tree	9cffcfa9fecd49d0d6a0498de0cccd9aef52bf75
parent	cd1b15147d372d8786c855764d397553651c358d (diff)
download	opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.zip opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.gz opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.bz2

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 60f3177..539d6ba 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp
@@ -23,5 +23,5 @@
23	#include <opie2/opimrecordlist.h>	23	#include <opie2/opimrecordlist.h>
		24	#include <opie2/oresource.h>
24		25
25	#include <qpe/timestring.h>	26	#include <qpe/timestring.h>
26	#include <qpe/resource.h>
27		27
@@ -631,3 +631,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
631	if ( !item.value.isEmpty() )	631	if ( !item.value.isEmpty() )
632	item.icon = Resource::loadPixmap( "addressbook/email" );	632	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
633	break;	633	break;
@@ -636,3 +636,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
636	if ( !item.value.isEmpty() )	636	if ( !item.value.isEmpty() )
637	item.icon = Resource::loadPixmap( "addressbook/email" );	637	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" );
638	break;	638	break;
@@ -656,3 +656,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
656	if ( !item.value.isEmpty() )	656	if ( !item.value.isEmpty() )
657	item.icon = Resource::loadPixmap( "addressbook/phonehome" );	657	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome" );
658	break;	658	break;
@@ -661,3 +661,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
661	if ( !item.value.isEmpty() )	661	if ( !item.value.isEmpty() )
662	item.icon = Resource::loadPixmap( "addressbook/faxhome" );	662	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome" );
663	break;	663	break;
@@ -666,3 +666,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
666	if ( !item.value.isEmpty() )	666	if ( !item.value.isEmpty() )
667	item.icon = Resource::loadPixmap( "addressbook/mobilehome" );	667	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome" );
668	break;	668	break;
@@ -671,3 +671,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
671	if ( !item.value.isEmpty() )	671	if ( !item.value.isEmpty() )
672	item.icon = Resource::loadPixmap( "addressbook/webpagehome" );	672	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome" );
673	break;	673	break;
@@ -691,3 +691,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
691	if ( !item.value.isEmpty() )	691	if ( !item.value.isEmpty() )
692	item.icon = Resource::loadPixmap( "addressbook/webpagework" );	692	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework" );
693	break;	693	break;
@@ -705,3 +705,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
705	if ( !item.value.isEmpty() )	705	if ( !item.value.isEmpty() )
706	item.icon = Resource::loadPixmap( "addressbook/phonework" );	706	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework" );
707	break;	707	break;
@@ -710,3 +710,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
710	if ( !item.value.isEmpty() )	710	if ( !item.value.isEmpty() )
711	item.icon = Resource::loadPixmap( "addressbook/faxwork" );	711	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork" );
712	break;	712	break;
@@ -715,3 +715,3 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
715	if ( !item.value.isEmpty() )	715	if ( !item.value.isEmpty() )
716	item.icon = Resource::loadPixmap( "addressbook/mobilework" );	716	item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework" );
717	break;	717	break;


diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index faae0a9..4fa9253 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp
@@ -29,4 +29,4 @@
29	#include <opie2/ocontactaccessbackend_vcard.h>	29	#include <opie2/ocontactaccessbackend_vcard.h>
		30	#include <opie2/oresource.h>
30		31
31	#include <qpe/resource.h>
32	#include <qpe/ir.h>	32	#include <qpe/ir.h>
@@ -34,4 +34,2 @@
34	#include <qmenubar.h>	34	#include <qmenubar.h>
35	// #include <qtoolbar.h>
36	// #include <qmenubar.h>
37	#include <qpe/qpeapplication.h>	35	#include <qpe/qpeapplication.h>
@@ -95,3 +93,5 @@ AddressbookWindow::AddressbookWindow( QWidget parent, const char name,
95		93
96	QAction *a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );	94	QAction *a = new QAction( tr( "Start Search" ),
		95	Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
		96	QString::null, 0, this, 0 );
97	connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );	97	connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
@@ -102,11 +102,14 @@ AddressbookWindow::AddressbookWindow( QWidget parent, const char name,
102		102
103	m_actionMail = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "addressbook/sendmail" ),	103	m_actionMail = new QAction( tr( "Write Mail To" ),
104	QString::null, 0, items, 0 );	104	Opie::Core::OResource::loadPixmap( "addressbook/sendmail" ),
		105	QString::null, 0, items, 0 );
105	connect( m_actionMail, SIGNAL(activated()), this, SLOT(writeMail()) );	106	connect( m_actionMail, SIGNAL(activated()), this, SLOT(writeMail()) );
106		107
107	a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"),	108	a = new QAction( tr("Import vCard"),
108	QString::null, 0, items, 0 );	109	Opie::Core::OResource::loadPixmap( "addressbook/fileimport" ),
		110	QString::null, 0, items, 0 );
109	connect( a, SIGNAL(activated()), this, SLOT(importvCard()) );	111	connect( a, SIGNAL(activated()), this, SLOT(importvCard()) );
110		112
111	a = new QAction( tr("Export vCard"), Resource::loadPixmap( "addressbook/fileexport"),	113	a = new QAction( tr("Export vCard"),
		114	Opie::Core::OResource::loadPixmap( "addressbook/fileexport" ),
112	QString::null, 0, items, 0 );	115	QString::null, 0, items, 0 );
@@ -114,4 +117,5 @@ AddressbookWindow::AddressbookWindow( QWidget parent, const char name,
114		117
115	m_actionPersonal = new QAction( tr("My Personal Details"), Resource::loadPixmap( "addressbook/identity" ),	118	m_actionPersonal = new QAction( tr("My Personal Details"),
116	QString::null, 0, items, 0 , true );	119	Opie::Core::OResource::loadPixmap( "addressbook/identity" ),
		120	QString::null, 0, items, 0 , true );
117	connect( m_actionPersonal, SIGNAL(activated()), this, SLOT(slotPersonalView()) );	121	connect( m_actionPersonal, SIGNAL(activated()), this, SLOT(slotPersonalView()) );


diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index 61e6c7e..a491fc7 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp
@@ -4,5 +4,4 @@
4	#include <opie2/opimcontact.h>	4	#include <opie2/opimcontact.h>
5	#include "opie2/opimcontactfields.h"	5	#include <opie2/opimcontactfields.h>
6		6	#include <opie2/oresource.h>
7	#include <qpe/resource.h>
8		7
@@ -27,6 +26,6 @@ ConfigDlg::ConfigDlg( QWidget parent, const char name):
27	// Set Pics to Buttons and Tabs	26	// Set Pics to Buttons and Tabs
28	m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );	27	m_upButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/up" ) ) );
29	m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );	28	m_downButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/down" ) ) );
30	m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );	29	m_addButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/add" ) ) );
31	m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );	30	m_removeButton->setIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "addressbook/sub" ) ) );
32		31


diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index dec4c7c..4a0059a 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp
@@ -26,2 +26,3 @@
26	#include <opie2/opimcontact.h>	26	#include <opie2/opimcontact.h>
		27	#include <opie2/oresource.h>
27		28
@@ -30,3 +31,2 @@
30	#include <qpe/qpedialog.h>	31	#include <qpe/qpedialog.h>
31	#include <qpe/resource.h>
32		32
@@ -219,3 +219,4 @@ void ContactEditor::init() {
219		219
220	btnNote = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Notes..." ), container );	220	btnNote = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
		221	tr( "Notes..." ), container );
221	gl->addWidget( btnNote, 9, 1 );	222	gl->addWidget( btnNote, 9, 1 );
@@ -532,3 +533,3 @@ void ContactEditor::init() {
532		533
533	QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),	534	QPushButton* deleteButton = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
534	tr( "Delete" ),	535	tr( "Delete" ),
@@ -557,3 +558,3 @@ void ContactEditor::init() {
557		558
558	deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),	559	deleteButton = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
559	tr( "Delete" ),	560	tr( "Delete" ),