Diffstat (limited to 'kaddressbook/addresseeeditorwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index bd32859..5334a0e 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -638,71 +638,71 @@ void AddresseeEditorWidget::setupTab2() | |||
638 | ++iii; | 638 | ++iii; |
639 | 639 | ||
640 | label = new QLabel( i18n( "Spouse's name:" ), tab2 ); | 640 | label = new QLabel( i18n( "Spouse's name:" ), tab2 ); |
641 | layout->addWidget( label, iii, 1 ); | 641 | layout->addWidget( label, iii, 1 ); |
642 | mSpouseEdit = new KLineEdit( tab2 ); | 642 | mSpouseEdit = new KLineEdit( tab2 ); |
643 | connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ), | 643 | connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ), |
644 | SLOT( textChanged( const QString& ) ) ); | 644 | SLOT( textChanged( const QString& ) ) ); |
645 | label->setBuddy( mSpouseEdit ); | 645 | label->setBuddy( mSpouseEdit ); |
646 | layout->addWidget( mSpouseEdit, iii, 2 ); | 646 | layout->addWidget( mSpouseEdit, iii, 2 ); |
647 | ++iii; | 647 | ++iii; |
648 | } | 648 | } |
649 | 649 | ||
650 | label = new QLabel( i18n( "Children's names:" ), tab2 ); | 650 | label = new QLabel( i18n( "Children's names:" ), tab2 ); |
651 | layout->addWidget( label, iii, 1 ); | 651 | layout->addWidget( label, iii, 1 ); |
652 | mChildEdit = new KLineEdit( tab2 ); | 652 | mChildEdit = new KLineEdit( tab2 ); |
653 | connect( mChildEdit, SIGNAL( textChanged( const QString& ) ), | 653 | connect( mChildEdit, SIGNAL( textChanged( const QString& ) ), |
654 | SLOT( textChanged( const QString& ) ) ); | 654 | SLOT( textChanged( const QString& ) ) ); |
655 | label->setBuddy( mChildEdit ); | 655 | label->setBuddy( mChildEdit ); |
656 | layout->addWidget( mChildEdit, iii, 2 ); | 656 | layout->addWidget( mChildEdit, iii, 2 ); |
657 | ++iii; | 657 | ++iii; |
658 | if ( QApplication::desktop()->width() == 640 ) { | 658 | if ( QApplication::desktop()->width() == 640 ) { |
659 | QHBox * nbox = new QHBox ( tab2 ); | 659 | QHBox * nbox = new QHBox ( tab2 ); |
660 | label = new QLabel( i18n( "Birthday:" )+" ", nbox ); | 660 | label = new QLabel( i18n( "Birthday:" )+" ", nbox ); |
661 | mBirthdayPicker = new KDateEdit( nbox ); | 661 | mBirthdayPicker = new KDateEdit( nbox ); |
662 | mBirthdayPicker->toggleDateFormat(); | 662 | //mBirthdayPicker->toggleDateFormat(); |
663 | mBirthdayPicker->setHandleInvalid( true ); | 663 | mBirthdayPicker->setHandleInvalid( true ); |
664 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), | 664 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), |
665 | SLOT( dateChanged( QDate ) ) ); | 665 | SLOT( dateChanged( QDate ) ) ); |
666 | 666 | ||
667 | label->setBuddy( mBirthdayPicker ); | 667 | label->setBuddy( mBirthdayPicker ); |
668 | 668 | ||
669 | label = new QLabel( " "+i18n( "Anniversary:" )+" ", nbox ); | 669 | label = new QLabel( " "+i18n( "Anniversary:" )+" ", nbox ); |
670 | mAnniversaryPicker = new KDateEdit( nbox ); | 670 | mAnniversaryPicker = new KDateEdit( nbox ); |
671 | mAnniversaryPicker->setHandleInvalid( true ); | 671 | mAnniversaryPicker->setHandleInvalid( true ); |
672 | connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ), | 672 | connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ), |
673 | SLOT( dateChanged( QDate ) ) ); | 673 | SLOT( dateChanged( QDate ) ) ); |
674 | 674 | ||
675 | label->setBuddy( mAnniversaryPicker ); | 675 | label->setBuddy( mAnniversaryPicker ); |
676 | layout->addMultiCellWidget( nbox, iii, iii, 1, 2 ); | 676 | layout->addMultiCellWidget( nbox, iii, iii, 1, 2 ); |
677 | ++iii; | 677 | ++iii; |
678 | 678 | ||
679 | } else { | 679 | } else { |
680 | 680 | ||
681 | label = new QLabel( i18n( "Birthday:" ), tab2 ); | 681 | label = new QLabel( i18n( "Birthday:" ), tab2 ); |
682 | layout->addWidget( label, iii, 1 ); | 682 | layout->addWidget( label, iii, 1 ); |
683 | mBirthdayPicker = new KDateEdit( tab2 ); | 683 | mBirthdayPicker = new KDateEdit( tab2 ); |
684 | mBirthdayPicker->toggleDateFormat(); | 684 | //mBirthdayPicker->toggleDateFormat(); |
685 | mBirthdayPicker->setHandleInvalid( true ); | 685 | mBirthdayPicker->setHandleInvalid( true ); |
686 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), | 686 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), |
687 | SLOT( dateChanged( QDate ) ) ); | 687 | SLOT( dateChanged( QDate ) ) ); |
688 | 688 | ||
689 | label->setBuddy( mBirthdayPicker ); | 689 | label->setBuddy( mBirthdayPicker ); |
690 | layout->addWidget( mBirthdayPicker, iii, 2 ); | 690 | layout->addWidget( mBirthdayPicker, iii, 2 ); |
691 | ++iii; | 691 | ++iii; |
692 | 692 | ||
693 | label = new QLabel( i18n( "Anniversary:" ), tab2 ); | 693 | label = new QLabel( i18n( "Anniversary:" ), tab2 ); |
694 | layout->addWidget( label, iii, 1 ); | 694 | layout->addWidget( label, iii, 1 ); |
695 | mAnniversaryPicker = new KDateEdit( tab2 ); | 695 | mAnniversaryPicker = new KDateEdit( tab2 ); |
696 | mAnniversaryPicker->setHandleInvalid( true ); | 696 | mAnniversaryPicker->setHandleInvalid( true ); |
697 | connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ), | 697 | connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ), |
698 | SLOT( dateChanged( QDate ) ) ); | 698 | SLOT( dateChanged( QDate ) ) ); |
699 | 699 | ||
700 | label->setBuddy( mAnniversaryPicker ); | 700 | label->setBuddy( mAnniversaryPicker ); |
701 | layout->addWidget( mAnniversaryPicker, iii, 2 ); | 701 | layout->addWidget( mAnniversaryPicker, iii, 2 ); |
702 | ++iii; | 702 | ++iii; |
703 | 703 | ||
704 | } | 704 | } |
705 | 705 | ||
706 | label = new QLabel( i18n( "Gender:" ), tab2 ); | 706 | label = new QLabel( i18n( "Gender:" ), tab2 ); |
707 | layout->addWidget( label, iii, 1 ); | 707 | layout->addWidget( label, iii, 1 ); |
708 | mGenderBox = new QComboBox ( tab2 ); | 708 | mGenderBox = new QComboBox ( tab2 ); |
@@ -1058,50 +1058,48 @@ void AddresseeEditorWidget::load() | |||
1058 | else if ( gen == "male" ) | 1058 | else if ( gen == "male" ) |
1059 | mGenderBox->setCurrentItem ( 2 ); | 1059 | mGenderBox->setCurrentItem ( 2 ); |
1060 | else | 1060 | else |
1061 | mGenderBox->setCurrentItem ( 0 ); | 1061 | mGenderBox->setCurrentItem ( 0 ); |
1062 | blockSignals( block ); | 1062 | blockSignals( block ); |
1063 | mBlockSignals = false; | 1063 | mBlockSignals = false; |
1064 | 1064 | ||
1065 | mDirty = false; | 1065 | mDirty = false; |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | void AddresseeEditorWidget::save() | 1068 | void AddresseeEditorWidget::save() |
1069 | { | 1069 | { |
1070 | if ( !dirty() ) { | 1070 | if ( !dirty() ) { |
1071 | return; | 1071 | return; |
1072 | } | 1072 | } |
1073 | 1073 | ||
1074 | mAddressee.setRevision( QDateTime::currentDateTime() ); | 1074 | mAddressee.setRevision( QDateTime::currentDateTime() ); |
1075 | 1075 | ||
1076 | mAddressee.setRole( mRoleEdit->text() ); | 1076 | mAddressee.setRole( mRoleEdit->text() ); |
1077 | mAddressee.setOrganization( mOrgEdit->text() ); | 1077 | mAddressee.setOrganization( mOrgEdit->text() ); |
1078 | mAddressee.setUrl( KURL( mURLEdit->text() ) ); | 1078 | mAddressee.setUrl( KURL( mURLEdit->text() ) ); |
1079 | mAddressee.setNote( mNoteEdit->text() ); | 1079 | mAddressee.setNote( mNoteEdit->text() ); |
1080 | if ( mBirthdayPicker->inputIsValid() ) { | 1080 | if ( mBirthdayPicker->inputIsValid() ) { |
1081 | QDate da = mBirthdayPicker->date(); | 1081 | QDate da = mBirthdayPicker->date(); |
1082 | if ( da > QDate::currentDate() ) | ||
1083 | da.setYMD(da.year()-100, da.month(), da.day() ); | ||
1084 | mAddressee.setBirthday( QDateTime( da ) ); | 1082 | mAddressee.setBirthday( QDateTime( da ) ); |
1085 | //qDebug("bday %s ",da.toString().latin1()); | 1083 | //qDebug("bday %s ",da.toString().latin1()); |
1086 | } | 1084 | } |
1087 | else { | 1085 | else { |
1088 | mAddressee.setBirthday( QDateTime() ); | 1086 | mAddressee.setBirthday( QDateTime() ); |
1089 | mBirthdayPicker->clear(); | 1087 | mBirthdayPicker->clear(); |
1090 | } | 1088 | } |
1091 | mAddressee.setNickName( mNicknameEdit->text() ); | 1089 | mAddressee.setNickName( mNicknameEdit->text() ); |
1092 | mAddressee.setCategories( QStringList::split( ",", mCategoryEdit->text() ) ); | 1090 | mAddressee.setCategories( QStringList::split( ",", mCategoryEdit->text() ) ); |
1093 | 1091 | ||
1094 | mAddressee.setGeo( mGeoWidget->geo() ); | 1092 | mAddressee.setGeo( mGeoWidget->geo() ); |
1095 | mAddressee.setPhoto( mImageWidget->photo() ); | 1093 | mAddressee.setPhoto( mImageWidget->photo() ); |
1096 | mAddressee.setLogo( mImageWidget->logo() ); | 1094 | mAddressee.setLogo( mImageWidget->logo() ); |
1097 | mAddressee.setKeys( mKeyWidget->keys() ); | 1095 | mAddressee.setKeys( mKeyWidget->keys() ); |
1098 | #ifndef KAB_EMBEDDED | 1096 | #ifndef KAB_EMBEDDED |
1099 | mAddressee.setSound( mSoundWidget->sound() ); | 1097 | mAddressee.setSound( mSoundWidget->sound() ); |
1100 | #else //KAB_EMBEDDED | 1098 | #else //KAB_EMBEDDED |
1101 | //US qDebug("AddresseeEditorWidget::save sound not supported"); | 1099 | //US qDebug("AddresseeEditorWidget::save sound not supported"); |
1102 | #endif //KAB_EMBEDDED | 1100 | #endif //KAB_EMBEDDED |
1103 | mAddressee.setSecrecy( mSecrecyWidget->secrecy() ); | 1101 | mAddressee.setSecrecy( mSecrecyWidget->secrecy() ); |
1104 | 1102 | ||
1105 | // save custom fields | 1103 | // save custom fields |
1106 | mAddressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", mIMAddressEdit->text() ); | 1104 | mAddressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", mIMAddressEdit->text() ); |
1107 | mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() ); | 1105 | mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() ); |