-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 51 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.h | 4 | ||||
-rw-r--r-- | core/pim/addressbook/ocontactfields.cpp | 4 |
3 files changed, 39 insertions, 20 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 5a7bf1a..7338eeb 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -57,6 +57,6 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | |||
57 | 57 | ||
58 | // helper convert from file format to comma delimited... | 58 | // helper convert from file format to comma delimited... |
59 | void parseEmailTo( const QString &strDefaultEmail, | 59 | //void parseEmailTo( const QString &strDefaultEmail, |
60 | const QString &strOtherEmail, QString &strBack ); | 60 | // const QString &strOtherEmail, QString &strBack ); |
61 | 61 | ||
62 | ContactEditor::ContactEditor(const OContact &entry, | 62 | ContactEditor::ContactEditor(const OContact &entry, |
@@ -622,23 +622,28 @@ void ContactEditor::init() { | |||
622 | } | 622 | } |
623 | 623 | ||
624 | void ContactEditor::slotChooser1Change( const QString &textChanged ) { | 624 | void ContactEditor::defaultEmailChanged(int i){ |
625 | 625 | qDebug("defaultEmailChanged"); | |
626 | int index = cmbChooserField1->currentItem(); | 626 | int index = cmbChooserField1->currentItem(); |
627 | 627 | slChooserValues[index] = cmbDefaultEmail->text(i); | |
628 | slChooserValues[index] = textChanged; | ||
629 | 628 | ||
630 | } | 629 | } |
631 | 630 | ||
632 | void ContactEditor::slotChooser2Change( const QString &textChanged ) { | 631 | void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid ) { |
633 | 632 | ||
634 | int index = cmbChooserField2->currentItem(); | 633 | if (slChooserNames[index] == "Default Email"){ |
635 | 634 | delete cmbDefaultEmail; | |
636 | slChooserValues[index] = textChanged; | 635 | cmbDefaultEmail = new QComboBox(inputWid->parentWidget()); |
636 | cmbDefaultEmail->setGeometry(inputWid->frameGeometry()); | ||
637 | cmbDefaultEmail->insertStringList(ent.emailList()); | ||
638 | connect(cmbDefaultEmail,SIGNAL(activated(int)), | ||
639 | SLOT(defaultEmailChanged(int))); | ||
640 | QString demail = ent.defaultEmail(); | ||
641 | for ( int i = 0; i < cmbDefaultEmail->count(); i++) | ||
642 | if ( cmbDefaultEmail->text( i ) == demail ) | ||
643 | cmbDefaultEmail->setCurrentItem( i ); | ||
637 | 644 | ||
645 | cmbDefaultEmail->show(); | ||
638 | } | 646 | } |
639 | 647 | ||
640 | void ContactEditor::slotChooser3Change( const QString &textChanged ) { | ||
641 | |||
642 | int index = cmbChooserField3->currentItem(); | ||
643 | 648 | ||
644 | slChooserValues[index] = textChanged; | 649 | slChooserValues[index] = textChanged; |
@@ -646,10 +651,19 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) { | |||
646 | } | 651 | } |
647 | 652 | ||
648 | void ContactEditor::slotChooser4Change( const QString &textChanged ) { | 653 | void ContactEditor::slotChooser1Change( const QString &textChanged ) { |
654 | chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1); | ||
655 | } | ||
649 | 656 | ||
650 | int index = cmbChooserField4->currentItem(); | 657 | void ContactEditor::slotChooser2Change( const QString &textChanged ) { |
658 | chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2); | ||
651 | 659 | ||
652 | slChooserValues[index] = textChanged; | 660 | } |
653 | 661 | ||
662 | void ContactEditor::slotChooser3Change( const QString &textChanged ) { | ||
663 | chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3); | ||
664 | } | ||
665 | |||
666 | void ContactEditor::slotChooser4Change( const QString &textChanged ) { | ||
667 | chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4); | ||
654 | } | 668 | } |
655 | 669 | ||
@@ -1376,8 +1390,11 @@ void ContactEditor::saveEntry() { | |||
1376 | parseEmailFrom( *itV, defaultmail, allemail ); | 1390 | parseEmailFrom( *itV, defaultmail, allemail ); |
1377 | // ent.clearEmails(); | 1391 | // ent.clearEmails(); |
1378 | ent.setDefaultEmail( defaultmail ); | 1392 | // ent.setDefaultEmail( defaultmail ); |
1379 | ent.setEmails( allemail ); | 1393 | ent.setEmails( allemail ); |
1380 | } | 1394 | } |
1381 | 1395 | ||
1396 | if ( *it == "Default Email") | ||
1397 | ent.setDefaultEmail( *itV ); | ||
1398 | |||
1382 | if ( *it == "Home Phone" ) | 1399 | if ( *it == "Home Phone" ) |
1383 | ent.setHomePhone( *itV ); | 1400 | ent.setHomePhone( *itV ); |
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h index 250b831..d4b7f27 100644 --- a/core/pim/addressbook/contacteditor.h +++ b/core/pim/addressbook/contacteditor.h | |||
@@ -101,8 +101,9 @@ class ContactEditor : public QDialog { | |||
101 | void slotRemoveBirthday(); | 101 | void slotRemoveBirthday(); |
102 | void slotRemoveAnniversary(); | 102 | void slotRemoveAnniversary(); |
103 | void defaultEmailChanged(int); | ||
103 | 104 | ||
104 | private: | 105 | private: |
106 | void chooserChange( const QString&, int , QLineEdit* ); | ||
105 | bool useFullName; | 107 | bool useFullName; |
106 | // bool hasGender, hasTitle, hasCompany, hasNotes, hasStreet, hasStreet2, hasPOBox, hasCity, hasState, hasZip, hasCountry; | ||
107 | 108 | ||
108 | OContact ent; | 109 | OContact ent; |
@@ -148,4 +149,5 @@ class ContactEditor : public QDialog { | |||
148 | QComboBox *cmbChooserField3; | 149 | QComboBox *cmbChooserField3; |
149 | QComboBox *cmbChooserField4; | 150 | QComboBox *cmbChooserField4; |
151 | QComboBox *cmbDefaultEmail; | ||
150 | QComboBox *cmbFileAs; | 152 | QComboBox *cmbFileAs; |
151 | CategorySelect *cmbCat; | 153 | CategorySelect *cmbCat; |
diff --git a/core/pim/addressbook/ocontactfields.cpp b/core/pim/addressbook/ocontactfields.cpp index df57efa..7823a9c 100644 --- a/core/pim/addressbook/ocontactfields.cpp +++ b/core/pim/addressbook/ocontactfields.cpp | |||
@@ -43,5 +43,5 @@ QStringList OContactFields::trphonefields( bool sorted ) | |||
43 | list.append( QObject::tr( "Business Mobile" ) ); | 43 | list.append( QObject::tr( "Business Mobile" ) ); |
44 | 44 | ||
45 | // list.append( QObject::tr( "Default Email" ) ); | 45 | list.append( QObject::tr( "Default Email" ) ); |
46 | list.append( QObject::tr( "Emails" ) ); | 46 | list.append( QObject::tr( "Emails" ) ); |
47 | 47 | ||
@@ -139,5 +139,5 @@ QStringList OContactFields::untrphonefields( bool sorted ) | |||
139 | list.append( "Business Mobile" ); | 139 | list.append( "Business Mobile" ); |
140 | 140 | ||
141 | // list.append( "Default Email" ); | 141 | list.append( "Default Email" ); |
142 | list.append( "Emails" ); | 142 | list.append( "Emails" ); |
143 | 143 | ||