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
@@ -1,362 +1,364 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 #include <qregexp.h>
 #include <qtimer.h>
 #include <qwidget.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 //US #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
+#include <kmessagebox.h>
 
 #include "addressbook.h"
 
 #include "formatfactory.h"
 
 #include "resourcedirconfig.h"
 #include "stdaddressbook.h"
 
 //US
 #include <qdir.h>
-//US #include "../../formats/vcardformatplugin2.h"
-//US #include "../../formats/binaryformat.h"
 
 #include "resourcedir.h"
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport) 
 #else
 {
 #endif
 
 //US  void *init_kabc_dir()
   void *init_microkabc_dir()
   {
     return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
   }
 #ifndef _WIN32_
 }
 #endif
 
 ResourceDir::ResourceDir( const KConfig *config )
     : Resource( config )
 {
   QString path;
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
 //US     path = config->readEntry( "FilePath" );
      path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
 //US     mFormatName = config->readEntry( "FileFormat" );
      mFormatName = cfg->readEntry( "FileFormat", "vcard" );
   } else {
     path = StdAddressBook::directoryName();
     mFormatName = "vcard";
   }
 
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
     mFormat = factory->format( mFormatName );
   }
 
 /*US  
 //US  qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
 */
   
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
 
   setPath( path );
 }
 
 ResourceDir::~ResourceDir()
 {
   delete mFormat;
   mFormat = 0;
 }
 
 void ResourceDir::writeConfig( KConfig *config )
 { 
     config->setGroup( "Resource_" + identifier() ); 
   Resource::writeConfig( config );
 
   config->writeEntry( "FilePath", mPath );
   config->writeEntry( "FileFormat", mFormatName );
 }
 
 Ticket *ResourceDir::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mPath ) ) {
     kdDebug(5700) << "ResourceDir::requestSaveTicket(): Unable to lock path '"
                   << mPath << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceDir::doOpen()
 {
   QDir dir( mPath );
   if ( !dir.exists() ) { // no directory available
     return dir.mkdir( dir.path() );
   } else {
     QString testName = dir.entryList( QDir::Files )[0];
     if ( testName.isNull() || testName.isEmpty() ) // no file in directory
       return true;
 
     QFile file( mPath + "/" + testName );
     if ( file.open( IO_ReadOnly ) )
       return true;
 
     if ( file.size() == 0 )
       return true;
 
     bool ok = mFormat->checkFormat( &file );
     file.close();
     return ok;
   }
 }
 
 void ResourceDir::doClose()
 {
 }
 
 bool ResourceDir::load()
 {
   kdDebug(5700) << "ResourceDir::load(): '" << mPath << "'" << endl;
 
   QDir dir( mPath );
   QStringList files = dir.entryList( QDir::Files );
 
   QStringList::Iterator it;
   bool ok = true;
   for ( it = files.begin(); it != files.end(); ++it ) {
     QFile file( mPath + "/" + (*it) );
 
     if ( !file.open( IO_ReadOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
       ok = false;
       continue;
     }
 
     if ( !mFormat->loadAll( addressBook(), this, &file ) )
       ok = false;
 
     file.close();
   }
 
   return ok;
 }
 
 bool ResourceDir::save( Ticket *ticket )
 {
   kdDebug(5700) << "ResourceDir::save(): '" << mPath << "'" << endl;
 
   AddressBook::Iterator it;
   bool ok = true;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     if ( (*it).resource() != this || !(*it).changed() )
       continue;
 
     QFile file( mPath + "/" + (*it).uid() );
     if ( !file.open( IO_WriteOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
       continue;
     }
 
     mFormat->save( *it, &file );
 
     // mark as unchanged
     (*it).setChanged( false );
 
     file.close();
   }
 
   delete ticket;
   unlock( mPath );
 
   return ok;
 }
 
 bool ResourceDir::lock( const QString &path )
 {
   kdDebug(5700) << "ResourceDir::lock()" << endl;
 
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" );
   KURL url(p);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if ( QFile::exists( lockName ) ) return false;
 
   QString lockUniqueName;
   lockUniqueName = p + KApplication::randomString( 8 );
 
   url = lockUniqueName;  
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
     
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceDir::unlock( const QString &path )
 {
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locate( "data", "kabc/lock/" + p + ".lock" );
   KURL url(p);  
   QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   ::unlink( QFile::encodeName( lockName ) );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceDir::setPath( const QString &path )
 {
   mDirWatch.stopScan();
   mDirWatch.removeDir( mPath );
   
   mPath = path;
 
   mDirWatch.addDir( mPath, true );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event  
 //US  pathChanged();
 
 }
 
 QString ResourceDir::path() const
 {
   return mPath;
 }
 
 void ResourceDir::setFormat( const QString &format )
 {
   mFormatName = format;
 
   if ( mFormat )
     delete mFormat;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 /*US 
 qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard")
     mFormat = new VCardFormatPlugin2();
   else if (mFormatName == "binary")
     mFormat = new BinaryFormat();
   else
     qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
 */
 
 }
 
 QString ResourceDir::format() const
 {
   return mFormatName;
 }
 
 void ResourceDir::pathChanged()
 {
   if ( !addressBook() )
     return;
 
-  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();
+  }
 }
 
 void ResourceDir::removeAddressee( const Addressee& addr )
 {
     QFile::remove( mPath + "/" + addr.uid() );
 }
 
 void ResourceDir::cleanUp()
 {
   unlock( mPath );
 }
 
 //US #include "resourcedir.moc"
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
@@ -1,391 +1,397 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
 #include "formatfactory.h"
 
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 
 #include "resourcefile.h"
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport) 
 #else
 {
 #endif
 
 //US  void *init_kabc_file()
   void *init_microkabc_file()
   {
     return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
   }
 #ifndef _WIN32_
 }
 #endif
 
 ResourceFile::ResourceFile( const KConfig *config )
   : Resource( config ) , mFormat( 0 )
 {
   QString fileName, formatName;
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() );
     formatName = cfg->readEntry( "FileFormat", "vcard" );
 //  qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() );
   } else {
     fileName = StdAddressBook::fileName();
     formatName = "vcard";
 //  qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() );
   }
 
   init( fileName, formatName );
 }
 
 ResourceFile::ResourceFile( const QString &fileName,
                             const QString &formatName )
   : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName, formatName );
 }
 
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
   mFormatName = formatName;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
     mFormat = factory->format( mFormatName );
   }
 
 /*US
 //US  qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
   if (mFormatName == "vcard") {
     mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::init format VCardFormatPlugin2");
   }
   else if (mFormatName == "binary") {
     mFormat = new BinaryFormat();
 //    qDebug("ResourceFile::init format BinaryFormat");
   }
   else
     qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
 */
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceFile::~ResourceFile()
 {
   delete mFormat;
   mFormat = 0;
 }
 
 void ResourceFile::writeConfig( KConfig *config )
 {
 
     config->setGroup( "Resource_" + identifier() ); 
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", mFileName );
   config->writeEntry( "FileFormat", mFormatName );
   
 //    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
   
 }
 
 Ticket *ResourceFile::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mFileName ) ) {
     kdDebug(5700) << "ResourceFile::requestSaveTicket(): Unable to lock file '"
                   << mFileName << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceFile::doOpen()
 {
   QFile file( mFileName );
 
   if ( !file.exists() ) {
     // try to create the file
     bool ok = file.open( IO_WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
     if ( !file.open( IO_ReadWrite ) )
       return false;
 
     if ( file.size() == 0 ) {
       file.close();
       return true;
     }
 
     bool ok = mFormat->checkFormat( &file );
     file.close();
 
     return ok;
   }
 }
 
 void ResourceFile::doClose()
 {
 }
 
 bool ResourceFile::load()
 {
   
 
   QFile file( mFileName );
   if ( !file.open( IO_ReadOnly ) ) {
     addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) );
     return false;
   }
 
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
   
   return mFormat->loadAll( addressBook(), this, &file );
 }
 
 bool ResourceFile::save( Ticket *ticket )
 {
 //    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
   
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
    
 /*US we use a simpler method to create a backupfile
     
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
   {
     mFormat->saveAll( addressBook(), this, saveFile.file() );
     ok = saveFile.close();
   }
 */
 
 //US ToDo: write backupfile  
   QFile info;
   info.setName( mFileName );
   bool ok = info.open( IO_WriteOnly );
   if ( ok ) {
     mFormat->saveAll( addressBook(), this, &info );
     
     info.close();
     ok = true;
   }
   else {
   
   }
   
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
   
   delete ticket;
   unlock( mFileName );
   
   return ok;
 
   qDebug("ResourceFile::save has to be changed");
   return true;
 }
 
 bool ResourceFile::lock( const QString &fileName )
 {
   
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
   
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
   
   url = lockUniqueName;  
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
    result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceFile::unlock( const QString &fileName )
 {
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceFile::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
   
   mFileName = fileName;
 
   
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event  
 //US  fileChanged();
 }
 
 QString ResourceFile::fileName() const
 {
   return mFileName;
 }
 
 void ResourceFile::setFormat( const QString &format )
 {
   mFormatName = format;
   delete mFormat;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 /*US  
 //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
   if (mFormatName == "vcard") {
     mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else if (mFormatName == "binary") {
     mFormat = new BinaryFormat();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
   }
   else
     qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
 */
   
 }
 
 QString ResourceFile::format() const
 {
   return mFormatName;
 }
 
 void ResourceFile::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     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();
+  }
 }
 
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
   QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
   QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
   QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
 }
 
 void ResourceFile::cleanUp()
 {
   unlock( mFileName );
 }
 
 //US #include "resourcefile.moc"
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
@@ -1,389 +1,395 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
 //US #include "formatfactory.h"
 //US #include <qpe/qpeapplication.h>
 
 #include <opie/ocontactaccess.h>
 #include <opie/ocontactaccessbackend_xml.h>
 
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
 
 #include "opieconverter.h"
 
 #include "resourceopie.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_opie()
   {
     return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
   }
 }
 
 ResourceOpie::ResourceOpie( const KConfig *config )
   : Resource( config ), mConverter (0)
 {
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     fileName = cfg->readEntry( "FileName", fileName );
  
   }
 
 //  qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
   
   init( fileName );
 }
 
 ResourceOpie::ResourceOpie( const QString &fileName )
   : Resource( 0 )
 {
 //  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
   init( fileName );
 }
 
 void ResourceOpie::init( const QString &fileName )
 {
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-  
-  //US opie addressbook is always readonly
-//US  setReadOnly( true );
+ 
 
   setFileName( fileName );
  
 }
 
 ResourceOpie::~ResourceOpie()
 {
   if (mConverter != 0)
     delete mConverter;
 }
 
 void ResourceOpie::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", mFileName );
   
 //    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
   
 }
 
 Ticket *ResourceOpie::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mFileName ) ) {
     kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
                   << mFileName << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceOpie::doOpen()
 {
 //  qDebug("ResourceOpie::doOpen() %s", mFileName.latin1());
 /*US  
   QFile file( mFileName );
 
   if ( !file.exists() ) {
     // try to create the file
     bool ok = file.open( IO_WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
     if ( !file.open( IO_ReadWrite ) )
       return false;
 
     if ( file.size() == 0 ) {
       file.close();
       return true;
     }
 
 //US    bool ok = mFormat->checkFormat( &file );
     bool ok = true;
     
     file.close();
 
     return ok;
   }
 */
   qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1());
   return true;  
 }
 
 void ResourceOpie::doClose()
 {
 //  qDebug("ResourceOpie::doClose() %s", mFileName.latin1());
 }
 
 bool ResourceOpie::load()
 {
 //  qDebug("ResourceOpie::load() %s", mFileName.latin1());
   kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl;
 
   qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1());
     
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName );
   OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false);
 	
   if ( !access ) {
     qDebug("Unable to load file() %s", mFileName.latin1());
     addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
     return false;
   }
   
   access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
 
   bool res = false;
   if (mConverter == 0)
   {
     mConverter = new OpieConverter();
     res = mConverter->init();
     if ( !res )
     {
       qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
       addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) );
       delete access;
       return false;
     }
   }
 
 
 	OContactAccess::List::Iterator it;
   OContactAccess::List allList = access->allRecords();
   for ( it = allList.begin(); it != allList.end(); ++it )
   {
     const OContact c = (*it);
     
     KABC::Addressee addressee;
     
     res = mConverter->opieToAddressee( c, addressee );    
     
     if ( !addressee.isEmpty() && res )
     {
       addressee.setResource( this );
       addressBook()->insertAddressee( addressee );
     }
     
 //    qDebug("found %s", c.fullName().latin1());
   }
   
   delete access;
   // it seems so, that deletion of access deletes backend as well
   //delete backend;
   
   return true;
 }
 
 bool ResourceOpie::save( Ticket *ticket )
 {
   qDebug("ResourceOpie::save() has to be fixed - %s", mFileName.latin1());
 /*US  
   
   qDebug("ResourceOpie::save %s", mFileName.latin1());
   kdDebug(5700) << "ResourceOpie::save()" << endl;
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 */   
 /*US we use a simpler method to create a backupfile
     
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
   {
     mFormat->saveAll( addressBook(), this, saveFile.file() );
     ok = saveFile.close();
   }
 */
 /*US
 //US ToDo: write backupfile  
   QFile info;
   info.setName( mFileName );
   bool ok = info.open( IO_WriteOnly );
   if ( ok ) {
 //US    mFormat->saveAll( addressBook(), this, &info );
     
     info.close();
     ok = true;
   }
   else {
   
   }
   
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
   
   delete ticket;
   unlock( mFileName );
   
   return ok;
 
   qDebug("ResourceOpie::save has to be changed");
 */  
   return true;
   
 }
 
 bool ResourceOpie::lock( const QString &fileName )
 {
 //  qDebug("ResourceOpie::lock() %s", fileName.latin1());
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
   
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
   
   url = lockUniqueName;  
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceOpie::unlock( const QString &fileName )
 {
 //  qDebug("ResourceOpie::unlock() %s", fileName.latin1());
   
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceOpie::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
   
   mFileName = fileName;
   
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event  
 //US  fileChanged();
 }
 
 QString ResourceOpie::fileName() const
 {
   return mFileName;
 }
 
 void ResourceOpie::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   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();
 }
 
 void ResourceOpie::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceOpie::cleanUp()
 {
 //  qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
 
   unlock( mFileName );
 }
 
 //US #include "resourceopie.moc"
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
@@ -1,351 +1,356 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
 #include <qpe/pim/addressbookaccess.h>
 
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
 
 #include "resourceqtopia.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_qtopia()
   {
     return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
   }
 }
 
 ResourceQtopia::ResourceQtopia( const KConfig *config )
   : Resource( config ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
   
   init( fileName );
 }
 
 ResourceQtopia::ResourceQtopia( const QString &fileName )
   : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
 
 void ResourceQtopia::init( const QString &fileName )
 {
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceQtopia::~ResourceQtopia()
 {
   if (mConverter != 0)
     delete mConverter;
 
 }
 
 void ResourceQtopia::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
 Ticket *ResourceQtopia::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mFileName ) ) {
     kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
                   << mFileName << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceQtopia::doOpen()
 {
 /*US
   QFile file( mFileName );
 
   if ( !file.exists() ) {
     // try to create the file
     bool ok = file.open( IO_WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
     if ( !file.open( IO_ReadWrite ) )
       return false;
 
     if ( file.size() == 0 ) {
       file.close();
       return true;
     }
 
 //US    bool ok = mFormat->checkFormat( &file );
     bool ok = true;
     
     file.close();
 
     return ok;
   }
 */
   return true;  
 }
 
 void ResourceQtopia::doClose()
 {
 }
 
 bool ResourceQtopia::load()
 {
   kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
 
 //  qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
   
   AddressBookAccess* access = new AddressBookAccess();
 
   if ( !access ) {
     qDebug("Unable to load file() %s", mFileName.latin1());
     addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
     return false;
   }
   
   bool res = false;
   if (mConverter == 0)
   {
     mConverter = new QtopiaConverter();
     res = mConverter->init();
     if ( !res )
     {
       qDebug("Unable to initialize qtopia converter. Most likely a problem with the category file");
       addressBook()->error( i18n( "Unable to initialize qtopia converter. Most likely a problem with the category file" ) );
       delete access;
       return false;
     }
   }
   
   { //create a new scope 
     AddressBookIterator it(*access);
     const PimContact* contact;
 
     for (contact=it.toFirst(); it.current(); ++it) {
       contact = it.current();
     
       KABC::Addressee addressee;
     
       res = mConverter->qtopiaToAddressee( (*contact), addressee );    
     
       if ( !addressee.isEmpty() && res )
       {
         addressee.setResource( this );
         addressBook()->insertAddressee( addressee );
       }
     }
   }
     
   delete access;
   return true;
 }
 
 bool ResourceQtopia::save( Ticket *ticket )
 {
 /*US
 //    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
   kdDebug(5700) << "ResourceQtopia::save()" << endl;
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
    
 /*US we use a simpler method to create a backupfile
     
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
   {
     mFormat->saveAll( addressBook(), this, saveFile.file() );
     ok = saveFile.close();
   }
 */
 
 /*US
 //US ToDo: write backupfile  
   QFile info;
   info.setName( mFileName );
   bool ok = info.open( IO_WriteOnly );
   if ( ok ) {
 //US    mFormat->saveAll( addressBook(), this, &info );
     
     info.close();
     ok = true;
   }
   else {
   
   }
   
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
   
   delete ticket;
   unlock( mFileName );
   
   return ok;
 
   qDebug("ResourceQtopia::save has to be changed");
 */  
   return true;
 }
 
 bool ResourceQtopia::lock( const QString &fileName )
 {
   kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
   
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
   
   url = lockUniqueName;  
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceQtopia::unlock( const QString &fileName )
 {
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
 }
 
 void ResourceQtopia::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
   
   mFileName = fileName;
 
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event  
 //US  fileChanged();
 }
 
 QString ResourceQtopia::fileName() const
 {
   return mFileName;
 }
 
 void ResourceQtopia::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     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();
+  }
 }
 
 void ResourceQtopia::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceQtopia::cleanUp()
 {
   unlock( mFileName );
 }
 
 //US #include "resourceqtopia.moc"
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
@@ -1,171 +1,172 @@
 /*                                                                      
     This file is part of KAddressBook.
     Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qcombobox.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qwidgetstack.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
 #include "look_basic.h"
 //#include "look_details.h"
 #include "look_html.h"
 
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #endif //KAB_EMBEDDED
 
 
 #include "detailsviewcontainer.h"
 
 ViewContainer::ViewContainer( QWidget *parent, const char* name )
   : QWidget( parent, name ), mCurrentLook( 0 )
 {
   QBoxLayout *topLayout = new QVBoxLayout( this );
   //topLayout->setMargin( KDialog::marginHint() );
   //topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( 0 );
   topLayout->setSpacing( 0 );
 
   QBoxLayout *styleLayout = new QHBoxLayout( topLayout );    
 
   QLabel *label = new QLabel( i18n("Style:"), this );
   styleLayout->addWidget( label );
 
   mStyleCombo = new QComboBox( this );
   styleLayout->addWidget( mStyleCombo );
 
   QFrame *frameRuler = new QFrame( this );
 //US  frameRuler->setFrameShape( QFrame::HLine );
 //US  frameRuler->setFrameShadow( QFrame::Sunken );
 //US  topLayout->addWidget( frameRuler );
 
   mDetailsStack = new QWidgetStack( this );
   topLayout->addWidget( mDetailsStack, 1 );
 
   registerLooks();
 
 #if 1
     // Hide detailed view selection combo box, because we currently have
     // only one. Reenable it when there are more detailed views.
     label->hide();
     mStyleCombo->hide();
     frameRuler->hide();
 #endif
 }
 
 KABBasicLook *ViewContainer::currentLook()
 {
   return mCurrentLook;
 }
 
 void ViewContainer::registerLooks()
 {
   mLookFactories.append( new KABHtmlViewFactory( mDetailsStack ) );
 //  mLookFactories.append( new KABDetailedViewFactory( mDetailsStack ) );
   mStyleCombo->clear();
 
   for ( uint i = 0; i < mLookFactories.count(); ++i )
     mStyleCombo->insertItem( mLookFactories.at( i )->description() );
 
   if ( !mLookFactories.isEmpty() )
     slotStyleSelected( 0 );
 }
 
 void ViewContainer::slotStyleSelected( int index )
 {
 #ifndef KAB_EMBEDDED
   KConfig *config = kapp->config();
 #else //KAB_EMBEDDED
   //US I hope I got the same config object as above expected.
   KConfig *config = KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
   KABC::Addressee addr;
 
   if ( index >= 0 && index < mStyleCombo->count() ) {
     if ( mCurrentLook != 0 ) {
       mCurrentLook->saveSettings( config );
       addr = mCurrentLook->addressee();
 
       delete mCurrentLook;
       mCurrentLook = 0;
     }
 
     KABLookFactory *factory = mLookFactories.at( index );
     kdDebug(5720) << "ViewContainer::slotStyleSelected: "
                   << "creating look "
                   << factory->description() << endl;
 
     mCurrentLook = factory->create();
     mDetailsStack->raiseWidget( mCurrentLook );
 
     connect( mCurrentLook, SIGNAL( sendEmail( const QString& ) ), this,
              SIGNAL( sendEmail( const QString& ) ) );
     connect( mCurrentLook, SIGNAL( browse( const QString& ) ), this,
              SIGNAL( browse( const QString& ) ) );
   }
 
   mCurrentLook->restoreSettings( config );
   mCurrentLook->setAddressee( addr );
 }
 void ViewContainer::refreshView()
 {
-    if ( mCurrentLook  )
+    if ( mCurrentLook  ) {
         mCurrentLook->setAddressee( mCurrentAddressee );
+    }
 }
 
 void ViewContainer::setAddressee( const KABC::Addressee& addressee )
 {
   if ( mCurrentLook != 0 ) {
     if ( addressee == mCurrentAddressee )
       return;
     else {
       mCurrentAddressee = addressee;
       mCurrentLook->setAddressee( mCurrentAddressee );
     }
   }
 }
 
 KABC::Addressee ViewContainer::addressee()
 {
   static KABC::Addressee empty; // do not use!
 
   if ( !mCurrentLook )
     return empty;
   else
     return mCurrentLook->addressee();
 }
 
 void ViewContainer::setReadOnly( bool state )
 {
   if ( mCurrentLook )
     mCurrentLook->setReadOnly( state );
 }
 
 #ifndef KAB_EMBEDDED
 #include "detailsviewcontainer.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2b07541..a7ca0ce 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -935,384 +935,385 @@ void KABCore::save()
 #endif //KAB_EMBEDDED
 
   statusMessage(i18n("Addressbook saved!"));
   setModified( false );
 }
 
 void KABCore::statusMessage(QString mess , int time )
 {
     //topLevelWidget()->setCaption( mess );
     // pending setting timer to revome message
 }
 void KABCore::undo()
 {
   UndoStack::instance()->undo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::redo()
 {
   RedoStack::instance()->redo();
 
   // Refresh the view
   mViewManager->refreshView();
 }
 
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
   if ( visible )
     mJumpButtonBar->show();
   else
     mJumpButtonBar->hide();
 }
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
 }
 
 void KABCore::setDetailsVisible( bool visible )
 {
   if ( visible )
     mDetails->show();
   else
     mDetails->hide();
 }
 
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
   
   if ( list.count() != 0 ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it )
       mAddressBook->insertAddressee( *it );
     if ( list.count() > 1 )
         setModified();
     else 
         setModifiedWOrefresh();
   }
   if ( list.count() == 0 )
     mViewManager->refreshView();
   else
      mViewManager->refreshView( list[ 0 ].uid() );
 
  
 
 }
 
 QString KABCore::getNameByPhone( const QString &phone )
 {
 #ifndef KAB_EMBEDDED
   QRegExp r( "[/*/-/ ]" );
   QString localPhone( phone );
 
   bool found = false;
   QString ownerName = "";
   KABC::AddressBook::Iterator iter;
   KABC::PhoneNumber::List::Iterator phoneIter;
   KABC::PhoneNumber::List phoneList;
   for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) {
     phoneList = (*iter).phoneNumbers();
     for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() );
           ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
       if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
         ownerName = (*iter).formattedName();
         found = true;
       }
     }
   }
 
   return ownerName;
 #else //KAB_EMBEDDED
   qDebug("KABCore::getNameByPhone finsih method");
   return "";
 #endif //KAB_EMBEDDED
   
 }
 
 void KABCore::openConfigDialog()
 {
     KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
     KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
     ConfigureDialog->addModule(kabcfg );
     connect( ConfigureDialog, SIGNAL( applyClicked() ),
              this, SLOT( configurationChanged() ) );
     connect( ConfigureDialog, SIGNAL( okClicked() ),
              this, SLOT( configurationChanged() ) );
     saveSettings();
     ConfigureDialog->showMaximized();
     if ( ConfigureDialog->exec() )
         KMessageBox::information( this,  i18n("If you configured \nExtensions,\nplease restart!\n") );
     delete ConfigureDialog;
 }
 
 void KABCore::openLDAPDialog()
 {
 #ifndef KAB_EMBEDDED
   if ( !mLdapSearchDialog ) {
     mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
             SLOT( refreshView() ) );
     connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this,
             SLOT( setModified() ) );
   } else
     mLdapSearchDialog->restoreSettings();
 
   if ( mLdapSearchDialog->isOK() )
     mLdapSearchDialog->exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::openLDAPDialog() finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::print()
 {
 #ifndef KAB_EMBEDDED
   KPrinter printer;
   if ( !printer.setup( this ) )
     return;
 
   KABPrinting::PrintingWizard wizard( &printer, mAddressBook,
                                       mViewManager->selectedUids(), this );
 
   wizard.exec();
 #else //KAB_EMBEDDED
   qDebug("KABCore::print() finsih method");
 #endif //KAB_EMBEDDED
 
 }
 
 
 void KABCore::addGUIClient( KXMLGUIClient *client )
 {
   if ( mGUIClient )
     mGUIClient->insertChildClient( client );
   else
     KMessageBox::error( this, "no KXMLGUICLient");
 }
 
 
 void KABCore::configurationChanged()
 {
   mExtensionManager->reconfigure();
 }
 
 void KABCore::addressBookChanged()
 {
 /*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();
+//  mDetails->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) );
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
   topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager. 
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
 
   changeMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
  
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
   
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
   
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
   
  
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
  
   
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
     
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
   
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
         
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
     
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED