Diffstat (limited to 'kaddressbook/addresseeeditorwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 9814cd5..966efa5 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -1143,97 +1143,97 @@ void AddresseeEditorWidget::save() | |||
1143 | mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() ); | 1143 | mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() ); |
1144 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Children", mChildEdit->text() ); | 1144 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Children", mChildEdit->text() ); |
1145 | mAddressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", mManagerEdit->text() ); | 1145 | mAddressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", mManagerEdit->text() ); |
1146 | mAddressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", mAssistantEdit->text() ); | 1146 | mAddressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", mAssistantEdit->text() ); |
1147 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Department", mDepartmentEdit->text() ); | 1147 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Department", mDepartmentEdit->text() ); |
1148 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Office", mOfficeEdit->text() ); | 1148 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Office", mOfficeEdit->text() ); |
1149 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Profession", mProfessionEdit->text() ); | 1149 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Profession", mProfessionEdit->text() ); |
1150 | if ( mAnniversaryPicker->inputIsValid() ) { | 1150 | if ( mAnniversaryPicker->inputIsValid() ) { |
1151 | QString dt = KGlobal::locale()->formatDate(mAnniversaryPicker->date(), true, KLocale::ISODate); | 1151 | QString dt = KGlobal::locale()->formatDate(mAnniversaryPicker->date(), true, KLocale::ISODate); |
1152 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 1152 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
1153 | } | 1153 | } |
1154 | else { | 1154 | else { |
1155 | mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" ); | 1155 | mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" ); |
1156 | mAnniversaryPicker->clear(); | 1156 | mAnniversaryPicker->clear(); |
1157 | } | 1157 | } |
1158 | int gen = mGenderBox->currentItem (); | 1158 | int gen = mGenderBox->currentItem (); |
1159 | if ( gen == 1 ) | 1159 | if ( gen == 1 ) |
1160 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); | 1160 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); |
1161 | else if ( gen == 2 ) | 1161 | else if ( gen == 2 ) |
1162 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); | 1162 | mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); |
1163 | else | 1163 | else |
1164 | mAddressee.removeCustom( "KADDRESSBOOK", "X-Gender" ); | 1164 | mAddressee.removeCustom( "KADDRESSBOOK", "X-Gender" ); |
1165 | 1165 | ||
1166 | // Save the email addresses | 1166 | // Save the email addresses |
1167 | QStringList emails = mAddressee.emails(); | 1167 | QStringList emails = mAddressee.emails(); |
1168 | QStringList::Iterator iter; | 1168 | QStringList::Iterator iter; |
1169 | for ( iter = emails.begin(); iter != emails.end(); ++iter ) | 1169 | for ( iter = emails.begin(); iter != emails.end(); ++iter ) |
1170 | mAddressee.removeEmail( *iter ); | 1170 | mAddressee.removeEmail( *iter ); |
1171 | 1171 | ||
1172 | emails = mEmailWidget->emails(); | 1172 | emails = mEmailWidget->emails(); |
1173 | bool first = true; | 1173 | bool first = true; |
1174 | for ( iter = emails.begin(); iter != emails.end(); ++iter ) { | 1174 | for ( iter = emails.begin(); iter != emails.end(); ++iter ) { |
1175 | mAddressee.insertEmail( *iter, first ); | 1175 | mAddressee.insertEmail( *iter, first ); |
1176 | first = false; | 1176 | first = false; |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | // Save the phone numbers | 1179 | // Save the phone numbers |
1180 | KABC::PhoneNumber::List phoneNumbers; | 1180 | KABC::PhoneNumber::List phoneNumbers; |
1181 | KABC::PhoneNumber::List::Iterator phoneIter; | 1181 | KABC::PhoneNumber::List::Iterator phoneIter; |
1182 | phoneNumbers = mAddressee.phoneNumbers(); | 1182 | phoneNumbers = mAddressee.phoneNumbers(); |
1183 | for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end(); | 1183 | for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end(); |
1184 | ++phoneIter ) | 1184 | ++phoneIter ) |
1185 | mAddressee.removePhoneNumber( *phoneIter ); | 1185 | mAddressee.removePhoneNumber( *phoneIter ); |
1186 | 1186 | ||
1187 | phoneNumbers = mPhoneEditWidget->phoneNumbers(); | 1187 | phoneNumbers = mPhoneEditWidget->phoneNumbers(); |
1188 | for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end(); | 1188 | for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end(); |
1189 | ++phoneIter ) | 1189 | ++phoneIter ) |
1190 | mAddressee.insertPhoneNumber( *phoneIter ); | 1190 | mAddressee.insertPhoneNumber( *phoneIter ); |
1191 | 1191 | mAddressee.makePhoneNumbersOLcompatible(); | |
1192 | // Save the addresses | 1192 | // Save the addresses |
1193 | KABC::Address::List addresses; | 1193 | KABC::Address::List addresses; |
1194 | KABC::Address::List::Iterator addressIter; | 1194 | KABC::Address::List::Iterator addressIter; |
1195 | addresses = mAddressee.addresses(); | 1195 | addresses = mAddressee.addresses(); |
1196 | for ( addressIter = addresses.begin(); addressIter != addresses.end(); | 1196 | for ( addressIter = addresses.begin(); addressIter != addresses.end(); |
1197 | ++addressIter ) | 1197 | ++addressIter ) |
1198 | mAddressee.removeAddress( *addressIter ); | 1198 | mAddressee.removeAddress( *addressIter ); |
1199 | 1199 | ||
1200 | addresses = mAddressEditWidget->addresses(); | 1200 | addresses = mAddressEditWidget->addresses(); |
1201 | for ( addressIter = addresses.begin(); addressIter != addresses.end(); | 1201 | for ( addressIter = addresses.begin(); addressIter != addresses.end(); |
1202 | ++addressIter ) | 1202 | ++addressIter ) |
1203 | mAddressee.insertAddress( *addressIter ); | 1203 | mAddressee.insertAddress( *addressIter ); |
1204 | mDirty = false; | 1204 | mDirty = false; |
1205 | } | 1205 | } |
1206 | 1206 | ||
1207 | bool AddresseeEditorWidget::dirty() | 1207 | bool AddresseeEditorWidget::dirty() |
1208 | { | 1208 | { |
1209 | 1209 | ||
1210 | if ( ! mDirty ) { | 1210 | if ( ! mDirty ) { |
1211 | if ( mBirthdayPicker->inputIsValid() ) { | 1211 | if ( mBirthdayPicker->inputIsValid() ) { |
1212 | QDate da = mBirthdayPicker->date(); | 1212 | QDate da = mBirthdayPicker->date(); |
1213 | if ( !(da == mAddressee.birthday().date())) | 1213 | if ( !(da == mAddressee.birthday().date())) |
1214 | mDirty = true; | 1214 | mDirty = true; |
1215 | } | 1215 | } |
1216 | else { | 1216 | else { |
1217 | mBirthdayPicker->clear(); | 1217 | mBirthdayPicker->clear(); |
1218 | } | 1218 | } |
1219 | if ( mAnniversaryPicker->inputIsValid() ) { | 1219 | if ( mAnniversaryPicker->inputIsValid() ) { |
1220 | QDate da = mAnniversaryPicker->date(); | 1220 | QDate da = mAnniversaryPicker->date(); |
1221 | if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), | 1221 | if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), |
1222 | "%Y-%m-%d")) | 1222 | "%Y-%m-%d")) |
1223 | mDirty = true; | 1223 | mDirty = true; |
1224 | } | 1224 | } |
1225 | else { | 1225 | else { |
1226 | mAnniversaryPicker->clear(); | 1226 | mAnniversaryPicker->clear(); |
1227 | } | 1227 | } |
1228 | } | 1228 | } |
1229 | return mDirty; | 1229 | return mDirty; |
1230 | } | 1230 | } |
1231 | 1231 | ||
1232 | void AddresseeEditorWidget::nameTextChanged( const QString &text ) | 1232 | void AddresseeEditorWidget::nameTextChanged( const QString &text ) |
1233 | { | 1233 | { |
1234 | if ( mBlockSignals ) | 1234 | if ( mBlockSignals ) |
1235 | return; | 1235 | return; |
1236 | // use the addressee class to parse the name for us | 1236 | // use the addressee class to parse the name for us |
1237 | mAConfig->setUid( mAddressee.uid() ); | 1237 | mAConfig->setUid( mAddressee.uid() ); |
1238 | if ( mAConfig->automaticNameParsing() ) { | 1238 | if ( mAConfig->automaticNameParsing() ) { |
1239 | if ( !mAddressee.formattedName().isEmpty() ) { | 1239 | if ( !mAddressee.formattedName().isEmpty() ) { |