author | drw <drw> | 2004-03-25 23:40:52 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-25 23:40:52 (UTC) |
commit | 98721c16aa480c4a160d3492462cb8f0de783268 (patch) (unidiff) | |
tree | 2be8dcd6cf985d98912cbb18e5d23e4b567396ff /core/pim/addressbook/contacteditor.cpp | |
parent | 03091cd727701bdb2aa6ac623cd606131546d686 (diff) | |
download | opie-98721c16aa480c4a160d3492462cb8f0de783268.zip opie-98721c16aa480c4a160d3492462cb8f0de783268.tar.gz opie-98721c16aa480c4a160d3492462cb8f0de783268.tar.bz2 |
libopie -> libopie2
Diffstat (limited to 'core/pim/addressbook/contacteditor.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 327 |
1 files changed, 164 insertions, 163 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 8acf570..534666d 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -21,10 +21,11 @@ | |||
21 | 21 | ||
22 | #include "contacteditor.h" | 22 | #include "contacteditor.h" |
23 | 23 | ||
24 | #include <opie2/opimcontact.h> | ||
25 | |||
24 | #include <qpe/categoryselect.h> | 26 | #include <qpe/categoryselect.h> |
25 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/qpedialog.h> | 28 | #include <qpe/qpedialog.h> |
27 | #include <opie/ocontact.h> | ||
28 | #include <qpe/resource.h> | 29 | #include <qpe/resource.h> |
29 | 30 | ||
30 | #include <qlabel.h> | 31 | #include <qlabel.h> |
@@ -33,8 +34,8 @@ | |||
33 | #include <qlineedit.h> | 34 | #include <qlineedit.h> |
34 | #include <qmultilineedit.h> | 35 | #include <qmultilineedit.h> |
35 | #include <qtoolbutton.h> | 36 | #include <qtoolbutton.h> |
36 | #include <qlistbox.h> | 37 | #include <qlistbox.h> |
37 | #include <qmessagebox.h> | 38 | #include <qmessagebox.h> |
38 | #include <qwhatsthis.h> | 39 | #include <qwhatsthis.h> |
39 | 40 | ||
40 | #include <assert.h> | 41 | #include <assert.h> |
@@ -51,7 +52,7 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | |||
51 | void parseEmailTo( const QString &strDefaultEmail, | 52 | void parseEmailTo( const QString &strDefaultEmail, |
52 | const QString &strOtherEmail, QString &strBack ); | 53 | const QString &strOtherEmail, QString &strBack ); |
53 | 54 | ||
54 | ContactEditor::ContactEditor(const OContact &entry, | 55 | ContactEditor::ContactEditor(const Opie::OPimContact &entry, |
55 | QWidget *parent, | 56 | QWidget *parent, |
56 | const char *name, | 57 | const char *name, |
57 | WFlags ) | 58 | WFlags ) |
@@ -77,7 +78,7 @@ ContactEditor::~ContactEditor() { | |||
77 | 78 | ||
78 | void ContactEditor::init() { | 79 | void ContactEditor::init() { |
79 | qWarning("init() START"); | 80 | qWarning("init() START"); |
80 | 81 | ||
81 | uint i = 0; | 82 | uint i = 0; |
82 | 83 | ||
83 | QStringList trlChooserNames; | 84 | QStringList trlChooserNames; |
@@ -87,10 +88,10 @@ void ContactEditor::init() { | |||
87 | slBusinessAddress.append( "" ); | 88 | slBusinessAddress.append( "" ); |
88 | } | 89 | } |
89 | 90 | ||
90 | trlChooserNames = OContactFields::trphonefields( false ); | 91 | trlChooserNames = Opie::OPimContactFields::trphonefields( false ); |
91 | slChooserNames = OContactFields::untrphonefields( false ); | 92 | slChooserNames = Opie::OPimContactFields::untrphonefields( false ); |
92 | slDynamicEntries = OContactFields::untrdetailsfields( false ); | 93 | slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false ); |
93 | trlDynamicEntries = OContactFields::trdetailsfields( false ); | 94 | trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false ); |
94 | 95 | ||
95 | // Ok, we have to remove elements from the list of dynamic entries | 96 | // Ok, we have to remove elements from the list of dynamic entries |
96 | // which are now stored in special (not dynamic) widgets.. | 97 | // which are now stored in special (not dynamic) widgets.. |
@@ -101,7 +102,7 @@ void ContactEditor::init() { | |||
101 | 102 | ||
102 | // The same with translated fields.. But I will | 103 | // The same with translated fields.. But I will |
103 | // use the translation map to avoid mismatches.. | 104 | // use the translation map to avoid mismatches.. |
104 | QMap<int, QString> translMap = OContactFields::idToTrFields(); | 105 | QMap<int, QString> translMap = Opie::OPimContactFields::idToTrFields(); |
105 | trlDynamicEntries.remove( translMap[Qtopia::Anniversary] ); | 106 | trlDynamicEntries.remove( translMap[Qtopia::Anniversary] ); |
106 | trlDynamicEntries.remove( translMap[Qtopia::Birthday] ); | 107 | trlDynamicEntries.remove( translMap[Qtopia::Birthday] ); |
107 | trlDynamicEntries.remove( translMap[Qtopia::Gender] ); | 108 | trlDynamicEntries.remove( translMap[Qtopia::Gender] ); |
@@ -164,7 +165,7 @@ void ContactEditor::init() { | |||
164 | QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) ); | 165 | QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) ); |
165 | gl->addWidget( txtOrganization, 3, 1 ); | 166 | gl->addWidget( txtOrganization, 3, 1 ); |
166 | 167 | ||
167 | // Chooser 1 | 168 | // Chooser 1 |
168 | cmbChooserField1 = new QComboBox( FALSE, container ); | 169 | cmbChooserField1 = new QComboBox( FALSE, container ); |
169 | QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) ); | 170 | QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) ); |
170 | cmbChooserField1->setMaximumWidth( 90 ); | 171 | cmbChooserField1->setMaximumWidth( 90 ); |
@@ -529,7 +530,7 @@ void ContactEditor::init() { | |||
529 | birthdayButton->setPopup( m1 ); | 530 | birthdayButton->setPopup( m1 ); |
530 | birthdayButton->setPopupDelay(0); | 531 | birthdayButton->setPopupDelay(0); |
531 | 532 | ||
532 | QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), | 533 | QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), |
533 | tr( "Delete" ), | 534 | tr( "Delete" ), |
534 | hBox, 0 ); | 535 | hBox, 0 ); |
535 | 536 | ||
@@ -554,7 +555,7 @@ void ContactEditor::init() { | |||
554 | anniversaryButton->setPopup( m1 ); | 555 | anniversaryButton->setPopup( m1 ); |
555 | anniversaryButton->setPopupDelay(0); | 556 | anniversaryButton->setPopupDelay(0); |
556 | 557 | ||
557 | deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), | 558 | deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), |
558 | tr( "Delete" ), | 559 | tr( "Delete" ), |
559 | hBox, 0 ); | 560 | hBox, 0 ); |
560 | gl->addWidget( hBox, counter , 1 ); | 561 | gl->addWidget( hBox, counter , 1 ); |
@@ -578,11 +579,11 @@ void ContactEditor::init() { | |||
578 | 579 | ||
579 | // Create Labels and lineedit fields for every dynamic entry | 580 | // Create Labels and lineedit fields for every dynamic entry |
580 | QStringList::ConstIterator it = slDynamicEntries.begin(); | 581 | QStringList::ConstIterator it = slDynamicEntries.begin(); |
581 | QMap<QString, int> mapStrToID = OContactFields::untrFieldsToId(); | 582 | QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId(); |
582 | QMap<int, QString> mapIdToStr = OContactFields::idToTrFields(); | 583 | QMap<int, QString> mapIdToStr = Opie::OPimContactFields::idToTrFields(); |
583 | for (i = counter; it != slDynamicEntries.end(); i++, ++it ) { | 584 | for (i = counter; it != slDynamicEntries.end(); i++, ++it ) { |
584 | 585 | ||
585 | if (((*it) == "Anniversary") || | 586 | if (((*it) == "Anniversary") || |
586 | ((*it) == "Birthday")|| ((*it) == "Gender")) continue; | 587 | ((*it) == "Birthday")|| ((*it) == "Gender")) continue; |
587 | 588 | ||
588 | l = new QLabel( mapIdToStr[mapStrToID[*it]], container ); | 589 | l = new QLabel( mapIdToStr[mapStrToID[*it]], container ); |
@@ -644,11 +645,11 @@ void ContactEditor::init() { | |||
644 | 645 | ||
645 | connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) ); | 646 | connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) ); |
646 | 647 | ||
647 | connect( txtFullName, SIGNAL(textChanged(const QString&)), | 648 | connect( txtFullName, SIGNAL(textChanged(const QString&)), |
648 | this, SLOT(slotFullNameChange(const QString&)) ); | 649 | this, SLOT(slotFullNameChange(const QString&)) ); |
649 | connect( txtSuffix, SIGNAL(textChanged(const QString&)), | 650 | connect( txtSuffix, SIGNAL(textChanged(const QString&)), |
650 | this, SLOT(slotSuffixChange(const QString&)) ); | 651 | this, SLOT(slotSuffixChange(const QString&)) ); |
651 | connect( txtOrganization, SIGNAL(textChanged(const QString&)), | 652 | connect( txtOrganization, SIGNAL(textChanged(const QString&)), |
652 | this, SLOT(slotOrganizationChange(const QString&)) ); | 653 | this, SLOT(slotOrganizationChange(const QString&)) ); |
653 | connect( txtChooserField1, SIGNAL(textChanged(const QString&)), | 654 | connect( txtChooserField1, SIGNAL(textChanged(const QString&)), |
654 | this, SLOT(slotChooser1Change(const QString&)) ); | 655 | this, SLOT(slotChooser1Change(const QString&)) ); |
@@ -700,15 +701,15 @@ void ContactEditor::defaultEmailChanged(int i){ | |||
700 | 701 | ||
701 | } | 702 | } |
702 | 703 | ||
703 | void ContactEditor::populateDefaultEmailCmb(){ | 704 | void ContactEditor::populateDefaultEmailCmb(){ |
704 | 705 | ||
705 | // if the default-email combo was not selected and therfore not created | 706 | // if the default-email combo was not selected and therfore not created |
706 | // we get a lot of trouble.. Therfore create an invisible one.. | 707 | // we get a lot of trouble.. Therfore create an invisible one.. |
707 | if ( !cmbDefaultEmail ){ | 708 | if ( !cmbDefaultEmail ){ |
708 | cmbDefaultEmail = new QComboBox(this); | 709 | cmbDefaultEmail = new QComboBox(this); |
709 | cmbDefaultEmail -> hide(); | 710 | cmbDefaultEmail -> hide(); |
710 | } | 711 | } |
711 | cmbDefaultEmail->clear(); | 712 | cmbDefaultEmail->clear(); |
712 | cmbDefaultEmail->insertStringList( emails ); | 713 | cmbDefaultEmail->insertStringList( emails ); |
713 | // cmbDefaultEmail->show(); | 714 | // cmbDefaultEmail->show(); |
714 | 715 | ||
@@ -724,7 +725,7 @@ void ContactEditor::populateDefaultEmailCmb(){ | |||
724 | found = true; | 725 | found = true; |
725 | } | 726 | } |
726 | } | 727 | } |
727 | 728 | ||
728 | // If the current default email is not found in the list, we choose the | 729 | // If the current default email is not found in the list, we choose the |
729 | // first one.. | 730 | // first one.. |
730 | if ( !found ) | 731 | if ( !found ) |
@@ -741,19 +742,19 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w | |||
741 | if ( !initializing ) | 742 | if ( !initializing ) |
742 | contactfields.setFieldOrder( widgetPos-1, index ); | 743 | contactfields.setFieldOrder( widgetPos-1, index ); |
743 | 744 | ||
744 | // Create and connect combobox for selecting the default email | 745 | // Create and connect combobox for selecting the default email |
745 | if ( type == "Default Email"){ | 746 | if ( type == "Default Email"){ |
746 | qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition); | 747 | qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition); |
747 | 748 | ||
748 | // More than one default-email chooser is not allowed ! | 749 | // More than one default-email chooser is not allowed ! |
749 | if ( ( defaultEmailChooserPosition != -1 ) && | 750 | if ( ( defaultEmailChooserPosition != -1 ) && |
750 | defaultEmailChooserPosition != widgetPos && !initializing){ | 751 | defaultEmailChooserPosition != widgetPos && !initializing){ |
751 | chooserError( widgetPos ); | 752 | chooserError( widgetPos ); |
752 | return true; | 753 | return true; |
753 | } | 754 | } |
754 | 755 | ||
755 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); | 756 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); |
756 | if ( cmbo ){ | 757 | if ( cmbo ){ |
757 | inputStack->raiseWidget( TextField ); | 758 | inputStack->raiseWidget( TextField ); |
758 | inputStack -> removeWidget( cmbo ); | 759 | inputStack -> removeWidget( cmbo ); |
759 | delete cmbo; | 760 | delete cmbo; |
@@ -768,12 +769,12 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w | |||
768 | cmbDefaultEmail = cmbo; | 769 | cmbDefaultEmail = cmbo; |
769 | 770 | ||
770 | connect( cmbo,SIGNAL( activated(int) ), | 771 | connect( cmbo,SIGNAL( activated(int) ), |
771 | SLOT( defaultEmailChanged(int) ) ); | 772 | SLOT( defaultEmailChanged(int) ) ); |
772 | 773 | ||
773 | // Set current default email | 774 | // Set current default email |
774 | populateDefaultEmailCmb(); | 775 | populateDefaultEmailCmb(); |
775 | 776 | ||
776 | 777 | ||
777 | } else { | 778 | } else { |
778 | // Something else was selected: Hide combo.. | 779 | // Something else was selected: Hide combo.. |
779 | qWarning(" Hiding default-email combo" ); | 780 | qWarning(" Hiding default-email combo" ); |
@@ -781,7 +782,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w | |||
781 | defaultEmailChooserPosition = -1; | 782 | defaultEmailChooserPosition = -1; |
782 | } | 783 | } |
783 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); | 784 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); |
784 | if ( cmbo ){ | 785 | if ( cmbo ){ |
785 | inputStack->raiseWidget( TextField ); | 786 | inputStack->raiseWidget( TextField ); |
786 | inputStack -> removeWidget( cmbo ); | 787 | inputStack -> removeWidget( cmbo ); |
787 | cmbDefaultEmail = 0l; | 788 | cmbDefaultEmail = 0l; |
@@ -801,7 +802,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w | |||
801 | // Currently accessed when we select default-email more than once ! | 802 | // Currently accessed when we select default-email more than once ! |
802 | void ContactEditor::chooserError( int index ) | 803 | void ContactEditor::chooserError( int index ) |
803 | { | 804 | { |
804 | qWarning("ContactEditor::chooserError( %d )", index); | 805 | qWarning("ContactEditor::chooserError( %d )", index); |
805 | QMessageBox::warning( this, "Chooser Error", | 806 | QMessageBox::warning( this, "Chooser Error", |
806 | "Multiple selection of this\n" | 807 | "Multiple selection of this\n" |
807 | "Item is not allowed !\n\n" | 808 | "Item is not allowed !\n\n" |
@@ -810,22 +811,22 @@ void ContactEditor::chooserError( int index ) | |||
810 | 0, 0 ); | 811 | 0, 0 ); |
811 | 812 | ||
812 | // Reset the selected Chooser. Unfortunately the chooser | 813 | // Reset the selected Chooser. Unfortunately the chooser |
813 | // generates no signal, therfore we have to | 814 | // generates no signal, therfore we have to |
814 | // call the cmbChooserChange function manually.. | 815 | // call the cmbChooserChange function manually.. |
815 | switch( index ){ | 816 | switch( index ){ |
816 | case 1: | 817 | case 1: |
817 | cmbChooserField1 -> setCurrentItem( 0 ); | 818 | cmbChooserField1 -> setCurrentItem( 0 ); |
818 | slotCmbChooser1Change( 0 ); | 819 | slotCmbChooser1Change( 0 ); |
819 | break; | 820 | break; |
820 | case 2: | 821 | case 2: |
821 | cmbChooserField2 -> setCurrentItem( 0 ); | 822 | cmbChooserField2 -> setCurrentItem( 0 ); |
822 | slotCmbChooser2Change( 0 ); | 823 | slotCmbChooser2Change( 0 ); |
823 | break; | 824 | break; |
824 | case 3: | 825 | case 3: |
825 | cmbChooserField3 -> setCurrentItem( 0 ); | 826 | cmbChooserField3 -> setCurrentItem( 0 ); |
826 | slotCmbChooser3Change( 0 ); | 827 | slotCmbChooser3Change( 0 ); |
827 | break; | 828 | break; |
828 | case 4: | 829 | case 4: |
829 | cmbChooserField4 -> setCurrentItem( 0 ); | 830 | cmbChooserField4 -> setCurrentItem( 0 ); |
830 | slotCmbChooser4Change( 0 ); | 831 | slotCmbChooser4Change( 0 ); |
831 | break; | 832 | break; |
@@ -833,14 +834,14 @@ void ContactEditor::chooserError( int index ) | |||
833 | } | 834 | } |
834 | 835 | ||
835 | // Called when something was changed in a textfield (shouldn't it called textchanged? (se)) | 836 | // Called when something was changed in a textfield (shouldn't it called textchanged? (se)) |
836 | void ContactEditor::chooserChange( const QString &textChanged, int index, | 837 | void ContactEditor::chooserChange( const QString &textChanged, int index, |
837 | QLineEdit* , int widgetPos ) { | 838 | QLineEdit* , int widgetPos ) { |
838 | 839 | ||
839 | QString type = slChooserNames[index]; // :SX | 840 | QString type = slChooserNames[index]; // :SX |
840 | qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i", | 841 | qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i", |
841 | type.latin1(),textChanged.latin1(), index, widgetPos ); | 842 | type.latin1(),textChanged.latin1(), index, widgetPos ); |
842 | 843 | ||
843 | if ( type == "Default Email"){ | 844 | if ( type == "Default Email"){ |
844 | qWarning ("??? Wozu??: %s", textChanged.latin1()); | 845 | qWarning ("??? Wozu??: %s", textChanged.latin1()); |
845 | defaultEmail = textChanged; | 846 | defaultEmail = textChanged; |
846 | 847 | ||
@@ -854,7 +855,7 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, | |||
854 | 855 | ||
855 | populateDefaultEmailCmb(); | 856 | populateDefaultEmailCmb(); |
856 | } | 857 | } |
857 | 858 | ||
858 | slChooserValues[index] = textChanged; | 859 | slChooserValues[index] = textChanged; |
859 | 860 | ||
860 | } | 861 | } |
@@ -948,7 +949,7 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) { | |||
948 | void ContactEditor::slotCmbChooser1Change( int index ) { | 949 | void ContactEditor::slotCmbChooser1Change( int index ) { |
949 | qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); | 950 | qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); |
950 | if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ | 951 | if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ |
951 | 952 | ||
952 | txtChooserField1->setText( slChooserValues[index] ); | 953 | txtChooserField1->setText( slChooserValues[index] ); |
953 | txtChooserField1->setFocus(); | 954 | txtChooserField1->setFocus(); |
954 | 955 | ||
@@ -1049,12 +1050,12 @@ void ContactEditor::slotSuffixChange( const QString& ) { | |||
1049 | 1050 | ||
1050 | void ContactEditor::slotOrganizationChange( const QString &textChanged ){ | 1051 | void ContactEditor::slotOrganizationChange( const QString &textChanged ){ |
1051 | qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() ); | 1052 | qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() ); |
1052 | // Special handling for storing Companies: | 1053 | // Special handling for storing Companies: |
1053 | // If no Fullname is given, we store the Company-Name as lastname | 1054 | // If no Fullname is given, we store the Company-Name as lastname |
1054 | // to handle it like a person.. | 1055 | // to handle it like a person.. |
1055 | if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) | 1056 | if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) |
1056 | txtFullName->setText( textChanged ); | 1057 | txtFullName->setText( textChanged ); |
1057 | 1058 | ||
1058 | } | 1059 | } |
1059 | 1060 | ||
1060 | void ContactEditor::accept() { | 1061 | void ContactEditor::accept() { |
@@ -1137,7 +1138,7 @@ QString ContactEditor::parseName( const QString fullName, int type ) { | |||
1137 | qWarning(" Commapos: %d", commapos ); | 1138 | qWarning(" Commapos: %d", commapos ); |
1138 | 1139 | ||
1139 | // A comma (",") separates the lastname from one or | 1140 | // A comma (",") separates the lastname from one or |
1140 | // many first names. Thus, remove the lastname from the | 1141 | // many first names. Thus, remove the lastname from the |
1141 | // String and parse the firstnames. | 1142 | // String and parse the firstnames. |
1142 | 1143 | ||
1143 | strLastName = simplifiedName.left( commapos ); | 1144 | strLastName = simplifiedName.left( commapos ); |
@@ -1154,12 +1155,12 @@ QString ContactEditor::parseName( const QString fullName, int type ) { | |||
1154 | QStringList allSecondNames; | 1155 | QStringList allSecondNames; |
1155 | for ( ; it != allFirstNames.end(); ++it ) | 1156 | for ( ; it != allFirstNames.end(); ++it ) |
1156 | allSecondNames.append( *it ); | 1157 | allSecondNames.append( *it ); |
1157 | 1158 | ||
1158 | strMiddleName = allSecondNames.join(" "); | 1159 | strMiddleName = allSecondNames.join(" "); |
1159 | 1160 | ||
1160 | } else { | 1161 | } else { |
1161 | 1162 | ||
1162 | // No comma separator used: We use the first word as firstname, the | 1163 | // No comma separator used: We use the first word as firstname, the |
1163 | // last as second/lastname and everything in the middle as middlename | 1164 | // last as second/lastname and everything in the middle as middlename |
1164 | 1165 | ||
1165 | QStringList allNames = QStringList::split(" ", simplifiedName); | 1166 | QStringList allNames = QStringList::split(" ", simplifiedName); |
@@ -1168,10 +1169,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) { | |||
1168 | QStringList allSecondNames; | 1169 | QStringList allSecondNames; |
1169 | for ( ; it != --allNames.end(); ++it ) | 1170 | for ( ; it != --allNames.end(); ++it ) |
1170 | allSecondNames.append( *it ); | 1171 | allSecondNames.append( *it ); |
1171 | 1172 | ||
1172 | strMiddleName = allSecondNames.join(" "); | 1173 | strMiddleName = allSecondNames.join(" "); |
1173 | strLastName = *(--allNames.end()); | 1174 | strLastName = *(--allNames.end()); |
1174 | 1175 | ||
1175 | } | 1176 | } |
1176 | 1177 | ||
1177 | if ( strFirstName == strLastName ) | 1178 | if ( strFirstName == strLastName ) |
@@ -1185,49 +1186,49 @@ QString ContactEditor::parseName( const QString fullName, int type ) { | |||
1185 | switch (type) { | 1186 | switch (type) { |
1186 | case NAME_FL: | 1187 | case NAME_FL: |
1187 | return strFirstName + " " + strLastName; | 1188 | return strFirstName + " " + strLastName; |
1188 | 1189 | ||
1189 | case NAME_LF: | 1190 | case NAME_LF: |
1190 | return strLastName + ", " + strFirstName; | 1191 | return strLastName + ", " + strFirstName; |
1191 | 1192 | ||
1192 | case NAME_LFM: | 1193 | case NAME_LFM: |
1193 | return strLastName + ", " + strFirstName + " " + strMiddleName; | 1194 | return strLastName + ", " + strFirstName + " " + strMiddleName; |
1194 | 1195 | ||
1195 | case NAME_FML: | 1196 | case NAME_FML: |
1196 | return strFirstName + " " + strMiddleName + " " + strLastName ; | 1197 | return strFirstName + " " + strMiddleName + " " + strLastName ; |
1197 | 1198 | ||
1198 | case NAME_F: | 1199 | case NAME_F: |
1199 | return strFirstName; | 1200 | return strFirstName; |
1200 | 1201 | ||
1201 | case NAME_M: | 1202 | case NAME_M: |
1202 | return strMiddleName; | 1203 | return strMiddleName; |
1203 | 1204 | ||
1204 | case NAME_L: | 1205 | case NAME_L: |
1205 | return strLastName; | 1206 | return strLastName; |
1206 | 1207 | ||
1207 | case NAME_S: | 1208 | case NAME_S: |
1208 | return txtSuffix->text(); | 1209 | return txtSuffix->text(); |
1209 | 1210 | ||
1210 | } | 1211 | } |
1211 | return QString::null; | 1212 | return QString::null; |
1212 | } | 1213 | } |
1213 | 1214 | ||
1214 | void ContactEditor::cleanupFields() { | 1215 | void ContactEditor::cleanupFields() { |
1215 | QStringList::Iterator it = slChooserValues.begin(); | 1216 | QStringList::Iterator it = slChooserValues.begin(); |
1216 | 1217 | ||
1217 | for ( int i = 0; it != slChooserValues.end(); i++, ++it ) { | 1218 | for ( int i = 0; it != slChooserValues.end(); i++, ++it ) { |
1218 | (*it) = ""; | 1219 | (*it) = ""; |
1219 | } | 1220 | } |
1220 | 1221 | ||
1221 | for ( int i = 0; i < 7; i++ ) { | 1222 | for ( int i = 0; i < 7; i++ ) { |
1222 | slHomeAddress[i] = ""; | 1223 | slHomeAddress[i] = ""; |
1223 | slBusinessAddress[i] = ""; | 1224 | slBusinessAddress[i] = ""; |
1224 | } | 1225 | } |
1225 | 1226 | ||
1226 | QListIterator<QLineEdit> itLV( listValue ); | 1227 | QListIterator<QLineEdit> itLV( listValue ); |
1227 | for ( ; itLV.current(); ++itLV ) { | 1228 | for ( ; itLV.current(); ++itLV ) { |
1228 | (*itLV)->setText( "" ); | 1229 | (*itLV)->setText( "" ); |
1229 | } | 1230 | } |
1230 | 1231 | ||
1231 | txtFirstName->setText(""); | 1232 | txtFirstName->setText(""); |
1232 | txtMiddleName->setText(""); | 1233 | txtMiddleName->setText(""); |
1233 | txtLastName->setText(""); | 1234 | txtLastName->setText(""); |
@@ -1247,29 +1248,29 @@ void ContactEditor::cleanupFields() { | |||
1247 | txtTmp->setText(""); | 1248 | txtTmp->setText(""); |
1248 | txtTmp = cmbFileAs->lineEdit(); | 1249 | txtTmp = cmbFileAs->lineEdit(); |
1249 | txtTmp->setText(""); | 1250 | txtTmp->setText(""); |
1250 | 1251 | ||
1251 | } | 1252 | } |
1252 | 1253 | ||
1253 | void ContactEditor::setEntry( const OContact &entry ) { | 1254 | void ContactEditor::setEntry( const Opie::OPimContact &entry ) { |
1254 | 1255 | ||
1255 | initializing = true; | 1256 | initializing = true; |
1256 | 1257 | ||
1257 | // Cleanup and activate the general Page .. | 1258 | // Cleanup and activate the general Page .. |
1258 | cleanupFields(); | 1259 | cleanupFields(); |
1259 | tabMain->setCurrentPage( 0 ); | 1260 | tabMain->setCurrentPage( 0 ); |
1260 | 1261 | ||
1261 | ent = entry; | 1262 | ent = entry; |
1262 | 1263 | ||
1263 | emails = QStringList(ent.emailList()); | 1264 | emails = QStringList(ent.emailList()); |
1264 | defaultEmail = ent.defaultEmail(); | 1265 | defaultEmail = ent.defaultEmail(); |
1265 | if (defaultEmail.isEmpty()) defaultEmail = emails[0]; | 1266 | if (defaultEmail.isEmpty()) defaultEmail = emails[0]; |
1266 | qDebug("default email=%s",defaultEmail.latin1()); | 1267 | qDebug("default email=%s",defaultEmail.latin1()); |
1267 | 1268 | ||
1268 | txtFirstName->setText( ent.firstName() ); | 1269 | txtFirstName->setText( ent.firstName() ); |
1269 | txtMiddleName->setText( ent.middleName() ); | 1270 | txtMiddleName->setText( ent.middleName() ); |
1270 | txtLastName->setText( ent.lastName() ); | 1271 | txtLastName->setText( ent.lastName() ); |
1271 | txtSuffix->setText( ent.suffix() ); | 1272 | txtSuffix->setText( ent.suffix() ); |
1272 | 1273 | ||
1273 | // QString *tmpString = new QString; | 1274 | // QString *tmpString = new QString; |
1274 | // *tmpString = ent.firstName() + " " + ent.middleName() + | 1275 | // *tmpString = ent.firstName() + " " + ent.middleName() + |
1275 | // + " " + ent.lastName() + " " + ent.suffix(); | 1276 | // + " " + ent.lastName() + " " + ent.suffix(); |
@@ -1282,83 +1283,83 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1282 | else | 1283 | else |
1283 | txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() ); | 1284 | txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() ); |
1284 | } | 1285 | } |
1285 | 1286 | ||
1286 | cmbFileAs->setEditText( ent.fileAs() ); | 1287 | cmbFileAs->setEditText( ent.fileAs() ); |
1287 | 1288 | ||
1288 | //if (hasTitle) | 1289 | //if (hasTitle) |
1289 | txtJobTitle->setText( ent.jobTitle() ); | 1290 | txtJobTitle->setText( ent.jobTitle() ); |
1290 | 1291 | ||
1291 | //if (hasCompany) | 1292 | //if (hasCompany) |
1292 | txtOrganization->setText( ent.company() ); | 1293 | txtOrganization->setText( ent.company() ); |
1293 | 1294 | ||
1294 | //if (hasNotes) | 1295 | //if (hasNotes) |
1295 | txtNote->setText( ent.notes() ); | 1296 | txtNote->setText( ent.notes() ); |
1296 | 1297 | ||
1297 | //if (hasStreet) { | 1298 | //if (hasStreet) { |
1298 | slHomeAddress[0] = ent.homeStreet(); | 1299 | slHomeAddress[0] = ent.homeStreet(); |
1299 | slBusinessAddress[0] = ent.businessStreet(); | 1300 | slBusinessAddress[0] = ent.businessStreet(); |
1300 | //} | 1301 | //} |
1301 | 1302 | ||
1302 | //if (hasCity) { | 1303 | //if (hasCity) { |
1303 | slHomeAddress[3] = ent.homeCity(); | 1304 | slHomeAddress[3] = ent.homeCity(); |
1304 | slBusinessAddress[3] = ent.businessCity(); | 1305 | slBusinessAddress[3] = ent.businessCity(); |
1305 | //} | 1306 | //} |
1306 | 1307 | ||
1307 | //if (hasState) { | 1308 | //if (hasState) { |
1308 | slHomeAddress[4] = ent.homeState(); | 1309 | slHomeAddress[4] = ent.homeState(); |
1309 | slBusinessAddress[4] = ent.businessState(); | 1310 | slBusinessAddress[4] = ent.businessState(); |
1310 | //} | 1311 | //} |
1311 | 1312 | ||
1312 | //if (hasZip) { | 1313 | //if (hasZip) { |
1313 | slHomeAddress[5] = ent.homeZip(); | 1314 | slHomeAddress[5] = ent.homeZip(); |
1314 | slBusinessAddress[5] = ent.businessZip(); | 1315 | slBusinessAddress[5] = ent.businessZip(); |
1315 | //} | 1316 | //} |
1316 | 1317 | ||
1317 | //if (hasCountry) { | 1318 | //if (hasCountry) { |
1318 | slHomeAddress[6] = ent.homeCountry(); | 1319 | slHomeAddress[6] = ent.homeCountry(); |
1319 | slBusinessAddress[6] = ent.businessCountry(); | 1320 | slBusinessAddress[6] = ent.businessCountry(); |
1320 | //} | 1321 | //} |
1321 | 1322 | ||
1322 | QStringList::ConstIterator it; | 1323 | QStringList::ConstIterator it; |
1323 | QListIterator<QLineEdit> itLE( listValue ); | 1324 | QListIterator<QLineEdit> itLE( listValue ); |
1324 | for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { | 1325 | for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { |
1325 | 1326 | ||
1326 | qWarning(" Filling dynamic Field: %s", (*it).latin1() ); | 1327 | qWarning(" Filling dynamic Field: %s", (*it).latin1() ); |
1327 | 1328 | ||
1328 | if ( *it == "Department" ) | 1329 | if ( *it == "Department" ) |
1329 | (*itLE)->setText( ent.department() ); | 1330 | (*itLE)->setText( ent.department() ); |
1330 | 1331 | ||
1331 | if ( *it == "Company" ) | 1332 | if ( *it == "Company" ) |
1332 | (*itLE)->setText( ent.company() ); | 1333 | (*itLE)->setText( ent.company() ); |
1333 | 1334 | ||
1334 | if ( *it == "Office" ) | 1335 | if ( *it == "Office" ) |
1335 | (*itLE)->setText( ent.office() ); | 1336 | (*itLE)->setText( ent.office() ); |
1336 | 1337 | ||
1337 | if ( *it == "Profession" ) | 1338 | if ( *it == "Profession" ) |
1338 | (*itLE)->setText( ent.profession() ); | 1339 | (*itLE)->setText( ent.profession() ); |
1339 | 1340 | ||
1340 | if ( *it == "Assistant" ) | 1341 | if ( *it == "Assistant" ) |
1341 | (*itLE)->setText( ent.assistant() ); | 1342 | (*itLE)->setText( ent.assistant() ); |
1342 | 1343 | ||
1343 | if ( *it == "Manager" ) | 1344 | if ( *it == "Manager" ) |
1344 | (*itLE)->setText( ent.manager() ); | 1345 | (*itLE)->setText( ent.manager() ); |
1345 | 1346 | ||
1346 | if ( *it == "Spouse" ) | 1347 | if ( *it == "Spouse" ) |
1347 | (*itLE)->setText( ent.spouse() ); | 1348 | (*itLE)->setText( ent.spouse() ); |
1348 | 1349 | ||
1349 | if ( *it == "Nickname" ){ | 1350 | if ( *it == "Nickname" ){ |
1350 | qWarning("**** Nichname: %s", ent.nickname().latin1() ); | 1351 | qWarning("**** Nichname: %s", ent.nickname().latin1() ); |
1351 | (*itLE)->setText( ent.nickname() ); | 1352 | (*itLE)->setText( ent.nickname() ); |
1352 | } | 1353 | } |
1353 | 1354 | ||
1354 | if ( *it == "Children" ) | 1355 | if ( *it == "Children" ) |
1355 | (*itLE)->setText( ent.children() ); | 1356 | (*itLE)->setText( ent.children() ); |
1356 | 1357 | ||
1357 | } | 1358 | } |
1358 | 1359 | ||
1359 | QStringList::Iterator itV; | 1360 | QStringList::Iterator itV; |
1360 | for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { | 1361 | for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { |
1361 | 1362 | ||
1362 | if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) ) | 1363 | if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) ) |
1363 | *itV = ent.businessPhone(); | 1364 | *itV = ent.businessPhone(); |
1364 | /* | 1365 | /* |
@@ -1367,7 +1368,7 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1367 | */ | 1368 | */ |
1368 | if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) ) | 1369 | if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) ) |
1369 | *itV = ent.businessFax(); | 1370 | *itV = ent.businessFax(); |
1370 | 1371 | ||
1371 | if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) ) | 1372 | if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) ) |
1372 | *itV = ent.businessMobile(); | 1373 | *itV = ent.businessMobile(); |
1373 | /* | 1374 | /* |
@@ -1376,10 +1377,10 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1376 | */ | 1377 | */ |
1377 | if ( *it == "Default Email" ) | 1378 | if ( *it == "Default Email" ) |
1378 | *itV = ent.defaultEmail(); | 1379 | *itV = ent.defaultEmail(); |
1379 | 1380 | ||
1380 | if ( *it == "Emails" ) | 1381 | if ( *it == "Emails" ) |
1381 | *itV = ent.emailList().join(", "); // :SX | 1382 | *itV = ent.emailList().join(", "); // :SX |
1382 | 1383 | ||
1383 | if ( *it == "Home Phone" ) | 1384 | if ( *it == "Home Phone" ) |
1384 | *itV = ent.homePhone(); | 1385 | *itV = ent.homePhone(); |
1385 | /* | 1386 | /* |
@@ -1388,16 +1389,16 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1388 | */ | 1389 | */ |
1389 | if ( *it == "Home Fax" ) | 1390 | if ( *it == "Home Fax" ) |
1390 | *itV = ent.homeFax(); | 1391 | *itV = ent.homeFax(); |
1391 | 1392 | ||
1392 | if ( *it == "Home Mobile" ) | 1393 | if ( *it == "Home Mobile" ) |
1393 | *itV = ent.homeMobile(); | 1394 | *itV = ent.homeMobile(); |
1394 | /* | 1395 | /* |
1395 | if ( *it == "Car Phone" ) | 1396 | if ( *it == "Car Phone" ) |
1396 | *itV = ent.carPhone(); | 1397 | *itV = ent.carPhone(); |
1397 | 1398 | ||
1398 | if ( *it == "ISDN Phone" ) | 1399 | if ( *it == "ISDN Phone" ) |
1399 | *itV = ent.ISDNPhone(); | 1400 | *itV = ent.ISDNPhone(); |
1400 | 1401 | ||
1401 | if ( *it == "Other Phone" ) | 1402 | if ( *it == "Other Phone" ) |
1402 | *itV = ent.otherPhone(); | 1403 | *itV = ent.otherPhone(); |
1403 | */ | 1404 | */ |
@@ -1406,41 +1407,41 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1406 | /* | 1407 | /* |
1407 | if ( *it == "Home Pager") | 1408 | if ( *it == "Home Pager") |
1408 | *itV = ent.homePager(); | 1409 | *itV = ent.homePager(); |
1409 | 1410 | ||
1410 | if ( *it == "AIM IM" ) | 1411 | if ( *it == "AIM IM" ) |
1411 | *itV = ent.AIMIM(); | 1412 | *itV = ent.AIMIM(); |
1412 | 1413 | ||
1413 | if ( *it == "ICQ IM" ) | 1414 | if ( *it == "ICQ IM" ) |
1414 | *itV = ent.ICQIM(); | 1415 | *itV = ent.ICQIM(); |
1415 | 1416 | ||
1416 | if ( *it == "Jabber IM" ) | 1417 | if ( *it == "Jabber IM" ) |
1417 | *itV = ent.jabberIM(); | 1418 | *itV = ent.jabberIM(); |
1418 | 1419 | ||
1419 | if ( *it == "MSN IM" ) | 1420 | if ( *it == "MSN IM" ) |
1420 | *itV = ent.MSNIM(); | 1421 | *itV = ent.MSNIM(); |
1421 | 1422 | ||
1422 | if ( *it == "Yahoo IM" ) | 1423 | if ( *it == "Yahoo IM" ) |
1423 | *itV = ent.yahooIM(); | 1424 | *itV = ent.yahooIM(); |
1424 | */ | 1425 | */ |
1425 | if ( *it == "Home Web Page" ) | 1426 | if ( *it == "Home Web Page" ) |
1426 | *itV = ent.homeWebpage(); | 1427 | *itV = ent.homeWebpage(); |
1427 | 1428 | ||
1428 | if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) | 1429 | if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) |
1429 | *itV = ent.businessWebpage(); | 1430 | *itV = ent.businessWebpage(); |
1430 | 1431 | ||
1431 | 1432 | ||
1432 | } | 1433 | } |
1433 | 1434 | ||
1434 | 1435 | ||
1435 | cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); | 1436 | cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); |
1436 | 1437 | ||
1437 | QString gender = ent.gender(); | 1438 | QString gender = ent.gender(); |
1438 | cmbGender->setCurrentItem( gender.toInt() ); | 1439 | cmbGender->setCurrentItem( gender.toInt() ); |
1439 | 1440 | ||
1440 | txtNote->setText( ent.notes() ); | 1441 | txtNote->setText( ent.notes() ); |
1441 | 1442 | ||
1442 | slotAddressTypeChange( cmbAddress->currentItem() ); | 1443 | slotAddressTypeChange( cmbAddress->currentItem() ); |
1443 | 1444 | ||
1444 | // Get combo-settings from contact and set preset.. | 1445 | // Get combo-settings from contact and set preset.. |
1445 | contactfields.loadFromRecord( ent ); | 1446 | contactfields.loadFromRecord( ent ); |
1446 | cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) ); | 1447 | cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) ); |
@@ -1453,9 +1454,9 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1453 | slotCmbChooser3Change( cmbChooserField3->currentItem() ); | 1454 | slotCmbChooser3Change( cmbChooserField3->currentItem() ); |
1454 | slotCmbChooser4Change( cmbChooserField4->currentItem() ); | 1455 | slotCmbChooser4Change( cmbChooserField4->currentItem() ); |
1455 | slotAddressTypeChange( cmbAddress->currentItem() ); | 1456 | slotAddressTypeChange( cmbAddress->currentItem() ); |
1456 | 1457 | ||
1457 | updateDatePicker(); | 1458 | updateDatePicker(); |
1458 | 1459 | ||
1459 | initializing = false; | 1460 | initializing = false; |
1460 | } | 1461 | } |
1461 | void ContactEditor::updateDatePicker() | 1462 | void ContactEditor::updateDatePicker() |
@@ -1466,115 +1467,115 @@ void ContactEditor::updateDatePicker() | |||
1466 | birthdayPicker->setDate( ent.birthday() ); | 1467 | birthdayPicker->setDate( ent.birthday() ); |
1467 | } else | 1468 | } else |
1468 | birthdayButton->setText( tr ("Unknown") ); | 1469 | birthdayButton->setText( tr ("Unknown") ); |
1469 | 1470 | ||
1470 | if ( !ent.anniversary().isNull() ){ | 1471 | if ( !ent.anniversary().isNull() ){ |
1471 | anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) ); | 1472 | anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) ); |
1472 | anniversaryPicker->setDate( ent.anniversary() ); | 1473 | anniversaryPicker->setDate( ent.anniversary() ); |
1473 | } else | 1474 | } else |
1474 | anniversaryButton->setText( tr ("Unknown") ); | 1475 | anniversaryButton->setText( tr ("Unknown") ); |
1475 | 1476 | ||
1476 | } | 1477 | } |
1477 | 1478 | ||
1478 | void ContactEditor::saveEntry() { | 1479 | void ContactEditor::saveEntry() { |
1479 | 1480 | ||
1480 | // Store current combo into contact | 1481 | // Store current combo into contact |
1481 | contactfields.saveToRecord( ent ); | 1482 | contactfields.saveToRecord( ent ); |
1482 | 1483 | ||
1483 | txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); | 1484 | txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); |
1484 | txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); | 1485 | txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); |
1485 | txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); | 1486 | txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); |
1486 | // txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); | 1487 | // txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); |
1487 | 1488 | ||
1488 | ent.setFirstName( txtFirstName->text() ); | 1489 | ent.setFirstName( txtFirstName->text() ); |
1489 | ent.setLastName( txtLastName->text() ); | 1490 | ent.setLastName( txtLastName->text() ); |
1490 | ent.setMiddleName( txtMiddleName->text() ); | 1491 | ent.setMiddleName( txtMiddleName->text() ); |
1491 | ent.setSuffix( txtSuffix->text() ); | 1492 | ent.setSuffix( txtSuffix->text() ); |
1492 | 1493 | ||
1493 | ent.setFileAs( cmbFileAs->currentText() ); | 1494 | ent.setFileAs( cmbFileAs->currentText() ); |
1494 | 1495 | ||
1495 | ent.setCategories( cmbCat->currentCategories() ); | 1496 | ent.setCategories( cmbCat->currentCategories() ); |
1496 | 1497 | ||
1497 | 1498 | ||
1498 | //if (hasTitle) | 1499 | //if (hasTitle) |
1499 | ent.setJobTitle( txtJobTitle->text() ); | 1500 | ent.setJobTitle( txtJobTitle->text() ); |
1500 | 1501 | ||
1501 | //if (hasCompany) | 1502 | //if (hasCompany) |
1502 | ent.setCompany( txtOrganization->text() ); | 1503 | ent.setCompany( txtOrganization->text() ); |
1503 | 1504 | ||
1504 | //if (hasNotes) | 1505 | //if (hasNotes) |
1505 | ent.setNotes( txtNote->text() ); | 1506 | ent.setNotes( txtNote->text() ); |
1506 | 1507 | ||
1507 | //if (hasStreet) { | 1508 | //if (hasStreet) { |
1508 | ent.setHomeStreet( slHomeAddress[0] ); | 1509 | ent.setHomeStreet( slHomeAddress[0] ); |
1509 | ent.setBusinessStreet( slBusinessAddress[0] ); | 1510 | ent.setBusinessStreet( slBusinessAddress[0] ); |
1510 | //} | 1511 | //} |
1511 | 1512 | ||
1512 | //if (hasCity) { | 1513 | //if (hasCity) { |
1513 | ent.setHomeCity( slHomeAddress[3] ); | 1514 | ent.setHomeCity( slHomeAddress[3] ); |
1514 | ent.setBusinessCity( slBusinessAddress[3] ); | 1515 | ent.setBusinessCity( slBusinessAddress[3] ); |
1515 | //} | 1516 | //} |
1516 | 1517 | ||
1517 | //if (hasState) { | 1518 | //if (hasState) { |
1518 | ent.setHomeState( slHomeAddress[4] ); | 1519 | ent.setHomeState( slHomeAddress[4] ); |
1519 | ent.setBusinessState( slBusinessAddress[4] ); | 1520 | ent.setBusinessState( slBusinessAddress[4] ); |
1520 | //} | 1521 | //} |
1521 | 1522 | ||
1522 | //if (hasZip) { | 1523 | //if (hasZip) { |
1523 | ent.setHomeZip( slHomeAddress[5] ); | 1524 | ent.setHomeZip( slHomeAddress[5] ); |
1524 | ent.setBusinessZip( slBusinessAddress[5] ); | 1525 | ent.setBusinessZip( slBusinessAddress[5] ); |
1525 | //} | 1526 | //} |
1526 | 1527 | ||
1527 | //if (hasCountry) { | 1528 | //if (hasCountry) { |
1528 | ent.setHomeCountry( slHomeAddress[6] ); | 1529 | ent.setHomeCountry( slHomeAddress[6] ); |
1529 | ent.setBusinessCountry( slBusinessAddress[6] ); | 1530 | ent.setBusinessCountry( slBusinessAddress[6] ); |
1530 | //} | 1531 | //} |
1531 | 1532 | ||
1532 | QStringList::ConstIterator it; | 1533 | QStringList::ConstIterator it; |
1533 | QListIterator<QLineEdit> itLE( listValue ); | 1534 | QListIterator<QLineEdit> itLE( listValue ); |
1534 | for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) { | 1535 | for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) { |
1535 | 1536 | ||
1536 | if ( *it == "Department" ) | 1537 | if ( *it == "Department" ) |
1537 | ent.setDepartment( (*itLE)->text() ); | 1538 | ent.setDepartment( (*itLE)->text() ); |
1538 | 1539 | ||
1539 | if ( *it == "Company" ) | 1540 | if ( *it == "Company" ) |
1540 | ent.setCompany( (*itLE)->text() ); | 1541 | ent.setCompany( (*itLE)->text() ); |
1541 | 1542 | ||
1542 | if ( *it == "Office" ) | 1543 | if ( *it == "Office" ) |
1543 | ent.setOffice( (*itLE)->text() ); | 1544 | ent.setOffice( (*itLE)->text() ); |
1544 | 1545 | ||
1545 | if ( *it == "Profession" ) | 1546 | if ( *it == "Profession" ) |
1546 | ent.setProfession( (*itLE)->text() ); | 1547 | ent.setProfession( (*itLE)->text() ); |
1547 | 1548 | ||
1548 | if ( *it == "Assistant" ) | 1549 | if ( *it == "Assistant" ) |
1549 | ent.setAssistant( (*itLE)->text() ); | 1550 | ent.setAssistant( (*itLE)->text() ); |
1550 | 1551 | ||
1551 | if ( *it == "Manager" ) | 1552 | if ( *it == "Manager" ) |
1552 | ent.setManager( (*itLE)->text() ); | 1553 | ent.setManager( (*itLE)->text() ); |
1553 | 1554 | ||
1554 | if ( *it == "Spouse" ) | 1555 | if ( *it == "Spouse" ) |
1555 | ent.setSpouse( (*itLE)->text() ); | 1556 | ent.setSpouse( (*itLE)->text() ); |
1556 | 1557 | ||
1557 | if ( *it == "Nickname" ) | 1558 | if ( *it == "Nickname" ) |
1558 | ent.setNickname( (*itLE)->text() ); | 1559 | ent.setNickname( (*itLE)->text() ); |
1559 | 1560 | ||
1560 | if ( *it == "Children" ) | 1561 | if ( *it == "Children" ) |
1561 | ent.setChildren( (*itLE)->text() ); | 1562 | ent.setChildren( (*itLE)->text() ); |
1562 | 1563 | ||
1563 | } | 1564 | } |
1564 | 1565 | ||
1565 | 1566 | ||
1566 | QStringList::ConstIterator itV; | 1567 | QStringList::ConstIterator itV; |
1567 | for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { | 1568 | for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { |
1568 | 1569 | ||
1569 | if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) ) | 1570 | if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) ) |
1570 | ent.setBusinessPhone( *itV ); | 1571 | ent.setBusinessPhone( *itV ); |
1571 | 1572 | ||
1572 | if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) ) | 1573 | if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) ) |
1573 | ent.setBusinessFax( *itV ); | 1574 | ent.setBusinessFax( *itV ); |
1574 | 1575 | ||
1575 | if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) | 1576 | if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) |
1576 | ent.setBusinessMobile( *itV ); | 1577 | ent.setBusinessMobile( *itV ); |
1577 | 1578 | ||
1578 | if ( *it == "Emails" ){ | 1579 | if ( *it == "Emails" ){ |
1579 | QString allemail; | 1580 | QString allemail; |
1580 | QString defaultmail; | 1581 | QString defaultmail; |
@@ -1586,38 +1587,38 @@ void ContactEditor::saveEntry() { | |||
1586 | } | 1587 | } |
1587 | ent.setEmails( allemail ); | 1588 | ent.setEmails( allemail ); |
1588 | } | 1589 | } |
1589 | 1590 | ||
1590 | if ( *it == "Default Email") | 1591 | if ( *it == "Default Email") |
1591 | ent.setDefaultEmail( defaultEmail /* *itV */ ); | 1592 | ent.setDefaultEmail( defaultEmail /* *itV */ ); |
1592 | 1593 | ||
1593 | if ( *it == "Home Phone" ) | 1594 | if ( *it == "Home Phone" ) |
1594 | ent.setHomePhone( *itV ); | 1595 | ent.setHomePhone( *itV ); |
1595 | 1596 | ||
1596 | if ( *it == "Home Fax" ) | 1597 | if ( *it == "Home Fax" ) |
1597 | ent.setHomeFax( *itV ); | 1598 | ent.setHomeFax( *itV ); |
1598 | 1599 | ||
1599 | if ( *it == "Home Mobile" ) | 1600 | if ( *it == "Home Mobile" ) |
1600 | ent.setHomeMobile( *itV ); | 1601 | ent.setHomeMobile( *itV ); |
1601 | 1602 | ||
1602 | if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) ) | 1603 | if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) ) |
1603 | ent.setBusinessPager( *itV ); | 1604 | ent.setBusinessPager( *itV ); |
1604 | 1605 | ||
1605 | if ( *it == "Home Web Page" ) | 1606 | if ( *it == "Home Web Page" ) |
1606 | ent.setHomeWebpage( *itV ); | 1607 | ent.setHomeWebpage( *itV ); |
1607 | 1608 | ||
1608 | if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) | 1609 | if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) |
1609 | ent.setBusinessWebpage( *itV ); | 1610 | ent.setBusinessWebpage( *itV ); |
1610 | 1611 | ||
1611 | 1612 | ||
1612 | } | 1613 | } |
1613 | 1614 | ||
1614 | int gender = cmbGender->currentItem(); | 1615 | int gender = cmbGender->currentItem(); |
1615 | ent.setGender( QString::number( gender ) ); | 1616 | ent.setGender( QString::number( gender ) ); |
1616 | 1617 | ||
1617 | QString str = txtNote->text(); | 1618 | QString str = txtNote->text(); |
1618 | if ( !str.isNull() ) | 1619 | if ( !str.isNull() ) |
1619 | ent.setNotes( str ); | 1620 | ent.setNotes( str ); |
1620 | 1621 | ||
1621 | } | 1622 | } |
1622 | 1623 | ||
1623 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 1624 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
@@ -1698,18 +1699,18 @@ static inline bool constainsWhiteSpace( const QString &str ) | |||
1698 | void ContactEditor::setPersonalView( bool personal ) | 1699 | void ContactEditor::setPersonalView( bool personal ) |
1699 | { | 1700 | { |
1700 | m_personalView = personal; | 1701 | m_personalView = personal; |
1701 | 1702 | ||
1702 | // Currently disbled due to the fact that | 1703 | // Currently disbled due to the fact that |
1703 | // show will not work... | 1704 | // show will not work... |
1704 | return; | 1705 | return; |
1705 | 1706 | ||
1706 | if ( personal ){ | 1707 | if ( personal ){ |
1707 | cmbCat->hide(); | 1708 | cmbCat->hide(); |
1708 | labCat->hide(); | 1709 | labCat->hide(); |
1709 | 1710 | ||
1710 | } else{ | 1711 | } else{ |
1711 | cmbCat->show(); | 1712 | cmbCat->show(); |
1712 | labCat->show(); | 1713 | labCat->show(); |
1713 | } | 1714 | } |
1714 | } | 1715 | } |
1715 | 1716 | ||