summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp21
-rw-r--r--core/pim/addressbook/contacteditor.cpp348
-rw-r--r--core/pim/addressbook/contacteditor.h18
3 files changed, 208 insertions, 179 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index beb953a..8229212 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -192,5 +192,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
192 listContainer = new QWidget( this ); 192 listContainer = new QWidget( this );
193 193
194 QVBoxLayout *vb = new QVBoxLayout( listContainer ); 194 QVBoxLayout *vb = new QVBoxLayout( listContainer );
195 195
196 abList = new AbTable( &orderedFields, listContainer, "table" ); 196 abList = new AbTable( &orderedFields, listContainer, "table" );
@@ -235,3 +235,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
235 slotSetFont(startFontSize); 235 slotSetFont(startFontSize);
236 236
237 mbList->insertItem( tr("Font"), fontMenu); 237 mbList->insertItem( tr("Font"), fontMenu);
@@ -249,3 +249,3 @@ void AddressbookWindow::slotSetFont( int size ) {
249 QFont *currentFont; 249 QFont *currentFont;
250 250
251 switch (size) { 251 switch (size) {
@@ -473,3 +473,3 @@ static void parseName( const QString& name, QString *first, QString *middle,
473 } 473 }
474 474
475} 475}
@@ -505,3 +505,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
505 } else { 505 } else {
506 abEditor->setEntry( cnt ); 506 abEditor->setEntry( cnt );
507 } 507 }
@@ -796,3 +796,3 @@ void AddressbookWindow::initFields()
796 startFontSize = cfg.readNumEntry( "fontSize", 1 ); 796 startFontSize = cfg.readNumEntry( "fontSize", 1 );
797 797
798 798
@@ -861,3 +861,3 @@ void AddressbookWindow::slotFind()
861 showList(); 861 showList();
862 862
863 FindDialog frmFind( "Contacts", this ); 863 FindDialog frmFind( "Contacts", this );
@@ -866,5 +866,5 @@ void AddressbookWindow::slotFind()
866 QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); 866 QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
867 867
868 frmFind.exec(); 868 frmFind.exec();
869 869
870 if ( abList->numSelections() ) 870 if ( abList->numSelections() )
@@ -908,2 +908,3 @@ void AddressbookWindow::populateCategories()
908 id = 1; 908 id = 1;
909 rememberId = 0;
909 catMenu->insertItem( tr( "All" ), id++ ); 910 catMenu->insertItem( tr( "All" ), id++ );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index e74da87..fa60f98 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -59,5 +59,5 @@ ContactEditor::ContactEditor( const Contact &entry,
59 orderedValues( newOrderedValues ), 59 orderedValues( newOrderedValues ),
60 slOrdered( slNewOrdered ) 60 slOrdered( *slNewOrdered )
61{ 61{
62 62
63 init(); 63 init();
@@ -76,3 +76,3 @@ void ContactEditor::init() {
76 int i = 0; 76 int i = 0;
77 77/** SHut up and stop leaking
78 slHomeAddress = new QStringList; 78 slHomeAddress = new QStringList;
@@ -83,3 +83,3 @@ void ContactEditor::init() {
83 slDynamicEntries = new QStringList; 83 slDynamicEntries = new QStringList;
84 84*/
85 //*slDynamicEntries = *slOrdered; 85 //*slDynamicEntries = *slOrdered;
@@ -87,4 +87,4 @@ void ContactEditor::init() {
87 for (i = 0; i <= 6; i++) { 87 for (i = 0; i <= 6; i++) {
88 slHomeAddress->append( "" ); 88 slHomeAddress.append( "" );
89 slBusinessAddress->append( "" ); 89 slBusinessAddress.append( "" );
90 } 90 }
@@ -103,9 +103,9 @@ void ContactEditor::init() {
103 hasCountry = FALSE; 103 hasCountry = FALSE;
104 104
105 QStringList::ConstIterator it = slOrdered->begin(); 105 QStringList::ConstIterator it = slOrdered.begin();
106 for ( i = 0; it != slOrdered->end(); i++, ++it ) { 106 for ( i = 0; it != slOrdered.end(); i++, ++it ) {
107 107
108 if ( (*it).right( 3 ) == tr( "Fax" ) ) { 108 if ( (*it).right( 3 ) == tr( "Fax" ) ) {
109 slChooserNames->append( *it ); 109 slChooserNames.append( *it );
110 slChooserValues->append( tr( "" ) ); 110 slChooserValues.append("" );
111 //slDynamicEntries->remove( it ); 111 //slDynamicEntries->remove( it );
@@ -115,4 +115,4 @@ void ContactEditor::init() {
115 if ( (*it).right( 5 ) == tr( "Phone" ) ) { 115 if ( (*it).right( 5 ) == tr( "Phone" ) ) {
116 slChooserNames->append( *it ); 116 slChooserNames.append( *it );
117 slChooserValues->append( "" ); 117 slChooserValues.append( "" );
118 //slDynamicEntries->remove( it ); 118 //slDynamicEntries->remove( it );
@@ -122,4 +122,4 @@ void ContactEditor::init() {
122 if ( (*it).right( 2 ) == tr( "IM" ) ) { 122 if ( (*it).right( 2 ) == tr( "IM" ) ) {
123 slChooserNames->append( *it ); 123 slChooserNames.append( *it );
124 slChooserValues->append( "" ); 124 slChooserValues.append( "" );
125 //slDynamicEntries->remove( it ); 125 //slDynamicEntries->remove( it );
@@ -129,4 +129,4 @@ void ContactEditor::init() {
129 if ( (*it).right( 6 ) == tr( "Mobile" ) ) { 129 if ( (*it).right( 6 ) == tr( "Mobile" ) ) {
130 slChooserNames->append( *it ); 130 slChooserNames.append( *it );
131 slChooserValues->append( "" ); 131 slChooserValues.append( "" );
132 //slDynamicEntries->remove( it ); 132 //slDynamicEntries->remove( it );
@@ -136,4 +136,4 @@ void ContactEditor::init() {
136 if ( (*it).right( 4 ) == tr( "Page" ) ) { 136 if ( (*it).right( 4 ) == tr( "Page" ) ) {
137 slChooserNames->append( *it ); 137 slChooserNames.append( *it );
138 slChooserValues->append( "" ); 138 slChooserValues.append( "" );
139 //slDynamicEntries->remove( it ); 139 //slDynamicEntries->remove( it );
@@ -143,4 +143,4 @@ void ContactEditor::init() {
143 if ( (*it).right( 5 ) == tr( "Pager" ) ) { 143 if ( (*it).right( 5 ) == tr( "Pager" ) ) {
144 slChooserNames->append( *it ); 144 slChooserNames.append( *it );
145 slChooserValues->append( "" ); 145 slChooserValues.append( "" );
146 //slDynamicEntries->remove( it ); 146 //slDynamicEntries->remove( it );
@@ -150,4 +150,4 @@ void ContactEditor::init() {
150 if ( *it == tr( "Default Email" ) ) { 150 if ( *it == tr( "Default Email" ) ) {
151 slChooserNames->append( *it ); 151 slChooserNames.append( *it );
152 slChooserValues->append( "" ); 152 slChooserValues.append( "" );
153 //slDynamicEntries->remove( it ); 153 //slDynamicEntries->remove( it );
@@ -157,4 +157,4 @@ void ContactEditor::init() {
157 if ( *it == tr( "Emails" ) ) { 157 if ( *it == tr( "Emails" ) ) {
158 slChooserNames->append( *it ); 158 slChooserNames.append( *it );
159 slChooserValues->append( "" ); 159 slChooserValues.append( "" );
160 //slDynamicEntries->remove( it ); 160 //slDynamicEntries->remove( it );
@@ -167,3 +167,3 @@ void ContactEditor::init() {
167 } 167 }
168 168
169 if ( *it == tr( "First Name" ) ) { 169 if ( *it == tr( "First Name" ) ) {
@@ -172,3 +172,3 @@ void ContactEditor::init() {
172 } 172 }
173 173
174 if ( *it == tr( "Middle Name" ) ) { 174 if ( *it == tr( "Middle Name" ) ) {
@@ -177,3 +177,3 @@ void ContactEditor::init() {
177 } 177 }
178 178
179 if ( *it == tr( "Last Name" ) ) { 179 if ( *it == tr( "Last Name" ) ) {
@@ -182,3 +182,3 @@ void ContactEditor::init() {
182 } 182 }
183 183
184 if ( *it == tr( "Suffix" ) ) { 184 if ( *it == tr( "Suffix" ) ) {
@@ -192,3 +192,3 @@ void ContactEditor::init() {
192 } 192 }
193 193
194 if ( *it == tr( "Gender" ) ) { 194 if ( *it == tr( "Gender" ) ) {
@@ -198,3 +198,3 @@ void ContactEditor::init() {
198 } 198 }
199 199
200 if ( *it == tr( "Job Title" ) ) { 200 if ( *it == tr( "Job Title" ) ) {
@@ -204,3 +204,3 @@ void ContactEditor::init() {
204 } 204 }
205 205
206 if ( *it == tr( "Company" ) ) { 206 if ( *it == tr( "Company" ) ) {
@@ -210,3 +210,3 @@ void ContactEditor::init() {
210 } 210 }
211 211
212 if ( *it == tr( "Notes" ) ) { 212 if ( *it == tr( "Notes" ) ) {
@@ -216,3 +216,3 @@ void ContactEditor::init() {
216 } 216 }
217 217
218 if ( *it == tr( "Groups" ) ) { 218 if ( *it == tr( "Groups" ) ) {
@@ -221,3 +221,3 @@ void ContactEditor::init() {
221 } 221 }
222 222
223 if ( (*it).right( 6 ) == tr( "Street" ) ) { 223 if ( (*it).right( 6 ) == tr( "Street" ) ) {
@@ -227,3 +227,3 @@ void ContactEditor::init() {
227 } 227 }
228 228
229 if ( (*it).right( 8 ) == tr( "Street 2" ) ) { 229 if ( (*it).right( 8 ) == tr( "Street 2" ) ) {
@@ -233,3 +233,3 @@ void ContactEditor::init() {
233 } 233 }
234 234
235 if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) { 235 if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) {
@@ -239,3 +239,3 @@ void ContactEditor::init() {
239 } 239 }
240 240
241 if ( (*it).right( 4 ) == tr( "City" ) ) { 241 if ( (*it).right( 4 ) == tr( "City" ) ) {
@@ -245,3 +245,3 @@ void ContactEditor::init() {
245 } 245 }
246 246
247 if ( (*it).right( 5 ) == tr( "State" ) ) { 247 if ( (*it).right( 5 ) == tr( "State" ) ) {
@@ -251,3 +251,3 @@ void ContactEditor::init() {
251 } 251 }
252 252
253 if ( (*it).right( 3 ) == tr( "Zip" ) ) { 253 if ( (*it).right( 3 ) == tr( "Zip" ) ) {
@@ -257,3 +257,3 @@ void ContactEditor::init() {
257 } 257 }
258 258
259 if ( (*it).right( 7 ) == tr( "Country" ) ) { 259 if ( (*it).right( 7 ) == tr( "Country" ) ) {
@@ -264,3 +264,3 @@ void ContactEditor::init() {
264 264
265 slDynamicEntries->append( *it ); 265 slDynamicEntries.append( *it );
266 } 266 }
@@ -269,6 +269,6 @@ void ContactEditor::init() {
269 QVBoxLayout *vb = new QVBoxLayout( this ); 269 QVBoxLayout *vb = new QVBoxLayout( this );
270 270
271 tabMain = new QTabWidget( this ); 271 tabMain = new QTabWidget( this );
272 vb->addWidget( tabMain ); 272 vb->addWidget( tabMain );
273 273
274 QWidget *tabViewport = new QWidget ( tabMain ); 274 QWidget *tabViewport = new QWidget ( tabMain );
@@ -348,3 +348,3 @@ void ContactEditor::init() {
348 348
349 gl = new QGridLayout( container, 6, 3, 2, 4 ); 349 gl = new QGridLayout( container, 8, 3, 2, 4 ); // row 7 QSpacerItem
350 350
@@ -362,3 +362,3 @@ void ContactEditor::init() {
362 gl->addWidget( l, 2, 0 ); 362 gl->addWidget( l, 2, 0 );
363 txtAddress2 = new QLineEdit( container ); 363 txtAddress2 = new QLineEdit( container );
364 gl->addMultiCellWidget( txtAddress2, 2, 2, 1, 2 ); 364 gl->addMultiCellWidget( txtAddress2, 2, 2, 1, 2 );
@@ -609,2 +609,8 @@ void ContactEditor::init() {
609 gl->addMultiCellWidget( txtChooserField4, 6, 6, 1, 2 ); 609 gl->addMultiCellWidget( txtChooserField4, 6, 6, 1, 2 );
610
611 QSpacerItem *space = new QSpacerItem(1,1,
612 QSizePolicy::Maximum,
613 QSizePolicy::MinimumExpanding );
614 gl->addItem( space, 7, 0 );
615
610 tabMain->insertTab( tabViewport, tr( "Address" ) ); 616 tabMain->insertTab( tabViewport, tr( "Address" ) );
@@ -625,4 +631,4 @@ void ContactEditor::init() {
625 631
626 QStringList::ConstIterator it = slDynamicEntries->begin(); 632 QStringList::ConstIterator it = slDynamicEntries.begin();
627 for (i = 0; it != slDynamicEntries->end(); i++, ++it) { 633 for (i = 0; it != slDynamicEntries.end(); i++, ++it) {
628 l = new QLabel( *it, container ); 634 l = new QLabel( *it, container );
@@ -636,3 +642,3 @@ void ContactEditor::init() {
636 l = new QLabel( tr("Gender"), container ); 642 l = new QLabel( tr("Gender"), container );
637 gl->addWidget( l, slDynamicEntries->count(), 0 ); 643 gl->addWidget( l, slDynamicEntries.count(), 0 );
638 cmbGender = new QComboBox( container ); 644 cmbGender = new QComboBox( container );
@@ -641,6 +647,6 @@ void ContactEditor::init() {
641 cmbGender->insertItem( tr("Female"), 2); 647 cmbGender->insertItem( tr("Female"), 2);
642 gl->addWidget( cmbGender, slDynamicEntries->count(), 1 ); 648 gl->addWidget( cmbGender, slDynamicEntries.count(), 1 );
643 649
644 tabMain->insertTab( tabViewport, tr( "Details" ) ); 650 tabMain->insertTab( tabViewport, tr( "Details" ) );
645 651
646 dlgNote = new QDialog( this, "Note Dialog", TRUE ); 652 dlgNote = new QDialog( this, "Note Dialog", TRUE );
@@ -654,3 +660,3 @@ void ContactEditor::init() {
654 dlgName->setCaption( tr("Edit Name") ); 660 dlgName->setCaption( tr("Edit Name") );
655 gl = new QGridLayout( dlgName, 4, 2, 2, 3 ); 661 gl = new QGridLayout( dlgName, 5, 2, 2, 3 );
656 662
@@ -675,7 +681,11 @@ void ContactEditor::init() {
675 gl->addWidget( txtSuffix, 3, 1 ); 681 gl->addWidget( txtSuffix, 3, 1 );
682 space = new QSpacerItem(1,1,
683 QSizePolicy::Maximum,
684 QSizePolicy::MinimumExpanding );
685 gl->addItem( space, 4, 0 );
676 686
677 cmbChooserField1->insertStringList( *slChooserNames ); 687 cmbChooserField1->insertStringList( slChooserNames );
678 cmbChooserField2->insertStringList( *slChooserNames ); 688 cmbChooserField2->insertStringList( slChooserNames );
679 cmbChooserField3->insertStringList( *slChooserNames ); 689 cmbChooserField3->insertStringList( slChooserNames );
680 cmbChooserField4->insertStringList( *slChooserNames ); 690 cmbChooserField4->insertStringList( slChooserNames );
681 691
@@ -684,24 +694,40 @@ void ContactEditor::init() {
684 cmbChooserField3->setCurrentItem( 2 ); 694 cmbChooserField3->setCurrentItem( 2 );
685 695
686 connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) ); 696 connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
687 697
688 connect( txtFullName, SIGNAL(textChanged(const QString &)), this, SLOT(slotFullNameChange(const QString &)) ); 698 connect( txtFullName, SIGNAL(textChanged(const QString &)), this, SLOT(slotFullNameChange(const QString &)) );
689 699
690 connect( txtChooserField1, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser1Change(const QString &)) ); 700 connect( txtChooserField1, SIGNAL(textChanged(const QString &)),
691 connect( txtChooserField2, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser2Change(const QString &)) ); 701 this, SLOT(slotChooser1Change(const QString &)) );
692 connect( txtChooserField3, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser3Change(const QString &)) ); 702 connect( txtChooserField2, SIGNAL(textChanged(const QString &)),
693 connect( txtChooserField4, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser4Change(const QString &)) ); 703 this, SLOT(slotChooser2Change(const QString &)) );
694 connect( txtAddress, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddressChange(const QString &)) ); 704 connect( txtChooserField3, SIGNAL(textChanged(const QString &)),
695 //connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) ); 705 this, SLOT(slotChooser3Change(const QString &)) );
696 //connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) ); 706 connect( txtChooserField4, SIGNAL(textChanged(const QString &)),
697 connect( txtCity, SIGNAL(textChanged(const QString &)), this, SLOT(slotCityChange(const QString &)) ); 707 this, SLOT(slotChooser4Change(const QString &)) );
698 connect( txtState, SIGNAL(textChanged(const QString &)), this, SLOT(slotStateChange(const QString &)) ); 708 connect( txtAddress, SIGNAL(textChanged(const QString &)),
699 connect( txtZip, SIGNAL(textChanged(const QString &)), this, SLOT(slotZipChange(const QString &)) ); 709 this, SLOT(slotAddressChange(const QString &)) );
700 connect( cmbCountry, SIGNAL(textChanged(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); 710 //connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) );
701 connect( cmbCountry, SIGNAL(activated(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); 711 //connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) );
702 connect( cmbChooserField1, SIGNAL(activated(int)), this, SLOT(slotCmbChooser1Change(int)) ); 712 connect( txtCity, SIGNAL(textChanged(const QString &)),
703 connect( cmbChooserField2, SIGNAL(activated(int)), this, SLOT(slotCmbChooser2Change(int)) ); 713 this, SLOT(slotCityChange(const QString &)) );
704 connect( cmbChooserField3, SIGNAL(activated(int)), this, SLOT(slotCmbChooser3Change(int)) ); 714 connect( txtState, SIGNAL(textChanged(const QString &)),
705 connect( cmbChooserField4, SIGNAL(activated(int)), this, SLOT(slotCmbChooser4Change(int)) ); 715 this, SLOT(slotStateChange(const QString &)) );
706 connect( cmbAddress, SIGNAL(activated(int)), this, SLOT(slotAddressTypeChange(int)) ); 716 connect( txtZip, SIGNAL(textChanged(const QString &)),
717 this, SLOT(slotZipChange(const QString &)) );
718 connect( cmbCountry, SIGNAL(textChanged(const QString &)),
719 this, SLOT(slotCountryChange(const QString &)) );
720 connect( cmbCountry, SIGNAL(activated(const QString &)),
721 this, SLOT(slotCountryChange(const QString &)) );
722 connect( cmbChooserField1, SIGNAL(activated(int)),
723 this, SLOT(slotCmbChooser1Change(int)) );
724 connect( cmbChooserField2, SIGNAL(activated(int)),
725 this, SLOT(slotCmbChooser2Change(int)) );
726 connect( cmbChooserField3, SIGNAL(activated(int)),
727 this, SLOT(slotCmbChooser3Change(int)) );
728 connect( cmbChooserField4, SIGNAL(activated(int)),
729 this, SLOT(slotCmbChooser4Change(int)) );
730 connect( cmbAddress, SIGNAL(activated(int)),
731 this, SLOT(slotAddressTypeChange(int)) );
732
707 new QPEDialogListener(this); 733 new QPEDialogListener(this);
@@ -741,3 +767,3 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) {
741 767
742 (*slChooserValues)[index] = textChanged; 768 slChooserValues[index] = textChanged;
743 769
@@ -749,3 +775,3 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
749 775
750 (*slChooserValues)[index] = textChanged; 776 slChooserValues[index] = textChanged;
751 777
@@ -757,3 +783,3 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) {
757 783
758 (*slChooserValues)[index] = textChanged; 784 slChooserValues[index] = textChanged;
759 785
@@ -765,3 +791,3 @@ void ContactEditor::slotChooser4Change( const QString &textChanged ) {
765 791
766 (*slChooserValues)[index] = textChanged; 792 slChooserValues[index] = textChanged;
767 793
@@ -772,5 +798,5 @@ void ContactEditor::slotAddressChange( const QString &textChanged ) {
772 if ( cmbAddress->currentItem() == 0 ) { 798 if ( cmbAddress->currentItem() == 0 ) {
773 (*slBusinessAddress)[0] = textChanged; 799 slBusinessAddress[0] = textChanged;
774 } else { 800 } else {
775 (*slHomeAddress)[0] = textChanged; 801 slHomeAddress[0] = textChanged;
776 } 802 }
@@ -781,5 +807,5 @@ void ContactEditor::slotAddress2Change( const QString &textChanged ) {
781 if ( cmbAddress->currentItem() == 0 ) { 807 if ( cmbAddress->currentItem() == 0 ) {
782 (*slBusinessAddress)[1] = textChanged; 808 slBusinessAddress[1] = textChanged;
783 } else { 809 } else {
784 (*slHomeAddress)[1] = textChanged; 810 slHomeAddress[1] = textChanged;
785 } 811 }
@@ -790,5 +816,5 @@ void ContactEditor::slotPOBoxChange( const QString &textChanged ) {
790 if ( cmbAddress->currentItem() == 0 ) { 816 if ( cmbAddress->currentItem() == 0 ) {
791 (*slBusinessAddress)[2] = textChanged; 817 slBusinessAddress[2] = textChanged;
792 } else { 818 } else {
793 (*slHomeAddress)[2] = textChanged; 819 slHomeAddress[2] = textChanged;
794 } 820 }
@@ -799,5 +825,5 @@ void ContactEditor::slotCityChange( const QString &textChanged ) {
799 if ( cmbAddress->currentItem() == 0 ) { 825 if ( cmbAddress->currentItem() == 0 ) {
800 (*slBusinessAddress)[3] = textChanged; 826 slBusinessAddress[3] = textChanged;
801 } else { 827 } else {
802 (*slHomeAddress)[3] = textChanged; 828 slHomeAddress[3] = textChanged;
803 } 829 }
@@ -807,7 +833,7 @@ void ContactEditor::slotStateChange( const QString &textChanged ) {
807 833
808 834
809 if ( cmbAddress->currentItem() == 0 ) { 835 if ( cmbAddress->currentItem() == 0 ) {
810 (*slBusinessAddress)[4] = textChanged; 836 slBusinessAddress[4] = textChanged;
811 } else { 837 } else {
812 (*slHomeAddress)[4] = textChanged; 838 slHomeAddress[4] = textChanged;
813 } 839 }
@@ -818,5 +844,5 @@ void ContactEditor::slotZipChange( const QString &textChanged ) {
818 if ( cmbAddress->currentItem() == 0 ) { 844 if ( cmbAddress->currentItem() == 0 ) {
819 (*slBusinessAddress)[5] = textChanged; 845 slBusinessAddress[5] = textChanged;
820 } else { 846 } else {
821 (*slHomeAddress)[5] = textChanged; 847 slHomeAddress[5] = textChanged;
822 } 848 }
@@ -827,5 +853,5 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
827 if ( cmbAddress->currentItem() == 0 ) { 853 if ( cmbAddress->currentItem() == 0 ) {
828 (*slBusinessAddress)[6] = textChanged; 854 slBusinessAddress[6] = textChanged;
829 } else { 855 } else {
830 (*slHomeAddress)[6] = textChanged; 856 slHomeAddress[6] = textChanged;
831 } 857 }
@@ -835,4 +861,4 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
835 861
836 txtChooserField1->setText( (*slChooserValues)[index] ); 862 txtChooserField1->setText( slChooserValues[index] );
837 863 txtChooserField1->setFocus();
838} 864}
@@ -841,4 +867,4 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
841 867
842 txtChooserField2->setText( (*slChooserValues)[index] ); 868 txtChooserField2->setText( slChooserValues[index] );
843 869 txtChooserField2->setFocus();
844} 870}
@@ -847,3 +873,4 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
847 873
848 txtChooserField3->setText( (*slChooserValues)[index] ); 874 txtChooserField3->setText( slChooserValues[index] );
875 txtChooserField3->setFocus();
849 876
@@ -853,3 +880,4 @@ void ContactEditor::slotCmbChooser4Change( int index ) {
853 880
854 txtChooserField4->setText( (*slChooserValues)[index] ); 881 txtChooserField4->setText( slChooserValues[index] );
882 txtChooserField4->setFocus();
855 883
@@ -861,10 +889,10 @@ void ContactEditor::slotAddressTypeChange( int index ) {
861 889
862 txtAddress->setText( (*slBusinessAddress)[0] ); 890 txtAddress->setText( slBusinessAddress[0] );
863 //txtAddress2->setText( (*slBusinessAddress)[1] ); 891 //txtAddress2->setText( (*slBusinessAddress)[1] );
864 //txtPOBox->setText( (*slBusinessAddress)[2] ); 892 //txtPOBox->setText( (*slBusinessAddress)[2] );
865 txtCity->setText( (*slBusinessAddress)[3] ); 893 txtCity->setText( slBusinessAddress[3] );
866 txtState->setText( (*slBusinessAddress)[4] ); 894 txtState->setText( slBusinessAddress[4] );
867 txtZip->setText( (*slBusinessAddress)[5] ); 895 txtZip->setText( slBusinessAddress[5] );
868 QLineEdit *txtTmp = cmbCountry->lineEdit(); 896 QLineEdit *txtTmp = cmbCountry->lineEdit();
869 txtTmp->setText( (*slBusinessAddress)[6] ); 897 txtTmp->setText( slBusinessAddress[6] );
870 898
@@ -872,10 +900,10 @@ void ContactEditor::slotAddressTypeChange( int index ) {
872 900
873 txtAddress->setText( (*slHomeAddress)[0] ); 901 txtAddress->setText( slHomeAddress[0] );
874 //txtAddress2->setText( (*slHomeAddress)[1] ); 902 //txtAddress2->setText( (*slHomeAddress)[1] );
875 //txtPOBox->setText( (*slHomeAddress)[2] ); 903 //txtPOBox->setText( (*slHomeAddress)[2] );
876 txtCity->setText( (*slHomeAddress)[3] ); 904 txtCity->setText( slHomeAddress[3] );
877 txtState->setText( (*slHomeAddress)[4] ); 905 txtState->setText( slHomeAddress[4] );
878 txtZip->setText( (*slHomeAddress)[5] ); 906 txtZip->setText( slHomeAddress[5] );
879 QLineEdit *txtTmp = cmbCountry->lineEdit(); 907 QLineEdit *txtTmp = cmbCountry->lineEdit();
880 txtTmp->setText( (*slHomeAddress)[6] ); 908 txtTmp->setText( slHomeAddress[6] );
881 909
@@ -900,3 +928,3 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
900 928
901 } 929}
902 930
@@ -906,3 +934,3 @@ void ContactEditor::loadFields() {
906 QListIterator<QLabel> lit( listName ); 934 QListIterator<QLabel> lit( listName );
907 for ( it = slDynamicEntries->begin(); *lit; ++lit, ++it) { 935 for ( it = slDynamicEntries.begin(); *lit; ++lit, ++it) {
908 (*lit)->setText( *it ); 936 (*lit)->setText( *it );
@@ -961,5 +989,5 @@ bool ContactEditor::isEmpty() {
961 QString t = txtFullName->text(); 989 QString t = txtFullName->text();
962 if ( !t.isEmpty() && containsAlphaNum( t ) ) 990 if ( !t.isEmpty() && containsAlphaNum( t ) )
963 return false; 991 return false;
964 992
965 t = cmbFileAs->currentText(); 993 t = cmbFileAs->currentText();
@@ -984,3 +1012,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
984 int spPos2; 1012 int spPos2;
985 1013
986 1014
@@ -990,3 +1018,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
990 if ( commapos == -1 ) { 1018 if ( commapos == -1 ) {
991 1019
992 switch (spCount) { 1020 switch (spCount) {
@@ -1046,3 +1074,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1046 simplifiedName = simplifiedName.simplifyWhiteSpace(); 1074 simplifiedName = simplifiedName.simplifyWhiteSpace();
1047 1075
1048 switch (spCount) { 1076 switch (spCount) {
@@ -1100,3 +1128,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1100 } 1128 }
1101 1129
1102 switch (type) { 1130 switch (type) {
@@ -1132,4 +1160,4 @@ void ContactEditor::cleanupFields() {
1132 1160
1133 QStringList::Iterator it = slChooserValues->begin(); 1161 QStringList::Iterator it = slChooserValues.begin();
1134 for ( int i = 0; it != slChooserValues->end(); i++, ++it ) { 1162 for ( int i = 0; it != slChooserValues.end(); i++, ++it ) {
1135 (*it) = ""; 1163 (*it) = "";
@@ -1138,4 +1166,4 @@ void ContactEditor::cleanupFields() {
1138 for ( int i = 0; i < 7; i++ ) { 1166 for ( int i = 0; i < 7; i++ ) {
1139 (*slHomeAddress)[i] = ""; 1167 slHomeAddress[i] = "";
1140 (*slBusinessAddress)[i] = ""; 1168 slBusinessAddress[i] = "";
1141 } 1169 }
@@ -1144,3 +1172,3 @@ void ContactEditor::cleanupFields() {
1144 QListIterator<QLineEdit> itLE( listValue ); 1172 QListIterator<QLineEdit> itLE( listValue );
1145 for ( cit = slDynamicEntries->begin(); cit != slDynamicEntries->end(); ++cit, ++itLE) { 1173 for ( cit = slDynamicEntries.begin(); cit != slDynamicEntries.end(); ++cit, ++itLE) {
1146 (*itLE)->setText( "" ); 1174 (*itLE)->setText( "" );
@@ -1176,3 +1204,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
1176 1204
1177 1205
1178 ent = entry; 1206 ent = entry;
@@ -1186,5 +1214,5 @@ void ContactEditor::setEntry( const Contact &entry ) {
1186 QString *tmpString = new QString; 1214 QString *tmpString = new QString;
1187 *tmpString = ent.firstName() + " " + ent.middleName() + 1215 *tmpString = ent.firstName() + " " + ent.middleName() +
1188 + " " + ent.lastName() + " " + ent.suffix(); 1216 + " " + ent.lastName() + " " + ent.suffix();
1189 1217
1190 txtFullName->setText( tmpString->simplifyWhiteSpace() ); 1218 txtFullName->setText( tmpString->simplifyWhiteSpace() );
@@ -1196,3 +1224,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
1196 1224
1197 if (hasCompany) 1225 if (hasCompany)
1198 txtOrganization->setText( ent.company() ); 1226 txtOrganization->setText( ent.company() );
@@ -1203,4 +1231,4 @@ void ContactEditor::setEntry( const Contact &entry ) {
1203 if (hasStreet) { 1231 if (hasStreet) {
1204 (*slHomeAddress)[0] = ent.homeStreet(); 1232 slHomeAddress[0] = ent.homeStreet();
1205 (*slBusinessAddress)[0] = ent.businessStreet(); 1233 slBusinessAddress[0] = ent.businessStreet();
1206 } 1234 }
@@ -1218,4 +1246,4 @@ void ContactEditor::setEntry( const Contact &entry ) {
1218 if (hasCity) { 1246 if (hasCity) {
1219 (*slHomeAddress)[3] = ent.homeCity(); 1247 slHomeAddress[3] = ent.homeCity();
1220 (*slBusinessAddress)[3] = ent.businessCity(); 1248 slBusinessAddress[3] = ent.businessCity();
1221 } 1249 }
@@ -1223,4 +1251,4 @@ void ContactEditor::setEntry( const Contact &entry ) {
1223 if (hasState) { 1251 if (hasState) {
1224 (*slHomeAddress)[4] = ent.homeState(); 1252 slHomeAddress[4] = ent.homeState();
1225 (*slBusinessAddress)[4] = ent.businessState(); 1253 slBusinessAddress[4] = ent.businessState();
1226 } 1254 }
@@ -1228,4 +1256,4 @@ void ContactEditor::setEntry( const Contact &entry ) {
1228 if (hasZip) { 1256 if (hasZip) {
1229 (*slHomeAddress)[5] = ent.homeZip(); 1257 slHomeAddress[5] = ent.homeZip();
1230 (*slBusinessAddress)[5] = ent.businessZip(); 1258 slBusinessAddress[5] = ent.businessZip();
1231 } 1259 }
@@ -1233,4 +1261,4 @@ void ContactEditor::setEntry( const Contact &entry ) {
1233 if (hasCountry) { 1261 if (hasCountry) {
1234 (*slHomeAddress)[6] = ent.homeCountry(); 1262 slHomeAddress[6] = ent.homeCountry();
1235 (*slBusinessAddress)[6] = ent.businessCountry(); 1263 slBusinessAddress[6] = ent.businessCountry();
1236 } 1264 }
@@ -1239,3 +1267,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
1239 QListIterator<QLineEdit> itLE( listValue ); 1267 QListIterator<QLineEdit> itLE( listValue );
1240 for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) { 1268 for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
1241 if ( *it == "Department" ) 1269 if ( *it == "Department" )
@@ -1276,3 +1304,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
1276 QStringList::Iterator itV; 1304 QStringList::Iterator itV;
1277 for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) { 1305 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1278 1306
@@ -1348,3 +1376,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
1348 } 1376 }
1349 1377
1350 cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); 1378 cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
@@ -1371,3 +1399,3 @@ void ContactEditor::saveEntry() {
1371 txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); 1399 txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) );
1372 1400
1373 useFullName = FALSE; 1401 useFullName = FALSE;
@@ -1375,3 +1403,3 @@ void ContactEditor::saveEntry() {
1375 1403
1376 /*if ( ent.firstName() != txtFirstName->text() || 1404 /*if ( ent.firstName() != txtFirstName->text() ||
1377 ent.lastName != txtLastName->text() || 1405 ent.lastName != txtLastName->text() ||
@@ -1387,3 +1415,3 @@ void ContactEditor::saveEntry() {
1387 ent.setFileAs( cmbFileAs->currentText() ); 1415 ent.setFileAs( cmbFileAs->currentText() );
1388 1416
1389 ent.setCategories( cmbCat->currentCategories() ); 1417 ent.setCategories( cmbCat->currentCategories() );
@@ -1393,3 +1421,3 @@ void ContactEditor::saveEntry() {
1393 1421
1394 if (hasCompany) 1422 if (hasCompany)
1395 ent.setCompany( txtOrganization->text() ); 1423 ent.setCompany( txtOrganization->text() );
@@ -1400,4 +1428,4 @@ void ContactEditor::saveEntry() {
1400 if (hasStreet) { 1428 if (hasStreet) {
1401 ent.setHomeStreet( (*slHomeAddress)[0] ); 1429 ent.setHomeStreet( slHomeAddress[0] );
1402 ent.setBusinessStreet( (*slBusinessAddress)[0] ); 1430 ent.setBusinessStreet( slBusinessAddress[0] );
1403 } 1431 }
@@ -1415,4 +1443,4 @@ void ContactEditor::saveEntry() {
1415 if (hasCity) { 1443 if (hasCity) {
1416 ent.setHomeCity( (*slHomeAddress)[3] ); 1444 ent.setHomeCity( slHomeAddress[3] );
1417 ent.setBusinessCity( (*slBusinessAddress)[3] ); 1445 ent.setBusinessCity( slBusinessAddress[3] );
1418 } 1446 }
@@ -1420,4 +1448,4 @@ void ContactEditor::saveEntry() {
1420 if (hasState) { 1448 if (hasState) {
1421 ent.setHomeState( (*slHomeAddress)[4] ); 1449 ent.setHomeState( slHomeAddress[4] );
1422 ent.setBusinessState( (*slBusinessAddress)[4] ); 1450 ent.setBusinessState( slBusinessAddress[4] );
1423 } 1451 }
@@ -1425,9 +1453,9 @@ void ContactEditor::saveEntry() {
1425 if (hasZip) { 1453 if (hasZip) {
1426 ent.setHomeZip( (*slHomeAddress)[5] ); 1454 ent.setHomeZip( slHomeAddress[5] );
1427 ent.setBusinessZip( (*slBusinessAddress)[5] ); 1455 ent.setBusinessZip( slBusinessAddress[5] );
1428 } 1456 }
1429 1457
1430 if (hasCountry) { 1458 if (hasCountry) {
1431 ent.setHomeCountry( (*slHomeAddress)[6] ); 1459 ent.setHomeCountry( slHomeAddress[6] );
1432 ent.setBusinessCountry( (*slBusinessAddress)[6] ); 1460 ent.setBusinessCountry( slBusinessAddress[6] );
1433 } 1461 }
@@ -1436,3 +1464,3 @@ void ContactEditor::saveEntry() {
1436 QListIterator<QLineEdit> itLE( listValue ); 1464 QListIterator<QLineEdit> itLE( listValue );
1437 for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) { 1465 for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
1438 if ( *it == "Department" ) 1466 if ( *it == "Department" )
@@ -1473,3 +1501,3 @@ void ContactEditor::saveEntry() {
1473 QStringList::ConstIterator itV; 1501 QStringList::ConstIterator itV;
1474 for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) { 1502 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1475 1503
@@ -1550,3 +1578,3 @@ void ContactEditor::saveEntry() {
1550 } 1578 }
1551 1579
1552 int gender = cmbGender->currentItem(); 1580 int gender = cmbGender->currentItem();
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index a58a860..4f3b56e 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -52,3 +52,3 @@ class ContactEditor : public QDialog {
52 Q_OBJECT 52 Q_OBJECT
53 53
54 public: 54 public:
@@ -80,3 +80,3 @@ class ContactEditor : public QDialog {
80 QString parseName( QString fullName, int type ); 80 QString parseName( QString fullName, int type );
81 81
82 private slots: 82 private slots:
@@ -111,9 +111,9 @@ class ContactEditor : public QDialog {
111 const QValueList<int> *orderedValues; 111 const QValueList<int> *orderedValues;
112 QStringList *slOrdered; 112 QStringList slOrdered;
113 QStringList *slDynamicEntries; 113 QStringList slDynamicEntries;
114 114
115 QStringList *slHomeAddress; 115 QStringList slHomeAddress;
116 QStringList *slBusinessAddress; 116 QStringList slBusinessAddress;
117 QStringList *slChooserNames; 117 QStringList slChooserNames;
118 QStringList *slChooserValues; 118 QStringList slChooserValues;
119 119
@@ -145,3 +145,3 @@ class ContactEditor : public QDialog {
145 CategorySelect *cmbCat; 145 CategorySelect *cmbCat;
146 146
147 QScrollView *svAddress; 147 QScrollView *svAddress;