ask for readwrite resources if the user wants them to reload in the case of an

external change.

6 files changed, 33 insertions, 12 deletions

diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 7825c6f..52863d5 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -46,2 +46,3 @@ $Id$
 #include <kurlrequester.h>
+#include <kmessagebox.h>
 
@@ -56,4 +57,2 @@ $Id$
 #include <qdir.h>
-//US #include "../../formats/vcardformatplugin2.h"
-//US #include "../../formats/binaryformat.h"
 
@@ -347,4 +346,7 @@ void ResourceDir::pathChanged()
 
-  load();
-  addressBook()->emitAddressBookChanged();
+  QString text( i18n( "Dir resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mPath ) );
+  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
+    load();
+    addressBook()->emitAddressBookChanged();
+  }
 }
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 9f9b00f..1d3acec 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -44,2 +44,3 @@ $Id$
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
@@ -374,4 +375,9 @@ void ResourceFile::fileChanged()
     return;
-  load();
-  addressBook()->emitAddressBookChanged();
+    
+  
+  QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
+    load();
+    addressBook()->emitAddressBookChanged();
+  }
 }
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 1436508..aaee801 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -42,2 +42,3 @@ $Id$
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
@@ -94,5 +95,3 @@ void ResourceOpie::init( const QString &fileName )
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-  
-  //US opie addressbook is always readonly
-//US  setReadOnly( true );
+ 
 
@@ -373,2 +372,9 @@ void ResourceOpie::fileChanged()
     return;
+  
+  QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
+    load();
+    addressBook()->emitAddressBookChanged();
+  }
+  
   load();
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 4854197..7475685 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -42,2 +42,3 @@ $Id$
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
@@ -337,4 +338,8 @@ void ResourceQtopia::fileChanged()
     return;
-  load();
-  addressBook()->emitAddressBookChanged();
+  
+  QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
+    load();
+    addressBook()->emitAddressBookChanged();
+  }
 }
diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp
index 8f566cf..a42499f 100644
--- a/kaddressbook/details/detailsviewcontainer.cpp
+++ b/kaddressbook/details/detailsviewcontainer.cpp
@@ -136,4 +136,5 @@ void ViewContainer::refreshView()
 {
-    if ( mCurrentLook  )
+    if ( mCurrentLook  ) {
         mCurrentLook->setAddressee( mCurrentAddressee );
+    }
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2b07541..a7ca0ce 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1126,2 +1126,3 @@ void KABCore::addressBookChanged()
   mViewManager->refreshView();
+//  mDetails->refreshView();