-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 37e3a54..d14ac51 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -634,34 +634,35 @@ void ContactEditor::init() { | |||
634 | this, SLOT(slotCmbChooser2Change(int)) ); | 634 | this, SLOT(slotCmbChooser2Change(int)) ); |
635 | connect( cmbChooserField3, SIGNAL(activated(int)), | 635 | connect( cmbChooserField3, SIGNAL(activated(int)), |
636 | this, SLOT(slotCmbChooser3Change(int)) ); | 636 | this, SLOT(slotCmbChooser3Change(int)) ); |
637 | connect( cmbChooserField4, SIGNAL(activated(int)), | 637 | connect( cmbChooserField4, SIGNAL(activated(int)), |
638 | this, SLOT(slotCmbChooser4Change(int)) ); | 638 | this, SLOT(slotCmbChooser4Change(int)) ); |
639 | connect( cmbAddress, SIGNAL(activated(int)), | 639 | connect( cmbAddress, SIGNAL(activated(int)), |
640 | this, SLOT(slotAddressTypeChange(int)) ); | 640 | this, SLOT(slotAddressTypeChange(int)) ); |
641 | 641 | ||
642 | new QPEDialogListener(this); | 642 | new QPEDialogListener(this); |
643 | 643 | ||
644 | setPersonalView ( m_personalView ); | 644 | setPersonalView ( m_personalView ); |
645 | } | 645 | } |
646 | 646 | ||
647 | void ContactEditor::defaultEmailChanged(int i){ | 647 | void ContactEditor::defaultEmailChanged(int i){ |
648 | qDebug("defaultEmailChanged"); | 648 | qDebug("defaultEmailChanged"); |
649 | 649 | ||
650 | int index = cmbChooserField1->currentItem(); | 650 | // was sollte das ? (se) |
651 | slChooserValues[index] = cmbDefaultEmail->text(i); | 651 | // int index = cmbChooserField1->currentItem(); |
652 | // slChooserValues[index] = cmbDefaultEmail->text(i); | ||
652 | 653 | ||
653 | defaultEmail = cmbDefaultEmail->text(i); | 654 | defaultEmail = cmbDefaultEmail->text(i); |
654 | qDebug ("Changed to: %s", defaultEmail.latin1()); | 655 | qDebug ("Changed to: %s", defaultEmail.latin1()); |
655 | 656 | ||
656 | } | 657 | } |
657 | 658 | ||
658 | void ContactEditor::populateDefaultEmailCmb(){ | 659 | void ContactEditor::populateDefaultEmailCmb(){ |
659 | 660 | ||
660 | // if the default-email combo was not selected and therfore not created | 661 | // if the default-email combo was not selected and therfore not created |
661 | // we get a lot of trouble.. Therfore create an invisible one.. | 662 | // we get a lot of trouble.. Therfore create an invisible one.. |
662 | if ( !cmbDefaultEmail ){ | 663 | if ( !cmbDefaultEmail ){ |
663 | cmbDefaultEmail = new QComboBox(this); | 664 | cmbDefaultEmail = new QComboBox(this); |
664 | cmbDefaultEmail -> hide(); | 665 | cmbDefaultEmail -> hide(); |
665 | } | 666 | } |
666 | cmbDefaultEmail->clear(); | 667 | cmbDefaultEmail->clear(); |
667 | cmbDefaultEmail->insertStringList( emails ); | 668 | cmbDefaultEmail->insertStringList( emails ); |
@@ -886,33 +887,32 @@ void ContactEditor::slotZipChange( const QString &textChanged ) { | |||
886 | slHomeAddress[5] = textChanged; | 887 | slHomeAddress[5] = textChanged; |
887 | } | 888 | } |
888 | } | 889 | } |
889 | 890 | ||
890 | void ContactEditor::slotCountryChange( const QString &textChanged ) { | 891 | void ContactEditor::slotCountryChange( const QString &textChanged ) { |
891 | 892 | ||
892 | if ( cmbAddress->currentItem() == 0 ) { | 893 | if ( cmbAddress->currentItem() == 0 ) { |
893 | slBusinessAddress[6] = textChanged; | 894 | slBusinessAddress[6] = textChanged; |
894 | } else { | 895 | } else { |
895 | slHomeAddress[6] = textChanged; | 896 | slHomeAddress[6] = textChanged; |
896 | } | 897 | } |
897 | } | 898 | } |
898 | 899 | ||
899 | 900 | ||
900 | void ContactEditor::slotCmbChooser1Change( int index ) { | 901 | void ContactEditor::slotCmbChooser1Change( int index ) { |
901 | qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); | 902 | qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); |
902 | |||
903 | if ( !cmbChooserChange( cmbChooserField1->currentItem(), txtChooserField1, 1) ){ | 903 | if ( !cmbChooserChange( cmbChooserField1->currentItem(), txtChooserField1, 1) ){ |
904 | 904 | ||
905 | txtChooserField1->setText( slChooserValues[index] ); | 905 | txtChooserField1->setText( slChooserValues[index] ); |
906 | txtChooserField1->setFocus(); | 906 | txtChooserField1->setFocus(); |
907 | 907 | ||
908 | } | 908 | } |
909 | 909 | ||
910 | } | 910 | } |
911 | 911 | ||
912 | void ContactEditor::slotCmbChooser2Change( int index ) { | 912 | void ContactEditor::slotCmbChooser2Change( int index ) { |
913 | qWarning("ContactEditor::slotCmbChooser2Change( %d )", index); | 913 | qWarning("ContactEditor::slotCmbChooser2Change( %d )", index); |
914 | 914 | ||
915 | if ( !cmbChooserChange( cmbChooserField2->currentItem(), txtChooserField2, 2) ){ | 915 | if ( !cmbChooserChange( cmbChooserField2->currentItem(), txtChooserField2, 2) ){ |
916 | 916 | ||
917 | txtChooserField2->setText( slChooserValues[index] ); | 917 | txtChooserField2->setText( slChooserValues[index] ); |
918 | txtChooserField2->setFocus(); | 918 | txtChooserField2->setFocus(); |
@@ -1470,32 +1470,33 @@ void ContactEditor::updateDatePicker() | |||
1470 | if ( !ent.birthday().isNull() ){ | 1470 | if ( !ent.birthday().isNull() ){ |
1471 | birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) ); | 1471 | birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) ); |
1472 | birthdayPicker->setDate( ent.birthday() ); | 1472 | birthdayPicker->setDate( ent.birthday() ); |
1473 | } else | 1473 | } else |
1474 | birthdayButton->setText( tr ("Unknown") ); | 1474 | birthdayButton->setText( tr ("Unknown") ); |
1475 | 1475 | ||
1476 | if ( !ent.anniversary().isNull() ){ | 1476 | if ( !ent.anniversary().isNull() ){ |
1477 | anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) ); | 1477 | anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) ); |
1478 | anniversaryPicker->setDate( ent.anniversary() ); | 1478 | anniversaryPicker->setDate( ent.anniversary() ); |
1479 | } else | 1479 | } else |
1480 | anniversaryButton->setText( tr ("Unknown") ); | 1480 | anniversaryButton->setText( tr ("Unknown") ); |
1481 | 1481 | ||
1482 | } | 1482 | } |
1483 | 1483 | ||
1484 | void ContactEditor::saveEntry() { | 1484 | void ContactEditor::saveEntry() { |
1485 | 1485 | ||
1486 | |||
1486 | if ( useFullName ) { | 1487 | if ( useFullName ) { |
1487 | txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); | 1488 | txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); |
1488 | txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); | 1489 | txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); |
1489 | txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); | 1490 | txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); |
1490 | txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); | 1491 | txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); |
1491 | 1492 | ||
1492 | useFullName = false; | 1493 | useFullName = false; |
1493 | } | 1494 | } |
1494 | 1495 | ||
1495 | ent.setFirstName( txtFirstName->text() ); | 1496 | ent.setFirstName( txtFirstName->text() ); |
1496 | ent.setLastName( txtLastName->text() ); | 1497 | ent.setLastName( txtLastName->text() ); |
1497 | ent.setMiddleName( txtMiddleName->text() ); | 1498 | ent.setMiddleName( txtMiddleName->text() ); |
1498 | ent.setSuffix( txtSuffix->text() ); | 1499 | ent.setSuffix( txtSuffix->text() ); |
1499 | 1500 | ||
1500 | ent.setFileAs( cmbFileAs->currentText() ); | 1501 | ent.setFileAs( cmbFileAs->currentText() ); |
1501 | 1502 | ||