Diffstat (limited to 'kaddressbook/addresseeeditorwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index c6993e9..bd32859 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -953,96 +953,106 @@ void AddresseeEditorWidget::setupTab3_1() | |||
953 | ////////////////////////////////////// | 953 | ////////////////////////////////////// |
954 | // Images | 954 | // Images |
955 | mImageWidget = new ImageWidget( tab3 ); | 955 | mImageWidget = new ImageWidget( tab3 ); |
956 | mImageWidget->setMinimumSize( mImageWidget->sizeHint() ); | 956 | mImageWidget->setMinimumSize( mImageWidget->sizeHint() ); |
957 | connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); | 957 | connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); |
958 | layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop ); | 958 | layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop ); |
959 | /*US | 959 | /*US |
960 | ////////////////////////////////////// | 960 | ////////////////////////////////////// |
961 | // Keys | 961 | // Keys |
962 | mKeyWidget = new KeyWidget( tab3 ); | 962 | mKeyWidget = new KeyWidget( tab3 ); |
963 | mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() ); | 963 | mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() ); |
964 | connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); | 964 | connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) ); |
965 | layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop ); | 965 | layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop ); |
966 | */ | 966 | */ |
967 | mTabWidget->addTab( tab3, i18n( "&Images" ) ); | 967 | mTabWidget->addTab( tab3, i18n( "&Images" ) ); |
968 | } | 968 | } |
969 | 969 | ||
970 | 970 | ||
971 | void AddresseeEditorWidget::load() | 971 | void AddresseeEditorWidget::load() |
972 | { | 972 | { |
973 | 973 | ||
974 | // Block signals in case anything tries to emit modified | 974 | // Block signals in case anything tries to emit modified |
975 | // CS: This doesn't seem to work. | 975 | // CS: This doesn't seem to work. |
976 | bool block = signalsBlocked(); | 976 | bool block = signalsBlocked(); |
977 | blockSignals( true ); | 977 | blockSignals( true ); |
978 | mBlockSignals = true; // used for internal signal blocking | 978 | mBlockSignals = true; // used for internal signal blocking |
979 | 979 | ||
980 | mNameEdit->setText( mAddressee.assembledName() ); | 980 | mNameEdit->setText( mAddressee.assembledName() ); |
981 | 981 | ||
982 | if ( mAddressee.formattedName().isEmpty() ) { | 982 | if ( mAddressee.formattedName().isEmpty() ) { |
983 | //US KConfig config( "kaddressbookrc" ); | 983 | //US KConfig config( "kaddressbookrc" ); |
984 | KConfig config( locateLocal("config", "kabcrc") ); | 984 | KConfig config( locateLocal("config", "kabcrc") ); |
985 | config.setGroup( "General" ); | 985 | config.setGroup( "General" ); |
986 | mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 ); | 986 | mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 ); |
987 | mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) ); | 987 | mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) ); |
988 | } else {; | 988 | } else {; |
989 | if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::SimpleName ) ) | 989 | if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::SimpleName ) ) |
990 | mFormattedNameType = NameEditDialog::SimpleName; | 990 | mFormattedNameType = NameEditDialog::SimpleName; |
991 | else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::FullName ) ) | 991 | else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::FullName ) ) |
992 | mFormattedNameType = NameEditDialog::FullName; | 992 | mFormattedNameType = NameEditDialog::FullName; |
993 | else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::ReverseName ) ) | 993 | else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::ReverseName ) ) |
994 | mFormattedNameType = NameEditDialog::ReverseName; | 994 | mFormattedNameType = NameEditDialog::ReverseName; |
995 | else | 995 | else |
996 | mFormattedNameType = NameEditDialog::CustomName; | 996 | mFormattedNameType = NameEditDialog::CustomName; |
997 | } | 997 | } |
998 | 998 | ||
999 | mFormattedNameLabel->setText( mAddressee.formattedName() ); | 999 | mFormattedNameLabel->setText( mAddressee.formattedName() ); |
1000 | 1000 | ||
1001 | mAConfig->setUid( mAddressee.uid() ); | ||
1002 | if ( mAConfig->automaticNameParsing() ) { | ||
1003 | mNameLabel->hide(); | ||
1004 | mNameEdit->show(); | ||
1005 | } else { | ||
1006 | mNameEdit->hide(); | ||
1007 | mNameLabel->setText( mNameEdit->text() ); | ||
1008 | mNameLabel->show(); | ||
1009 | } | ||
1010 | |||
1001 | mRoleEdit->setText( mAddressee.role() ); | 1011 | mRoleEdit->setText( mAddressee.role() ); |
1002 | mOrgEdit->setText( mAddressee.organization() ); | 1012 | mOrgEdit->setText( mAddressee.organization() ); |
1003 | 1013 | ||
1004 | //US mURLEdit->setURL( mAddressee.url().url() ); | 1014 | //US mURLEdit->setURL( mAddressee.url().url() ); |
1005 | mURLEdit->setText( mAddressee.url().prettyURL() ); | 1015 | mURLEdit->setText( mAddressee.url().prettyURL() ); |
1006 | //US?? mURLEdit->home( false ); | 1016 | //US?? mURLEdit->home( false ); |
1007 | 1017 | ||
1008 | // mNoteEdit->setText( mAddressee.note() ); | 1018 | // mNoteEdit->setText( mAddressee.note() ); |
1009 | mNoteEdit->setText( mAddressee.note() ); | 1019 | mNoteEdit->setText( mAddressee.note() ); |
1010 | mEmailWidget->setEmails( mAddressee.emails() ); | 1020 | mEmailWidget->setEmails( mAddressee.emails() ); |
1011 | mPhoneEditWidget->setPhoneNumbers( mAddressee.phoneNumbers() ); | 1021 | mPhoneEditWidget->setPhoneNumbers( mAddressee.phoneNumbers() ); |
1012 | mAddressEditWidget->setAddresses( mAddressee, mAddressee.addresses() ); | 1022 | mAddressEditWidget->setAddresses( mAddressee, mAddressee.addresses() ); |
1013 | mBirthdayPicker->setDate( mAddressee.birthday().date() ); | 1023 | mBirthdayPicker->setDate( mAddressee.birthday().date() ); |
1014 | 1024 | ||
1015 | //US mAnniversaryPicker->setDate( QDate::fromString( mAddressee.custom( | 1025 | //US mAnniversaryPicker->setDate( QDate::fromString( mAddressee.custom( |
1016 | //US "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate) ); | 1026 | //US "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate) ); |
1017 | QDate dt = KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), | 1027 | QDate dt = KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), |
1018 | "%Y-%m-%d"); // = Qt::ISODate | 1028 | "%Y-%m-%d"); // = Qt::ISODate |
1019 | mAnniversaryPicker->setDate( dt ); | 1029 | mAnniversaryPicker->setDate( dt ); |
1020 | 1030 | ||
1021 | 1031 | ||
1022 | mNicknameEdit->setText( mAddressee.nickName() ); | 1032 | mNicknameEdit->setText( mAddressee.nickName() ); |
1023 | mCategoryEdit->setText( mAddressee.categories().join( "," ) ); | 1033 | mCategoryEdit->setText( mAddressee.categories().join( "," ) ); |
1024 | 1034 | ||
1025 | mGeoWidget->setGeo( mAddressee.geo() ); | 1035 | mGeoWidget->setGeo( mAddressee.geo() ); |
1026 | mImageWidget->setPhoto( mAddressee.photo() ); | 1036 | mImageWidget->setPhoto( mAddressee.photo() ); |
1027 | mImageWidget->setLogo( mAddressee.logo() ); | 1037 | mImageWidget->setLogo( mAddressee.logo() ); |
1028 | mKeyWidget->setKeys( mAddressee.keys() ); | 1038 | mKeyWidget->setKeys( mAddressee.keys() ); |
1029 | mSecrecyWidget->setSecrecy( mAddressee.secrecy() ); | 1039 | mSecrecyWidget->setSecrecy( mAddressee.secrecy() ); |
1030 | #ifndef KAB_EMBEDDED | 1040 | #ifndef KAB_EMBEDDED |
1031 | mSoundWidget->setSound( mAddressee.sound() ); | 1041 | mSoundWidget->setSound( mAddressee.sound() ); |
1032 | #else //KAB_EMBEDDED | 1042 | #else //KAB_EMBEDDED |
1033 | //US qDebug("AddresseeEditorWidget::load has to be changed 2"); | 1043 | //US qDebug("AddresseeEditorWidget::load has to be changed 2"); |
1034 | #endif //KAB_EMBEDDED | 1044 | #endif //KAB_EMBEDDED |
1035 | 1045 | ||
1036 | // Load customs | 1046 | // Load customs |
1037 | mIMAddressEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ) ); | 1047 | mIMAddressEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ) ); |
1038 | mSpouseEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ) ); | 1048 | mSpouseEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ) ); |
1039 | mChildEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Children" ) ); | 1049 | mChildEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Children" ) ); |
1040 | mManagerEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" ) ); | 1050 | mManagerEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" ) ); |
1041 | mAssistantEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" ) ); | 1051 | mAssistantEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" ) ); |
1042 | mDepartmentEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Department" ) ); | 1052 | mDepartmentEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Department" ) ); |
1043 | mOfficeEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Office" ) ); | 1053 | mOfficeEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Office" ) ); |
1044 | mProfessionEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Profession" ) ); | 1054 | mProfessionEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Profession" ) ); |
1045 | QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); | 1055 | QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); |
1046 | if ( gen == "female" ) | 1056 | if ( gen == "female" ) |
1047 | mGenderBox->setCurrentItem ( 1 ); | 1057 | mGenderBox->setCurrentItem ( 1 ); |
1048 | else if ( gen == "male" ) | 1058 | else if ( gen == "male" ) |
@@ -1160,99 +1170,99 @@ void AddresseeEditorWidget::save() | |||
1160 | 1170 | ||
1161 | bool AddresseeEditorWidget::dirty() | 1171 | bool AddresseeEditorWidget::dirty() |
1162 | { | 1172 | { |
1163 | 1173 | ||
1164 | if ( ! mDirty ) { | 1174 | if ( ! mDirty ) { |
1165 | if ( mBirthdayPicker->inputIsValid() ) { | 1175 | if ( mBirthdayPicker->inputIsValid() ) { |
1166 | QDate da = mBirthdayPicker->date(); | 1176 | QDate da = mBirthdayPicker->date(); |
1167 | if ( !(da == mAddressee.birthday().date())) | 1177 | if ( !(da == mAddressee.birthday().date())) |
1168 | mDirty = true; | 1178 | mDirty = true; |
1169 | } | 1179 | } |
1170 | else { | 1180 | else { |
1171 | mBirthdayPicker->clear(); | 1181 | mBirthdayPicker->clear(); |
1172 | } | 1182 | } |
1173 | if ( mAnniversaryPicker->inputIsValid() ) { | 1183 | if ( mAnniversaryPicker->inputIsValid() ) { |
1174 | QDate da = mAnniversaryPicker->date(); | 1184 | QDate da = mAnniversaryPicker->date(); |
1175 | if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), | 1185 | if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), |
1176 | "%Y-%m-%d")) | 1186 | "%Y-%m-%d")) |
1177 | mDirty = true; | 1187 | mDirty = true; |
1178 | } | 1188 | } |
1179 | else { | 1189 | else { |
1180 | mAnniversaryPicker->clear(); | 1190 | mAnniversaryPicker->clear(); |
1181 | } | 1191 | } |
1182 | } | 1192 | } |
1183 | return mDirty; | 1193 | return mDirty; |
1184 | } | 1194 | } |
1185 | 1195 | ||
1186 | void AddresseeEditorWidget::nameTextChanged( const QString &text ) | 1196 | void AddresseeEditorWidget::nameTextChanged( const QString &text ) |
1187 | { | 1197 | { |
1188 | if ( mBlockSignals ) | 1198 | if ( mBlockSignals ) |
1189 | return; | 1199 | return; |
1190 | // use the addressee class to parse the name for us | 1200 | // use the addressee class to parse the name for us |
1191 | mAConfig->setUid( mAddressee.uid() ); | 1201 | mAConfig->setUid( mAddressee.uid() ); |
1192 | if ( mAConfig->automaticNameParsing() ) { | 1202 | if ( mAConfig->automaticNameParsing() ) { |
1193 | if ( !mAddressee.formattedName().isEmpty() ) { | 1203 | if ( !mAddressee.formattedName().isEmpty() ) { |
1194 | QString fn = mAddressee.formattedName(); | 1204 | QString fn = mAddressee.formattedName(); |
1195 | mAddressee.setNameFromString( text ); | 1205 | mAddressee.setNameFromString( text ); |
1196 | mAddressee.setFormattedName( fn ); | 1206 | mAddressee.setFormattedName( fn ); |
1197 | } else { | 1207 | } else { |
1198 | // use extra addressee to avoid a formatted name assignment | 1208 | // use extra addressee to avoid a formatted name assignment |
1199 | Addressee addr; | 1209 | Addressee addr; |
1200 | addr.setNameFromString( text ); | 1210 | addr.setNameFromString( text ); |
1201 | mAddressee.setPrefix( addr.prefix() ); | 1211 | mAddressee.setPrefix( addr.prefix() ); |
1202 | mAddressee.setGivenName( addr.givenName() ); | 1212 | mAddressee.setGivenName( addr.givenName() ); |
1203 | mAddressee.setAdditionalName( addr.additionalName() ); | 1213 | mAddressee.setAdditionalName( addr.additionalName() ); |
1204 | mAddressee.setFamilyName( addr.familyName() ); | 1214 | mAddressee.setFamilyName( addr.familyName() ); |
1205 | mAddressee.setSuffix( addr.suffix() ); | 1215 | mAddressee.setSuffix( addr.suffix() ); |
1206 | } | 1216 | } |
1207 | } | 1217 | } |
1208 | |||
1209 | nameBoxChanged(); | 1218 | nameBoxChanged(); |
1210 | 1219 | ||
1220 | |||
1211 | emitModified(); | 1221 | emitModified(); |
1212 | } | 1222 | } |
1213 | 1223 | ||
1214 | void AddresseeEditorWidget::nameBoxChanged() | 1224 | void AddresseeEditorWidget::nameBoxChanged() |
1215 | { | 1225 | { |
1216 | KABC::Addressee addr; | 1226 | KABC::Addressee addr; |
1217 | mAConfig->setUid( mAddressee.uid() ); | 1227 | mAConfig->setUid( mAddressee.uid() ); |
1218 | if ( mAConfig->automaticNameParsing() ) { | 1228 | if ( mAConfig->automaticNameParsing() ) { |
1219 | addr.setNameFromString( mNameEdit->text() ); | 1229 | addr.setNameFromString( mNameEdit->text() ); |
1220 | mNameLabel->hide(); | 1230 | mNameLabel->hide(); |
1221 | mNameEdit->show(); | 1231 | mNameEdit->show(); |
1222 | } else { | 1232 | } else { |
1223 | addr = mAddressee; | 1233 | addr = mAddressee; |
1224 | mNameEdit->hide(); | 1234 | mNameEdit->hide(); |
1225 | mNameLabel->setText( mNameEdit->text() ); | 1235 | mNameLabel->setText( mNameEdit->text() ); |
1226 | mNameLabel->show(); | 1236 | mNameLabel->show(); |
1227 | } | 1237 | } |
1228 | 1238 | ||
1229 | if ( mFormattedNameType != NameEditDialog::CustomName ) { | 1239 | if ( mFormattedNameType != NameEditDialog::CustomName ) { |
1230 | mFormattedNameLabel->setText( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) ); | 1240 | mFormattedNameLabel->setText( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) ); |
1231 | mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) ); | 1241 | mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) ); |
1232 | } | 1242 | } |
1233 | } | 1243 | } |
1234 | 1244 | ||
1235 | void AddresseeEditorWidget::nameButtonClicked() | 1245 | void AddresseeEditorWidget::nameButtonClicked() |
1236 | { | 1246 | { |
1237 | // show the name dialog. | 1247 | // show the name dialog. |
1238 | NameEditDialog dialog( mAddressee, mFormattedNameType, this ); | 1248 | NameEditDialog dialog( mAddressee, mFormattedNameType, this ); |
1239 | 1249 | ||
1240 | if ( KApplication::execDialog( &dialog) ) { | 1250 | if ( KApplication::execDialog( &dialog) ) { |
1241 | if ( dialog.changed() ) { | 1251 | if ( dialog.changed() ) { |
1242 | mAddressee.setFamilyName( dialog.familyName() ); | 1252 | mAddressee.setFamilyName( dialog.familyName() ); |
1243 | mAddressee.setGivenName( dialog.givenName() ); | 1253 | mAddressee.setGivenName( dialog.givenName() ); |
1244 | mAddressee.setPrefix( dialog.prefix() ); | 1254 | mAddressee.setPrefix( dialog.prefix() ); |
1245 | mAddressee.setSuffix( dialog.suffix() ); | 1255 | mAddressee.setSuffix( dialog.suffix() ); |
1246 | mAddressee.setAdditionalName( dialog.additionalName() ); | 1256 | mAddressee.setAdditionalName( dialog.additionalName() ); |
1247 | mFormattedNameType = dialog.formattedNameType(); | 1257 | mFormattedNameType = dialog.formattedNameType(); |
1248 | if ( mFormattedNameType == NameEditDialog::CustomName ) { | 1258 | if ( mFormattedNameType == NameEditDialog::CustomName ) { |
1249 | mFormattedNameLabel->setText( dialog.customFormattedName() ); | 1259 | mFormattedNameLabel->setText( dialog.customFormattedName() ); |
1250 | mAddressee.setFormattedName( dialog.customFormattedName() ); | 1260 | mAddressee.setFormattedName( dialog.customFormattedName() ); |
1251 | } | 1261 | } |
1252 | // Update the name edit. | 1262 | // Update the name edit. |
1253 | bool block = mNameEdit->signalsBlocked(); | 1263 | bool block = mNameEdit->signalsBlocked(); |
1254 | mNameEdit->blockSignals( true ); | 1264 | mNameEdit->blockSignals( true ); |
1255 | mNameEdit->setText( mAddressee.assembledName() ); | 1265 | mNameEdit->setText( mAddressee.assembledName() ); |
1256 | mNameEdit->blockSignals( block ); | 1266 | mNameEdit->blockSignals( block ); |
1257 | 1267 | ||
1258 | // Update the combo box. | 1268 | // Update the combo box. |