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 /core/pim | |
parent | cd1b15147d372d8786c855764d397553651c358d (diff) | |
download | opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.zip opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.gz opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.bz2 |
Use OResource for loading images
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 22 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 20 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg.cpp | 13 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 9 |
4 files changed, 34 insertions, 30 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 @@ | |||
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,3 +102,4 @@ 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 | Opie::Core::OResource::loadPixmap( "addressbook/sendmail" ), | ||
104 | QString::null, 0, items, 0 ); | 105 | QString::null, 0, items, 0 ); |
@@ -106,3 +107,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
106 | 107 | ||
107 | a = new QAction( tr("Import vCard"), Resource::loadPixmap( "addressbook/fileimport"), | 108 | a = new QAction( tr("Import vCard"), |
109 | Opie::Core::OResource::loadPixmap( "addressbook/fileimport" ), | ||
108 | QString::null, 0, items, 0 ); | 110 | QString::null, 0, items, 0 ); |
@@ -110,3 +112,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
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,3 +117,4 @@ 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"), |
119 | Opie::Core::OResource::loadPixmap( "addressbook/identity" ), | ||
116 | QString::null, 0, items, 0 , true ); | 120 | QString::null, 0, items, 0 , true ); |
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" ), |