Diffstat (limited to 'core/pim/addressbook/contacteditor.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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) ) ); |