author | zautrix <zautrix> | 2005-01-16 23:41:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-16 23:41:18 (UTC) |
commit | 33c04477896c52e9cfea2a29facd959f82cbf17a (patch) (unidiff) | |
tree | d7e5a882604b3bfb64087738dd61d702d2d96a60 /kaddressbook/addresseeeditorwidget.cpp | |
parent | 507b362d42d5eed6277ad17422b6ba61acca636e (diff) | |
download | kdepimpi-33c04477896c52e9cfea2a29facd959f82cbf17a.zip kdepimpi-33c04477896c52e9cfea2a29facd959f82cbf17a.tar.gz kdepimpi-33c04477896c52e9cfea2a29facd959f82cbf17a.tar.bz2 |
several fixes
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 | |||
@@ -995,12 +995,22 @@ void AddresseeEditorWidget::load() | |||
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 ); |
@@ -1202,15 +1212,15 @@ void AddresseeEditorWidget::nameTextChanged( const QString &text ) | |||
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; |