-rw-r--r-- | kaddressbook/addresseeeditordialog.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a84fc61..b5a60f2 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp | |||
@@ -54,33 +54,33 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent, | |||
54 | if ( QApplication::desktop()->width() < 480 ) { | 54 | if ( QApplication::desktop()->width() < 480 ) { |
55 | hideButtons(); | 55 | hideButtons(); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | AddresseeEditorDialog::~AddresseeEditorDialog() | 59 | AddresseeEditorDialog::~AddresseeEditorDialog() |
60 | { | 60 | { |
61 | //emit editorDestroyed( mEditorWidget->addressee().uid() ); | 61 | //emit editorDestroyed( mEditorWidget->addressee().uid() ); |
62 | } | 62 | } |
63 | 63 | ||
64 | void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) | 64 | void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) |
65 | { | 65 | { |
66 | enableButton( KDialogBase::Apply, false ); | 66 | enableButton( KDialogBase::Apply, false ); |
67 | 67 | ||
68 | mEditorWidget->setAddressee( addr ); | 68 | mEditorWidget->setAddressee( addr ); |
69 | 69 | ||
70 | this->setCaption("Edit " + addr.formattedName()); | 70 | this->setCaption(i18n ("Edit ") + addr.formattedName()); |
71 | } | 71 | } |
72 | 72 | ||
73 | KABC::Addressee AddresseeEditorDialog::addressee() | 73 | KABC::Addressee AddresseeEditorDialog::addressee() |
74 | { | 74 | { |
75 | return mEditorWidget->addressee(); | 75 | return mEditorWidget->addressee(); |
76 | } | 76 | } |
77 | 77 | ||
78 | bool AddresseeEditorDialog::dirty() | 78 | bool AddresseeEditorDialog::dirty() |
79 | { | 79 | { |
80 | return mEditorWidget->dirty(); | 80 | return mEditorWidget->dirty(); |
81 | } | 81 | } |
82 | 82 | ||
83 | void AddresseeEditorDialog::slotApply() | 83 | void AddresseeEditorDialog::slotApply() |
84 | { | 84 | { |
85 | if ( mEditorWidget->dirty() ) { | 85 | if ( mEditorWidget->dirty() ) { |
86 | mEditorWidget->save(); | 86 | mEditorWidget->save(); |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3f9b546..e1a490d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1247,32 +1247,33 @@ void KABCore::newContact() | |||
1247 | while ( ( resource = it.current() ) != 0 ) { | 1247 | while ( ( resource = it.current() ) != 0 ) { |
1248 | ++it; | 1248 | ++it; |
1249 | if ( !resource->readOnly() ) { | 1249 | if ( !resource->readOnly() ) { |
1250 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); | 1250 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); |
1251 | if ( res ) | 1251 | if ( res ) |
1252 | kresResources.append( res ); | 1252 | kresResources.append( res ); |
1253 | } | 1253 | } |
1254 | } | 1254 | } |
1255 | 1255 | ||
1256 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this ); | 1256 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this ); |
1257 | resource = static_cast<KABC::Resource*>( res ); | 1257 | resource = static_cast<KABC::Resource*>( res ); |
1258 | 1258 | ||
1259 | if ( resource ) { | 1259 | if ( resource ) { |
1260 | KABC::Addressee addr; | 1260 | KABC::Addressee addr; |
1261 | addr.setResource( resource ); | 1261 | addr.setResource( resource ); |
1262 | mEditorDialog->setAddressee( addr ); | 1262 | mEditorDialog->setAddressee( addr ); |
1263 | mEditorDialog->setCaption( i18n("Edit new contact")); | ||
1263 | KApplication::execDialog ( mEditorDialog ); | 1264 | KApplication::execDialog ( mEditorDialog ); |
1264 | 1265 | ||
1265 | } else | 1266 | } else |
1266 | return; | 1267 | return; |
1267 | 1268 | ||
1268 | // mEditorDict.insert( dialog->addressee().uid(), dialog ); | 1269 | // mEditorDict.insert( dialog->addressee().uid(), dialog ); |
1269 | 1270 | ||
1270 | 1271 | ||
1271 | } | 1272 | } |
1272 | 1273 | ||
1273 | void KABCore::addEmail( QString aStr ) | 1274 | void KABCore::addEmail( QString aStr ) |
1274 | { | 1275 | { |
1275 | #ifndef KAB_EMBEDDED | 1276 | #ifndef KAB_EMBEDDED |
1276 | QString fullName, email; | 1277 | QString fullName, email; |
1277 | 1278 | ||
1278 | KABC::Addressee::parseEmailAddress( aStr, fullName, email ); | 1279 | KABC::Addressee::parseEmailAddress( aStr, fullName, email ); |