-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 1 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 254 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.h | 12 |
3 files changed, 148 insertions, 119 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 | |||
@@ -906,6 +906,7 @@ void AddressbookWindow::populateCategories() | |||
906 | int id, | 906 | int id, |
907 | rememberId; | 907 | rememberId; |
908 | id = 1; | 908 | id = 1; |
909 | rememberId = 0; | ||
909 | catMenu->insertItem( tr( "All" ), id++ ); | 910 | catMenu->insertItem( tr( "All" ), id++ ); |
910 | QStringList categories = abList->categories(); | 911 | QStringList categories = abList->categories(); |
911 | categories.append( tr( "Unfiled" ) ); | 912 | categories.append( tr( "Unfiled" ) ); |
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 | |||
@@ -57,7 +57,7 @@ ContactEditor::ContactEditor( const Contact &entry, | |||
57 | WFlags fl ) | 57 | WFlags fl ) |
58 | : QDialog( parent, name, TRUE, fl ), | 58 | : QDialog( parent, name, TRUE, fl ), |
59 | orderedValues( newOrderedValues ), | 59 | orderedValues( newOrderedValues ), |
60 | slOrdered( slNewOrdered ) | 60 | slOrdered( *slNewOrdered ) |
61 | { | 61 | { |
62 | 62 | ||
63 | init(); | 63 | init(); |
@@ -74,19 +74,19 @@ void ContactEditor::init() { | |||
74 | useFullName = TRUE; | 74 | useFullName = TRUE; |
75 | 75 | ||
76 | int i = 0; | 76 | int i = 0; |
77 | 77 | /** SHut up and stop leaking | |
78 | slHomeAddress = new QStringList; | 78 | slHomeAddress = new QStringList; |
79 | slBusinessAddress = new QStringList; | 79 | slBusinessAddress = new QStringList; |
80 | slChooserNames = new QStringList; | 80 | slChooserNames = new QStringList; |
81 | slChooserValues = new QStringList; | 81 | slChooserValues = new QStringList; |
82 | 82 | ||
83 | slDynamicEntries = new QStringList; | 83 | slDynamicEntries = new QStringList; |
84 | 84 | */ | |
85 | //*slDynamicEntries = *slOrdered; | 85 | //*slDynamicEntries = *slOrdered; |
86 | 86 | ||
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 | } |
91 | 91 | ||
92 | { | 92 | { |
@@ -102,61 +102,61 @@ void ContactEditor::init() { | |||
102 | hasZip = FALSE; | 102 | hasZip = FALSE; |
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 ); |
112 | continue; | 112 | continue; |
113 | } | 113 | } |
114 | 114 | ||
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 ); |
119 | continue; | 119 | continue; |
120 | } | 120 | } |
121 | 121 | ||
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 ); |
126 | continue; | 126 | continue; |
127 | } | 127 | } |
128 | 128 | ||
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 ); |
133 | continue; | 133 | continue; |
134 | } | 134 | } |
135 | 135 | ||
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 ); |
140 | continue; | 140 | continue; |
141 | } | 141 | } |
142 | 142 | ||
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 ); |
147 | continue; | 147 | continue; |
148 | } | 148 | } |
149 | 149 | ||
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 ); |
154 | continue; | 154 | continue; |
155 | } | 155 | } |
156 | 156 | ||
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 ); |
161 | continue; | 161 | continue; |
162 | } | 162 | } |
@@ -262,7 +262,7 @@ void ContactEditor::init() { | |||
262 | continue; | 262 | continue; |
263 | } | 263 | } |
264 | 264 | ||
265 | slDynamicEntries->append( *it ); | 265 | slDynamicEntries.append( *it ); |
266 | } | 266 | } |
267 | } | 267 | } |
268 | 268 | ||
@@ -346,7 +346,7 @@ void ContactEditor::init() { | |||
346 | container = new QWidget( svAddress->viewport() ); | 346 | container = new QWidget( svAddress->viewport() ); |
347 | svAddress->addChild( container ); | 347 | svAddress->addChild( container ); |
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 | ||
351 | cmbAddress = new QComboBox( FALSE, container ); | 351 | cmbAddress = new QComboBox( FALSE, container ); |
352 | cmbAddress->insertItem( tr( "Business" ) ); | 352 | cmbAddress->insertItem( tr( "Business" ) ); |
@@ -607,6 +607,12 @@ void ContactEditor::init() { | |||
607 | gl->addWidget( cmbChooserField4, 6, 0 ); | 607 | gl->addWidget( cmbChooserField4, 6, 0 ); |
608 | txtChooserField4 = new QLineEdit( container ); | 608 | txtChooserField4 = new QLineEdit( container ); |
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" ) ); |
611 | 617 | ||
612 | tabViewport = new QWidget ( tabMain ); | 618 | tabViewport = new QWidget ( tabMain ); |
@@ -623,8 +629,8 @@ void ContactEditor::init() { | |||
623 | 629 | ||
624 | gl = new QGridLayout( container, 1, 2, 2, 4 ); | 630 | gl = new QGridLayout( container, 1, 2, 2, 4 ); |
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 ); |
629 | listName.append( l ); | 635 | listName.append( l ); |
630 | gl->addWidget( l, i, 0 ); | 636 | gl->addWidget( l, i, 0 ); |
@@ -634,12 +640,12 @@ void ContactEditor::init() { | |||
634 | } | 640 | } |
635 | 641 | ||
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 ); |
639 | cmbGender->insertItem( "", 0 ); | 645 | cmbGender->insertItem( "", 0 ); |
640 | cmbGender->insertItem( tr("Male"), 1); | 646 | cmbGender->insertItem( tr("Male"), 1); |
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 | ||
@@ -652,7 +658,7 @@ void ContactEditor::init() { | |||
652 | 658 | ||
653 | dlgName = new QDialog( this, "Name Dialog", TRUE ); | 659 | dlgName = new QDialog( this, "Name Dialog", TRUE ); |
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 | ||
657 | l = new QLabel( tr("First Name"), dlgName ); | 663 | l = new QLabel( tr("First Name"), dlgName ); |
658 | gl->addWidget( l, 0, 0 ); | 664 | gl->addWidget( l, 0, 0 ); |
@@ -673,11 +679,15 @@ void ContactEditor::init() { | |||
673 | gl->addWidget( l, 3, 0 ); | 679 | gl->addWidget( l, 3, 0 ); |
674 | txtSuffix = new QLineEdit( dlgName ); | 680 | txtSuffix = new QLineEdit( dlgName ); |
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 | ||
682 | cmbChooserField1->setCurrentItem( 0 ); | 692 | cmbChooserField1->setCurrentItem( 0 ); |
683 | cmbChooserField2->setCurrentItem( 1 ); | 693 | cmbChooserField2->setCurrentItem( 1 ); |
@@ -687,23 +697,39 @@ void ContactEditor::init() { | |||
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 &)), |
705 | this, SLOT(slotChooser3Change(const QString &)) ); | ||
706 | connect( txtChooserField4, SIGNAL(textChanged(const QString &)), | ||
707 | this, SLOT(slotChooser4Change(const QString &)) ); | ||
708 | connect( txtAddress, SIGNAL(textChanged(const QString &)), | ||
709 | this, SLOT(slotAddressChange(const QString &)) ); | ||
695 | //connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) ); | 710 | //connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) ); |
696 | //connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) ); | 711 | //connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) ); |
697 | connect( txtCity, SIGNAL(textChanged(const QString &)), this, SLOT(slotCityChange(const QString &)) ); | 712 | connect( txtCity, SIGNAL(textChanged(const QString &)), |
698 | connect( txtState, SIGNAL(textChanged(const QString &)), this, SLOT(slotStateChange(const QString &)) ); | 713 | this, SLOT(slotCityChange(const QString &)) ); |
699 | connect( txtZip, SIGNAL(textChanged(const QString &)), this, SLOT(slotZipChange(const QString &)) ); | 714 | connect( txtState, SIGNAL(textChanged(const QString &)), |
700 | connect( cmbCountry, SIGNAL(textChanged(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); | 715 | this, SLOT(slotStateChange(const QString &)) ); |
701 | connect( cmbCountry, SIGNAL(activated(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); | 716 | connect( txtZip, SIGNAL(textChanged(const QString &)), |
702 | connect( cmbChooserField1, SIGNAL(activated(int)), this, SLOT(slotCmbChooser1Change(int)) ); | 717 | this, SLOT(slotZipChange(const QString &)) ); |
703 | connect( cmbChooserField2, SIGNAL(activated(int)), this, SLOT(slotCmbChooser2Change(int)) ); | 718 | connect( cmbCountry, SIGNAL(textChanged(const QString &)), |
704 | connect( cmbChooserField3, SIGNAL(activated(int)), this, SLOT(slotCmbChooser3Change(int)) ); | 719 | this, SLOT(slotCountryChange(const QString &)) ); |
705 | connect( cmbChooserField4, SIGNAL(activated(int)), this, SLOT(slotCmbChooser4Change(int)) ); | 720 | connect( cmbCountry, SIGNAL(activated(const QString &)), |
706 | connect( cmbAddress, SIGNAL(activated(int)), this, SLOT(slotAddressTypeChange(int)) ); | 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); |
708 | } | 734 | } |
709 | 735 | ||
@@ -739,7 +765,7 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) { | |||
739 | 765 | ||
740 | int index = cmbChooserField1->currentItem(); | 766 | int index = cmbChooserField1->currentItem(); |
741 | 767 | ||
742 | (*slChooserValues)[index] = textChanged; | 768 | slChooserValues[index] = textChanged; |
743 | 769 | ||
744 | } | 770 | } |
745 | 771 | ||
@@ -747,7 +773,7 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) { | |||
747 | 773 | ||
748 | int index = cmbChooserField2->currentItem(); | 774 | int index = cmbChooserField2->currentItem(); |
749 | 775 | ||
750 | (*slChooserValues)[index] = textChanged; | 776 | slChooserValues[index] = textChanged; |
751 | 777 | ||
752 | } | 778 | } |
753 | 779 | ||
@@ -755,7 +781,7 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) { | |||
755 | 781 | ||
756 | int index = cmbChooserField3->currentItem(); | 782 | int index = cmbChooserField3->currentItem(); |
757 | 783 | ||
758 | (*slChooserValues)[index] = textChanged; | 784 | slChooserValues[index] = textChanged; |
759 | 785 | ||
760 | } | 786 | } |
761 | 787 | ||
@@ -763,43 +789,43 @@ void ContactEditor::slotChooser4Change( const QString &textChanged ) { | |||
763 | 789 | ||
764 | int index = cmbChooserField4->currentItem(); | 790 | int index = cmbChooserField4->currentItem(); |
765 | 791 | ||
766 | (*slChooserValues)[index] = textChanged; | 792 | slChooserValues[index] = textChanged; |
767 | 793 | ||
768 | } | 794 | } |
769 | 795 | ||
770 | void ContactEditor::slotAddressChange( const QString &textChanged ) { | 796 | void ContactEditor::slotAddressChange( const QString &textChanged ) { |
771 | 797 | ||
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 | } |
777 | } | 803 | } |
778 | 804 | ||
779 | void ContactEditor::slotAddress2Change( const QString &textChanged ) { | 805 | void ContactEditor::slotAddress2Change( const QString &textChanged ) { |
780 | 806 | ||
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 | } |
786 | } | 812 | } |
787 | 813 | ||
788 | void ContactEditor::slotPOBoxChange( const QString &textChanged ) { | 814 | void ContactEditor::slotPOBoxChange( const QString &textChanged ) { |
789 | 815 | ||
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 | } |
795 | } | 821 | } |
796 | 822 | ||
797 | void ContactEditor::slotCityChange( const QString &textChanged ) { | 823 | void ContactEditor::slotCityChange( const QString &textChanged ) { |
798 | 824 | ||
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 | } |
804 | } | 830 | } |
805 | 831 | ||
@@ -807,51 +833,53 @@ 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 | } |
814 | } | 840 | } |
815 | 841 | ||
816 | void ContactEditor::slotZipChange( const QString &textChanged ) { | 842 | void ContactEditor::slotZipChange( const QString &textChanged ) { |
817 | 843 | ||
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 | } |
823 | } | 849 | } |
824 | 850 | ||
825 | void ContactEditor::slotCountryChange( const QString &textChanged ) { | 851 | void ContactEditor::slotCountryChange( const QString &textChanged ) { |
826 | 852 | ||
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 | } |
832 | } | 858 | } |
833 | 859 | ||
834 | void ContactEditor::slotCmbChooser1Change( int index ) { | 860 | void ContactEditor::slotCmbChooser1Change( int index ) { |
835 | 861 | ||
836 | txtChooserField1->setText( (*slChooserValues)[index] ); | 862 | txtChooserField1->setText( slChooserValues[index] ); |
837 | 863 | txtChooserField1->setFocus(); | |
838 | } | 864 | } |
839 | 865 | ||
840 | void ContactEditor::slotCmbChooser2Change( int index ) { | 866 | void ContactEditor::slotCmbChooser2Change( int index ) { |
841 | 867 | ||
842 | txtChooserField2->setText( (*slChooserValues)[index] ); | 868 | txtChooserField2->setText( slChooserValues[index] ); |
843 | 869 | txtChooserField2->setFocus(); | |
844 | } | 870 | } |
845 | 871 | ||
846 | void ContactEditor::slotCmbChooser3Change( int index ) { | 872 | void ContactEditor::slotCmbChooser3Change( int index ) { |
847 | 873 | ||
848 | txtChooserField3->setText( (*slChooserValues)[index] ); | 874 | txtChooserField3->setText( slChooserValues[index] ); |
875 | txtChooserField3->setFocus(); | ||
849 | 876 | ||
850 | } | 877 | } |
851 | 878 | ||
852 | void ContactEditor::slotCmbChooser4Change( int index ) { | 879 | void ContactEditor::slotCmbChooser4Change( int index ) { |
853 | 880 | ||
854 | txtChooserField4->setText( (*slChooserValues)[index] ); | 881 | txtChooserField4->setText( slChooserValues[index] ); |
882 | txtChooserField4->setFocus(); | ||
855 | 883 | ||
856 | } | 884 | } |
857 | 885 | ||
@@ -859,25 +887,25 @@ void ContactEditor::slotAddressTypeChange( int index ) { | |||
859 | 887 | ||
860 | if ( index == 0 ) { | 888 | if ( index == 0 ) { |
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 | ||
871 | } else { | 899 | } else { |
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 | ||
882 | } | 910 | } |
883 | 911 | ||
@@ -904,7 +932,7 @@ void ContactEditor::loadFields() { | |||
904 | 932 | ||
905 | QStringList::ConstIterator it; | 933 | QStringList::ConstIterator it; |
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 ); |
909 | } | 937 | } |
910 | } | 938 | } |
@@ -1130,19 +1158,19 @@ QString ContactEditor::parseName( const QString fullName, int type ) { | |||
1130 | 1158 | ||
1131 | void ContactEditor::cleanupFields() { | 1159 | 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) = ""; |
1136 | } | 1164 | } |
1137 | 1165 | ||
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 | } |
1142 | 1170 | ||
1143 | QStringList::ConstIterator cit; | 1171 | QStringList::ConstIterator cit; |
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( "" ); |
1147 | } | 1175 | } |
1148 | 1176 | ||
@@ -1201,8 +1229,8 @@ void ContactEditor::setEntry( const Contact &entry ) { | |||
1201 | txtNote->setText( ent.notes() ); | 1229 | txtNote->setText( ent.notes() ); |
1202 | 1230 | ||
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 | } |
1207 | /* | 1235 | /* |
1208 | if (hasStreet2) { | 1236 | if (hasStreet2) { |
@@ -1216,28 +1244,28 @@ void ContactEditor::setEntry( const Contact &entry ) { | |||
1216 | } | 1244 | } |
1217 | */ | 1245 | */ |
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 | } |
1222 | 1250 | ||
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 | } |
1227 | 1255 | ||
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 | } |
1232 | 1260 | ||
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 | } |
1237 | 1265 | ||
1238 | QStringList::ConstIterator it; | 1266 | QStringList::ConstIterator it; |
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" ) |
1242 | (*itLE)->setText( ent.department() ); | 1270 | (*itLE)->setText( ent.department() ); |
1243 | 1271 | ||
@@ -1274,7 +1302,7 @@ void ContactEditor::setEntry( const Contact &entry ) { | |||
1274 | } | 1302 | } |
1275 | 1303 | ||
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 | ||
1279 | if ( *it == "Business Phone" || *it == "Work Phone" ) | 1307 | if ( *it == "Business Phone" || *it == "Work Phone" ) |
1280 | *itV = ent.businessPhone(); | 1308 | *itV = ent.businessPhone(); |
@@ -1398,8 +1426,8 @@ void ContactEditor::saveEntry() { | |||
1398 | ent.setNotes( txtNote->text() ); | 1426 | ent.setNotes( txtNote->text() ); |
1399 | 1427 | ||
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 | } |
1404 | /* | 1432 | /* |
1405 | if (hasStreet2) { | 1433 | if (hasStreet2) { |
@@ -1413,28 +1441,28 @@ void ContactEditor::saveEntry() { | |||
1413 | } | 1441 | } |
1414 | */ | 1442 | */ |
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 | } |
1419 | 1447 | ||
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 | } |
1424 | 1452 | ||
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 | } |
1434 | 1462 | ||
1435 | QStringList::ConstIterator it; | 1463 | QStringList::ConstIterator it; |
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" ) |
1439 | ent.setDepartment( (*itLE)->text() ); | 1467 | ent.setDepartment( (*itLE)->text() ); |
1440 | 1468 | ||
@@ -1471,7 +1499,7 @@ void ContactEditor::saveEntry() { | |||
1471 | } | 1499 | } |
1472 | 1500 | ||
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 | ||
1476 | if ( *it == "Business Phone" || *it == "Work Phone" ) | 1504 | if ( *it == "Business Phone" || *it == "Work Phone" ) |
1477 | ent.setBusinessPhone( *itV ); | 1505 | ent.setBusinessPhone( *itV ); |
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 | |||
@@ -109,13 +109,13 @@ class ContactEditor : public QDialog { | |||
109 | QList<QLineEdit> listValue; | 109 | QList<QLineEdit> listValue; |
110 | QList<QLabel> listName; | 110 | QList<QLabel> listName; |
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 | ||
120 | QMultiLineEdit *txtNote; | 120 | QMultiLineEdit *txtNote; |
121 | QLabel *lblNote; | 121 | QLabel *lblNote; |