summaryrefslogtreecommitdiffabout
path: root/kaddressbook
Side-by-side diff
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp21
-rw-r--r--kaddressbook/kabcore.h2
2 files changed, 15 insertions, 8 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 8daca33..2b07541 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1097,28 +1097,38 @@ void KABCore::configurationChanged()
{
mExtensionManager->reconfigure();
}
void KABCore::addressBookChanged()
{
-#ifndef KAB_EMBEDDED
+/*US
QDictIterator<AddresseeEditorDialog> it( mEditorDict );
while ( it.current() ) {
if ( it.current()->dirty() ) {
QString text = i18n( "Data has been changed externally. Unsaved "
"changes will be lost." );
KMessageBox::information( this, text );
}
it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
++it;
}
-
+*/
+ if (mEditorDialog)
+ {
+ if (mEditorDialog->dirty())
+ {
+ QString text = i18n( "Data has been changed externally. Unsaved "
+ "changes will be lost." );
+ KMessageBox::information( this, text );
+ }
+ QString currentuid = mEditorDialog->addressee().uid();
+ mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
+ }
mViewManager->refreshView();
-#else //KAB_EMBEDDED
- qDebug("KABCore::addressBookChanged() finsih method");
-#endif //KAB_EMBEDDED
+
+
}
AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
const char *name )
{
@@ -1135,13 +1145,12 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
return mEditorDialog;
}
void KABCore::slotEditorDestroyed( const QString &uid )
{
- qDebug("KABCore::slotEditorDestroyed called. maybe a problem! ");
//mEditorDict.remove( uid );
}
void KABCore::initGUI()
{
#ifndef KAB_EMBEDDED
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 69a98a5..6446974 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -353,14 +353,12 @@ class KABCore : public QWidget
IncSearchWidget *mIncSearchWidget;
ExtensionManager *mExtensionManager;
KCMultiDialog *mConfigureDialog;
#ifndef KAB_EMBEDDED
-
- KCMultiDialog *mConfigureDialog;
LDAPSearchDialog *mLdapSearchDialog;
#endif //KAB_EMBEDDED
// QDict<AddresseeEditorDialog> mEditorDict;
AddresseeEditorDialog *mEditorDialog;
bool mReadWrite;
bool mModified;