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/addressbook/contacteditor.cpp | |
parent | cd1b15147d372d8786c855764d397553651c358d (diff) | |
download | opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.zip opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.gz opie-6ea302df768201e4ab8dd2ec797a5cc9ea6589bf.tar.bz2 |
Use OResource for loading images
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 | |||
@@ -3,53 +3,53 @@ | |||
3 | * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de) | 3 | * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de) |
4 | * | 4 | * |
5 | * This file is an add-on for the OPIE Palmtop Environment | 5 | * This file is an add-on for the OPIE Palmtop Environment |
6 | * | 6 | * |
7 | * This file may be distributed and/or modified under the terms of the | 7 | * This file may be distributed and/or modified under the terms of the |
8 | * GNU General Public License version 2 as published by the Free Software | 8 | * GNU General Public License version 2 as published by the Free Software |
9 | * Foundation and appearing in the file LICENSE.GPL included in the pacakaging | 9 | * Foundation and appearing in the file LICENSE.GPL included in the pacakaging |
10 | * of this file. | 10 | * of this file. |
11 | * | 11 | * |
12 | * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | * | 14 | * |
15 | * | 15 | * |
16 | * This is a rewrite of the abeditor.h file, modified to provide a more | 16 | * This is a rewrite of the abeditor.h file, modified to provide a more |
17 | * intuitive interface to TrollTech's original Address Book editor. This | 17 | * intuitive interface to TrollTech's original Address Book editor. This |
18 | * is made to operate exactly in interface with the exception of name. | 18 | * is made to operate exactly in interface with the exception of name. |
19 | * | 19 | * |
20 | */ | 20 | */ |
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> |
38 | #include <qlistbox.h> | 38 | #include <qlistbox.h> |
39 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
40 | #include <qwhatsthis.h> | 40 | #include <qwhatsthis.h> |
41 | 41 | ||
42 | #include <assert.h> | 42 | #include <assert.h> |
43 | 43 | ||
44 | static inline bool containsAlphaNum( const QString &str ); | 44 | static inline bool containsAlphaNum( const QString &str ); |
45 | static inline bool constainsWhiteSpace( const QString &str ); | 45 | static inline bool constainsWhiteSpace( const QString &str ); |
46 | 46 | ||
47 | // helper functions, convert our comma delimited list to proper | 47 | // helper functions, convert our comma delimited list to proper |
48 | // file format... | 48 | // file format... |
49 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 49 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
50 | QString &strAll ); | 50 | QString &strAll ); |
51 | 51 | ||
52 | // helper convert from file format to comma delimited... | 52 | // helper convert from file format to comma delimited... |
53 | void parseEmailTo( const QString &strDefaultEmail, | 53 | void parseEmailTo( const QString &strDefaultEmail, |
54 | const QString &strOtherEmail, QString &strBack ); | 54 | const QString &strOtherEmail, QString &strBack ); |
55 | 55 | ||
@@ -196,49 +196,50 @@ void ContactEditor::init() { | |||
196 | QWhatsThis::add( cmbChooserField3, tr( "Press to select attribute to change" ) ); | 196 | QWhatsThis::add( cmbChooserField3, tr( "Press to select attribute to change" ) ); |
197 | cmbChooserField3->setMaximumWidth( 90 ); | 197 | cmbChooserField3->setMaximumWidth( 90 ); |
198 | gl->addWidget( cmbChooserField3, 6, 0 ); | 198 | gl->addWidget( cmbChooserField3, 6, 0 ); |
199 | // Textfield for chooser 2 | 199 | // Textfield for chooser 2 |
200 | // Now use WidgetStack to contain the textfield and the default-email combo! | 200 | // Now use WidgetStack to contain the textfield and the default-email combo! |
201 | m_widgetStack3 = new QWidgetStack( container ); | 201 | m_widgetStack3 = new QWidgetStack( container ); |
202 | txtChooserField3 = new QLineEdit( m_widgetStack3 ); | 202 | txtChooserField3 = new QLineEdit( m_widgetStack3 ); |
203 | m_widgetStack3 -> addWidget( txtChooserField3, TextField ); | 203 | m_widgetStack3 -> addWidget( txtChooserField3, TextField ); |
204 | gl->addWidget( m_widgetStack3, 6, 1 ); | 204 | gl->addWidget( m_widgetStack3, 6, 1 ); |
205 | m_widgetStack3 -> raiseWidget( TextField ); | 205 | m_widgetStack3 -> raiseWidget( TextField ); |
206 | 206 | ||
207 | l = new QLabel( tr( "File As" ), container ); | 207 | l = new QLabel( tr( "File As" ), container ); |
208 | QWhatsThis::add( l, tr( "Press to select how to store the name (and howto show it in the listview)" ) ); | 208 | QWhatsThis::add( l, tr( "Press to select how to store the name (and howto show it in the listview)" ) ); |
209 | gl->addWidget( l, 7, 0 ); | 209 | gl->addWidget( l, 7, 0 ); |
210 | cmbFileAs = new QComboBox( true, container ); | 210 | cmbFileAs = new QComboBox( true, container ); |
211 | gl->addWidget( cmbFileAs, 7, 1 ); | 211 | gl->addWidget( cmbFileAs, 7, 1 ); |
212 | 212 | ||
213 | labCat = new QLabel( tr( "Category" ), container ); | 213 | labCat = new QLabel( tr( "Category" ), container ); |
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 | ||
227 | vb = new QVBoxLayout( tabViewport ); | 228 | vb = new QVBoxLayout( tabViewport ); |
228 | 229 | ||
229 | svAddress = new QScrollView( tabViewport ); | 230 | svAddress = new QScrollView( tabViewport ); |
230 | vb->addWidget( svAddress, 0, 0 ); | 231 | vb->addWidget( svAddress, 0, 0 ); |
231 | svAddress->setResizePolicy( QScrollView::AutoOneFit ); | 232 | svAddress->setResizePolicy( QScrollView::AutoOneFit ); |
232 | svAddress->setFrameStyle( QFrame::NoFrame ); | 233 | svAddress->setFrameStyle( QFrame::NoFrame ); |
233 | 234 | ||
234 | container = new QWidget( svAddress->viewport() ); | 235 | container = new QWidget( svAddress->viewport() ); |
235 | svAddress->addChild( container ); | 236 | svAddress->addChild( container ); |
236 | 237 | ||
237 | gl = new QGridLayout( container, 8, 3, 2, 4 ); // row 7 QSpacerItem | 238 | gl = new QGridLayout( container, 8, 3, 2, 4 ); // row 7 QSpacerItem |
238 | 239 | ||
239 | cmbAddress = new QComboBox( false, container ); | 240 | cmbAddress = new QComboBox( false, container ); |
240 | cmbAddress->insertItem( tr( "Business" ) ); | 241 | cmbAddress->insertItem( tr( "Business" ) ); |
241 | cmbAddress->insertItem( tr( "Home" ) ); | 242 | cmbAddress->insertItem( tr( "Home" ) ); |
242 | gl->addMultiCellWidget( cmbAddress, 0, 0, 0, 1 ); | 243 | gl->addMultiCellWidget( cmbAddress, 0, 0, 0, 1 ); |
243 | 244 | ||
244 | l = new QLabel( tr( "Address" ), container ); | 245 | l = new QLabel( tr( "Address" ), container ); |
@@ -509,74 +510,74 @@ void ContactEditor::init() { | |||
509 | vb->addWidget( svDetails, 0, 0 ); | 510 | vb->addWidget( svDetails, 0, 0 ); |
510 | svDetails->setResizePolicy( QScrollView::AutoOneFit ); | 511 | svDetails->setResizePolicy( QScrollView::AutoOneFit ); |
511 | svDetails->setFrameStyle( QFrame::NoFrame ); | 512 | svDetails->setFrameStyle( QFrame::NoFrame ); |
512 | 513 | ||
513 | container = new QWidget( svDetails->viewport() ); | 514 | container = new QWidget( svDetails->viewport() ); |
514 | svDetails->addChild( container ); | 515 | svDetails->addChild( container ); |
515 | 516 | ||
516 | gl = new QGridLayout( container, 1, 2, 2, 4 ); | 517 | gl = new QGridLayout( container, 1, 2, 2, 4 ); |
517 | 518 | ||
518 | int counter = 0; | 519 | int counter = 0; |
519 | 520 | ||
520 | // Birthday | 521 | // Birthday |
521 | QHBox* hBox = new QHBox( container ); | 522 | QHBox* hBox = new QHBox( container ); |
522 | l = new QLabel( tr("Birthday"), container ); | 523 | l = new QLabel( tr("Birthday"), container ); |
523 | gl->addWidget( l, counter, 0 ); | 524 | gl->addWidget( l, counter, 0 ); |
524 | 525 | ||
525 | QPopupMenu* m1 = new QPopupMenu( container ); | 526 | QPopupMenu* m1 = new QPopupMenu( container ); |
526 | birthdayPicker = new DateBookMonth( m1, 0, true ); | 527 | birthdayPicker = new DateBookMonth( m1, 0, true ); |
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) ), |
540 | this, SLOT( slotBirthdayDateChanged(int,int,int) ) ); | 541 | this, SLOT( slotBirthdayDateChanged(int,int,int) ) ); |
541 | connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveBirthday() ) ); | 542 | connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveBirthday() ) ); |
542 | 543 | ||
543 | ++counter; | 544 | ++counter; |
544 | 545 | ||
545 | // Anniversary | 546 | // Anniversary |
546 | hBox = new QHBox( container ); | 547 | hBox = new QHBox( container ); |
547 | l = new QLabel( tr("Anniversary"), container ); | 548 | l = new QLabel( tr("Anniversary"), container ); |
548 | gl->addWidget( l, counter, 0 ); | 549 | gl->addWidget( l, counter, 0 ); |
549 | 550 | ||
550 | m1 = new QPopupMenu( container ); | 551 | m1 = new QPopupMenu( container ); |
551 | anniversaryPicker = new DateBookMonth( m1, 0, true ); | 552 | anniversaryPicker = new DateBookMonth( m1, 0, true ); |
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) ) ); |
565 | connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveAnniversary() ) ); | 566 | connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveAnniversary() ) ); |
566 | 567 | ||
567 | ++counter; | 568 | ++counter; |
568 | 569 | ||
569 | // Gender | 570 | // Gender |
570 | l = new QLabel( tr("Gender"), container ); | 571 | l = new QLabel( tr("Gender"), container ); |
571 | gl->addWidget( l, counter, 0 ); | 572 | gl->addWidget( l, counter, 0 ); |
572 | cmbGender = new QComboBox( container ); | 573 | cmbGender = new QComboBox( container ); |
573 | cmbGender->insertItem( "", 0 ); | 574 | cmbGender->insertItem( "", 0 ); |
574 | cmbGender->insertItem( tr("Male"), 1); | 575 | cmbGender->insertItem( tr("Male"), 1); |
575 | cmbGender->insertItem( tr("Female"), 2); | 576 | cmbGender->insertItem( tr("Female"), 2); |
576 | gl->addWidget( cmbGender, counter, 1 ); | 577 | gl->addWidget( cmbGender, counter, 1 ); |
577 | 578 | ||
578 | ++counter; | 579 | ++counter; |
579 | 580 | ||
580 | // Create Labels and lineedit fields for every dynamic entry | 581 | // Create Labels and lineedit fields for every dynamic entry |
581 | QStringList::ConstIterator it = slDynamicEntries.begin(); | 582 | QStringList::ConstIterator it = slDynamicEntries.begin(); |
582 | QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId(); | 583 | QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId(); |