Diffstat (limited to 'core/pim/addressbook/contacteditor.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 61 |
1 files changed, 39 insertions, 22 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 | |||
@@ -53,14 +53,14 @@ static inline bool constainsWhiteSpace( const QString &str ); | |||
53 | // helper functions, convert our comma delimited list to proper | 53 | // helper functions, convert our comma delimited list to proper |
54 | // file format... | 54 | // file format... |
55 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 55 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
56 | QString &strAll ); | 56 | QString &strAll ); |
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, |
63 | QWidget *parent, | 63 | QWidget *parent, |
64 | const char *name, | 64 | const char *name, |
65 | WFlags fl ) | 65 | WFlags fl ) |
66 | : QDialog( parent, name, TRUE, fl ), | 66 | : QDialog( parent, name, TRUE, fl ), |
@@ -618,42 +618,56 @@ void ContactEditor::init() { | |||
618 | 618 | ||
619 | new QPEDialogListener(this); | 619 | new QPEDialogListener(this); |
620 | 620 | ||
621 | setPersonalView ( m_personalView ); | 621 | setPersonalView ( m_personalView ); |
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 ) { |
632 | |||
633 | if (slChooserNames[index] == "Default Email"){ | ||
634 | delete cmbDefaultEmail; | ||
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 ); | ||
644 | |||
645 | cmbDefaultEmail->show(); | ||
646 | } | ||
633 | 647 | ||
634 | int index = cmbChooserField2->currentItem(); | ||
635 | 648 | ||
636 | slChooserValues[index] = textChanged; | 649 | slChooserValues[index] = textChanged; |
637 | 650 | ||
638 | } | 651 | } |
639 | 652 | ||
640 | void ContactEditor::slotChooser3Change( const QString &textChanged ) { | 653 | void ContactEditor::slotChooser1Change( const QString &textChanged ) { |
654 | chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1); | ||
655 | } | ||
641 | 656 | ||
642 | int index = cmbChooserField3->currentItem(); | 657 | void ContactEditor::slotChooser2Change( const QString &textChanged ) { |
658 | chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2); | ||
643 | 659 | ||
644 | slChooserValues[index] = textChanged; | 660 | } |
645 | 661 | ||
662 | void ContactEditor::slotChooser3Change( const QString &textChanged ) { | ||
663 | chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3); | ||
646 | } | 664 | } |
647 | 665 | ||
648 | void ContactEditor::slotChooser4Change( const QString &textChanged ) { | 666 | void ContactEditor::slotChooser4Change( const QString &textChanged ) { |
649 | 667 | chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4); | |
650 | int index = cmbChooserField4->currentItem(); | ||
651 | |||
652 | slChooserValues[index] = textChanged; | ||
653 | |||
654 | } | 668 | } |
655 | 669 | ||
656 | void ContactEditor::slotAddressChange( const QString &textChanged ) { | 670 | void ContactEditor::slotAddressChange( const QString &textChanged ) { |
657 | 671 | ||
658 | if ( cmbAddress->currentItem() == 0 ) { | 672 | if ( cmbAddress->currentItem() == 0 ) { |
659 | slBusinessAddress[0] = textChanged; | 673 | slBusinessAddress[0] = textChanged; |
@@ -1368,20 +1382,23 @@ void ContactEditor::saveEntry() { | |||
1368 | ent.setBusinessFax( *itV ); | 1382 | ent.setBusinessFax( *itV ); |
1369 | 1383 | ||
1370 | if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) | 1384 | if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) |
1371 | ent.setBusinessMobile( *itV ); | 1385 | ent.setBusinessMobile( *itV ); |
1372 | 1386 | ||
1373 | if ( *it == "Emails" ){ | 1387 | if ( *it == "Emails" ){ |
1374 | QString allemail; | 1388 | QString allemail; |
1375 | QString defaultmail; | 1389 | QString defaultmail; |
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 ); |
1384 | 1401 | ||
1385 | if ( *it == "Home Fax" ) | 1402 | if ( *it == "Home Fax" ) |
1386 | ent.setHomeFax( *itV ); | 1403 | ent.setHomeFax( *itV ); |
1387 | 1404 | ||