summaryrefslogtreecommitdiff
authordrw <drw>2005-04-06 22:41:05 (UTC)
committer drw <drw>2005-04-06 22:41:05 (UTC)
commit6ea302df768201e4ab8dd2ec797a5cc9ea6589bf (patch) (unidiff)
tree9cffcfa9fecd49d0d6a0498de0cccd9aef52bf75
parentcd1b15147d372d8786c855764d397553651c358d (diff)
downloadopie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.zip
opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.gz
opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.bz2
Use OResource for loading images
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abtable.cpp22
-rw-r--r--core/pim/addressbook/addressbook.cpp26
-rw-r--r--core/pim/addressbook/configdlg.cpp13
-rw-r--r--core/pim/addressbook/contacteditor.cpp9
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
@@ -18,15 +18,15 @@
18** not clear to you. 18** not clear to you.
19** 19**
20**********************************************************************/ 20**********************************************************************/
21 21
22#include <opie2/odebug.h> 22#include <opie2/odebug.h>
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
28#include "abtable.h" 28#include "abtable.h"
29 29
30#include <errno.h> 30#include <errno.h>
31#include <fcntl.h> 31#include <fcntl.h>
32#include <unistd.h> 32#include <unistd.h>
@@ -626,18 +626,18 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
626 case Qtopia::FileAs: 626 case Qtopia::FileAs:
627 item.value = entry.fileAs(); 627 item.value = entry.fileAs();
628 break; 628 break;
629 case Qtopia::DefaultEmail: 629 case Qtopia::DefaultEmail:
630 item.value = entry.defaultEmail(); 630 item.value = entry.defaultEmail();
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;
634 case Qtopia::Emails: 634 case Qtopia::Emails:
635 item.value = entry.emails(); 635 item.value = entry.emails();
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;
639 case Qtopia::HomeStreet: 639 case Qtopia::HomeStreet:
640 item.value = entry.homeStreet(); 640 item.value = entry.homeStreet();
641 break; 641 break;
642 case Qtopia::HomeCity: 642 case Qtopia::HomeCity:
643 item.value = entry.homeCity(); 643 item.value = entry.homeCity();
@@ -651,28 +651,28 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
651 case Qtopia::HomeCountry: 651 case Qtopia::HomeCountry:
652 item.value = entry.homeCountry(); 652 item.value = entry.homeCountry();
653 break; 653 break;
654 case Qtopia::HomePhone: 654 case Qtopia::HomePhone:
655 item.value = entry.homePhone(); 655 item.value = entry.homePhone();
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;
659 case Qtopia::HomeFax: 659 case Qtopia::HomeFax:
660 item.value = entry.homeFax(); 660 item.value = entry.homeFax();
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;
664 case Qtopia::HomeMobile: 664 case Qtopia::HomeMobile:
665 item.value = entry.homeMobile(); 665 item.value = entry.homeMobile();
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;
669 case Qtopia::HomeWebPage: 669 case Qtopia::HomeWebPage:
670 item.value = entry.homeWebpage(); 670 item.value = entry.homeWebpage();
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;
674 case Qtopia::Company: 674 case Qtopia::Company:
675 item.value = entry.company(); 675 item.value = entry.company();
676 break; 676 break;
677 case Qtopia::BusinessCity: 677 case Qtopia::BusinessCity:
678 item.value = entry.businessCity(); 678 item.value = entry.businessCity();
@@ -686,13 +686,13 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
686 case Qtopia::BusinessCountry: 686 case Qtopia::BusinessCountry:
687 item.value = entry.businessCountry(); 687 item.value = entry.businessCountry();
688 break; 688 break;
689 case Qtopia::BusinessWebPage: 689 case Qtopia::BusinessWebPage:
690 item.value = entry.businessWebpage(); 690 item.value = entry.businessWebpage();
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;
694 case Qtopia::JobTitle: 694 case Qtopia::JobTitle:
695 item.value = entry.jobTitle(); 695 item.value = entry.jobTitle();
696 break; 696 break;
697 case Qtopia::Department: 697 case Qtopia::Department:
698 item.value = entry.department(); 698 item.value = entry.department();
@@ -700,23 +700,23 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /*
700 case Qtopia::Office: 700 case Qtopia::Office:
701 item.value = entry.office(); 701 item.value = entry.office();
702 break; 702 break;
703 case Qtopia::BusinessPhone: 703 case Qtopia::BusinessPhone:
704 item.value = entry.businessPhone(); 704 item.value = entry.businessPhone();
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;
708 case Qtopia::BusinessFax: 708 case Qtopia::BusinessFax:
709 item.value = entry.businessFax(); 709 item.value = entry.businessFax();
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;
713 case Qtopia::BusinessMobile: 713 case Qtopia::BusinessMobile:
714 item.value = entry.businessMobile(); 714 item.value = entry.businessMobile();
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;
718 case Qtopia::BusinessPager: 718 case Qtopia::BusinessPager:
719 item.value = entry.businessPager(); 719 item.value = entry.businessPager();
720 break; 720 break;
721 case Qtopia::Profession: 721 case Qtopia::Profession:
722 item.value = entry.profession(); 722 item.value = entry.profession();
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
@@ -24,19 +24,17 @@
24 24
25#include <opie2/odebug.h> 25#include <opie2/odebug.h>
26#include <opie2/ofileselector.h> 26#include <opie2/ofileselector.h>
27#include <opie2/ofiledialog.h> 27#include <opie2/ofiledialog.h>
28#include <opie2/opimcontact.h> 28#include <opie2/opimcontact.h>
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>
33#include <qpe/qpemessagebox.h> 33#include <qpe/qpemessagebox.h>
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>
38 36
39#include <qaction.h> 37#include <qaction.h>
40#include <qlayout.h> 38#include <qlayout.h>
41#include <qmessagebox.h> 39#include <qmessagebox.h>
42#include <qtoolbutton.h> 40#include <qtoolbutton.h>
@@ -90,33 +88,39 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
90 m_searchBar->hide(); 88 m_searchBar->hide();
91 m_searchEdit = new QLineEdit( m_searchBar, "m_searchEdit" ); 89 m_searchEdit = new QLineEdit( m_searchBar, "m_searchEdit" );
92 90
93 m_searchBar->setStretchableWidget( m_searchEdit ); 91 m_searchBar->setStretchableWidget( m_searchEdit );
94 connect( m_searchEdit, SIGNAL(returnPressed()), this, SLOT(slotFind()) ); 92 connect( m_searchEdit, SIGNAL(returnPressed()), this, SLOT(slotFind()) );
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()) );
98 a->addTo( m_searchBar ); 98 a->addTo( m_searchBar );
99 99
100 // Insert Contact menu items 100 // Insert Contact menu items
101 QActionGroup *items = new QActionGroup( this, QString::null, false ); 101 QActionGroup *items = new QActionGroup( this, QString::null, false );
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 );
113 connect( a, SIGNAL(activated()), this, SLOT(exportvCard()) ); 116 connect( a, SIGNAL(activated()), this, SLOT(exportvCard()) );
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()) );
118 122
119 insertItemMenuItems( items ); 123 insertItemMenuItems( items );
120 124
121 // Insert View menu items 125 // Insert View menu items
122 items = new QActionGroup( this, QString::null, false ); 126 items = new QActionGroup( this, QString::null, false );
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
@@ -1,13 +1,12 @@
1#include "configdlg.h" 1#include "configdlg.h"
2 2
3#include <opie2/odebug.h> 3#include <opie2/odebug.h>
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
9#include <qcheckbox.h> 8#include <qcheckbox.h>
10#include <qradiobutton.h> 9#include <qradiobutton.h>
11#include <qlistbox.h> 10#include <qlistbox.h>
12#include <qpushbutton.h> 11#include <qpushbutton.h>
13 12
@@ -22,16 +21,16 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
22 } 21 }
23 22
24 // Reset Widget Flags: This was not changeable by designer :( 23 // Reset Widget Flags: This was not changeable by designer :(
25 setWFlags ( WStyle_ContextHelp ); 24 setWFlags ( WStyle_ContextHelp );
26 25
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
33 32
34 // Get the translation maps between Field ID and translated strings 33 // Get the translation maps between Field ID and translated strings
35 m_mapStrToID = Opie::OPimContactFields::trFieldsToId(); 34 m_mapStrToID = Opie::OPimContactFields::trFieldsToId();
36 m_mapIDToStr = Opie::OPimContactFields::idToTrFields(); 35 m_mapIDToStr = Opie::OPimContactFields::idToTrFields();
37 36
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
@@ -21,17 +21,17 @@
21 21
22#include "contacteditor.h" 22#include "contacteditor.h"
23#include "namelineedit.h" 23#include "namelineedit.h"
24 24
25#include <opie2/odebug.h> 25#include <opie2/odebug.h>
26#include <opie2/opimcontact.h> 26#include <opie2/opimcontact.h>
27#include <opie2/oresource.h>
27 28
28#include <qpe/categoryselect.h> 29#include <qpe/categoryselect.h>
29#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
30#include <qpe/qpedialog.h> 31#include <qpe/qpedialog.h>
31#include <qpe/resource.h>
32 32
33#include <qlabel.h> 33#include <qlabel.h>
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qlineedit.h> 35#include <qlineedit.h>
36#include <qmultilineedit.h> 36#include <qmultilineedit.h>
37#include <qtoolbutton.h> 37#include <qtoolbutton.h>
@@ -214,13 +214,14 @@ void ContactEditor::init() {
214 gl->addWidget( labCat, 8, 0 ); 214 gl->addWidget( labCat, 8, 0 );
215 cmbCat = new CategorySelect( container ); 215 cmbCat = new CategorySelect( container );
216 gl->addWidget( cmbCat, 8, 1 ); 216 gl->addWidget( cmbCat, 8, 1 );
217 labCat->show(); 217 labCat->show();
218 cmbCat->show(); 218 cmbCat->show();
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 );
222 223
223 tabMain->addTab( m_generalWidget, "addressbook/AddressBookSmall", tr( "General" ) ); 224 tabMain->addTab( m_generalWidget, "addressbook/AddressBookSmall", tr( "General" ) );
224 225
225 QWidget *tabViewport = new QWidget ( tabMain ); 226 QWidget *tabViewport = new QWidget ( tabMain );
226 227
@@ -527,13 +528,13 @@ void ContactEditor::init() {
527 m1->insertItem( birthdayPicker ); 528 m1->insertItem( birthdayPicker );
528 529
529 birthdayButton= new QToolButton( hBox, "buttonStart" ); 530 birthdayButton= new QToolButton( hBox, "buttonStart" );
530 birthdayButton->setPopup( m1 ); 531 birthdayButton->setPopup( m1 );
531 birthdayButton->setPopupDelay(0); 532 birthdayButton->setPopupDelay(0);
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" ),
535 hBox, 0 ); 536 hBox, 0 );
536 537
537 gl->addWidget( hBox, counter , 1 ); 538 gl->addWidget( hBox, counter , 1 );
538 539
539 connect( birthdayPicker, SIGNAL( dateClicked(int,int,int) ), 540 connect( birthdayPicker, SIGNAL( dateClicked(int,int,int) ),
@@ -552,13 +553,13 @@ void ContactEditor::init() {
552 m1->insertItem( anniversaryPicker ); 553 m1->insertItem( anniversaryPicker );
553 554
554 anniversaryButton= new QToolButton( hBox, "buttonStart" ); 555 anniversaryButton= new QToolButton( hBox, "buttonStart" );
555 anniversaryButton->setPopup( m1 ); 556 anniversaryButton->setPopup( m1 );
556 anniversaryButton->setPopupDelay(0); 557 anniversaryButton->setPopupDelay(0);
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" ),
560 hBox, 0 ); 561 hBox, 0 );
561 gl->addWidget( hBox, counter , 1 ); 562 gl->addWidget( hBox, counter , 1 );
562 563
563 connect( anniversaryPicker, SIGNAL( dateClicked(int,int,int) ), 564 connect( anniversaryPicker, SIGNAL( dateClicked(int,int,int) ),
564 this, SLOT( slotAnniversaryDateChanged(int,int,int) ) ); 565 this, SLOT( slotAnniversaryDateChanged(int,int,int) ) );