summaryrefslogtreecommitdiffabout
path: root/kabc
Side-by-side diff
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/dir/resourcedir.cpp6
-rw-r--r--kabc/plugins/file/resourcefile.cpp6
-rw-r--r--kabc/plugins/opie/resourceopie.cpp10
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp5
4 files changed, 23 insertions, 4 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
@@ -45,4 +45,5 @@ $Id$
#include <kstandarddirs.h>
#include <kurlrequester.h>
+#include <kmessagebox.h>
#include "addressbook.h"
@@ -55,6 +56,4 @@ $Id$
//US
#include <qdir.h>
-//US #include "../../formats/vcardformatplugin2.h"
-//US #include "../../formats/binaryformat.h"
#include "resourcedir.h"
@@ -346,7 +345,10 @@ void ResourceDir::pathChanged()
return;
+ 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();
}
+}
void ResourceDir::removeAddressee( const Addressee& addr )
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
@@ -43,4 +43,5 @@ $Id$
//US #include <ksavefile.h>
#include <kstandarddirs.h>
+#include <kmessagebox.h>
#include "formatfactory.h"
@@ -373,7 +374,12 @@ void ResourceFile::fileChanged()
if (!addressBook())
return;
+
+
+ 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();
}
+}
void ResourceFile::removeAddressee( const Addressee &addr )
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
@@ -41,4 +41,5 @@ $Id$
//US #include <ksavefile.h>
#include <kstandarddirs.h>
+#include <kmessagebox.h>
//US #include "formatfactory.h"
@@ -94,6 +95,4 @@ void ResourceOpie::init( const QString &fileName )
connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
- //US opie addressbook is always readonly
-//US setReadOnly( true );
setFileName( fileName );
@@ -372,4 +371,11 @@ void ResourceOpie::fileChanged()
if (!addressBook())
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();
addressBook()->emitAddressBookChanged();
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
@@ -41,4 +41,5 @@ $Id$
//US #include <ksavefile.h>
#include <kstandarddirs.h>
+#include <kmessagebox.h>
#include <qpe/pim/addressbookaccess.h>
@@ -336,7 +337,11 @@ void ResourceQtopia::fileChanged()
if (!addressBook())
return;
+
+ 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();
}
+}
void ResourceQtopia::removeAddressee( const Addressee &addr )