From 863c4c3678e59ef125c08c00e9532ded5b540f67 Mon Sep 17 00:00:00 2001 From: ulf69 Date: Mon, 02 Aug 2004 18:32:08 +0000 Subject: added support for syncprofiles for resources and export/import capabilities --- (limited to 'kabc/plugins/file') diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro index 32555a2..154ef2a 100644 --- a/kabc/plugins/file/file.pro +++ b/kabc/plugins/file/file.pro @@ -3,7 +3,7 @@ CONFIG += qt warn_on release #release debug TARGET = microkabc_file -INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat +INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat DESTDIR = ../../../bin #LIBS += -lmicrokde -lmicrokabc diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro index d19a26d..3015806 100644 --- a/kabc/plugins/file/fileE.pro +++ b/kabc/plugins/file/fileE.pro @@ -3,7 +3,7 @@ CONFIG += qt warn_on release #release debug TARGET = microkabc_file -INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat +INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 1d3acec..361b36b 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -51,12 +51,14 @@ $Id$ #include "stdaddressbook.h" #include "resourcefile.h" +#include "syncwidget.h" + using namespace KABC; extern "C" #ifdef _WIN32_ -__declspec(dllexport) +__declspec(dllexport) #else { #endif @@ -64,14 +66,14 @@ __declspec(dllexport) //US void *init_kabc_file() void *init_microkabc_file() { - return new KRES::PluginFactory(); + return new KRES::PluginFactory(); } #ifndef _WIN32_ } #endif -ResourceFile::ResourceFile( const KConfig *config ) - : Resource( config ) , mFormat( 0 ) +ResourceFile::ResourceFile( const KConfig *config, bool syncable ) + : Resource( config, syncable ) , mFormat( 0 ) { QString fileName, formatName; @@ -89,9 +91,9 @@ ResourceFile::ResourceFile( const KConfig *config ) init( fileName, formatName ); } -ResourceFile::ResourceFile( const QString &fileName, +ResourceFile::ResourceFile( const QString &fileName, bool syncable , const QString &formatName ) - : Resource( 0 ) + : Resource( 0, syncable ) { // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); init( fileName, formatName ); @@ -139,14 +141,14 @@ ResourceFile::~ResourceFile() void ResourceFile::writeConfig( KConfig *config ) { - config->setGroup( "Resource_" + identifier() ); + 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() @@ -197,7 +199,7 @@ void ResourceFile::doClose() bool ResourceFile::load() { - + QFile file( mFileName ); if ( !file.open( IO_ReadOnly ) ) { @@ -206,20 +208,20 @@ bool ResourceFile::load() } // 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 ); @@ -232,26 +234,26 @@ bool ResourceFile::save( Ticket *ticket ) } */ -//US ToDo: write backupfile +//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"); @@ -260,25 +262,25 @@ bool ResourceFile::save( Ticket *ticket ) 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); + + 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; + + url = lockUniqueName; //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; @@ -311,9 +313,9 @@ void ResourceFile::unlock( const QString &fileName ) //US fn.replace( QRegExp( "/" ), "_" ); //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); //US QString lockName = fn + ".lock"; - KURL url(fn); + KURL url(fn); QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); - + QFile::remove( lockName ); QFile::remove( mLockUniqueName ); addressBook()->emitAddressBookUnlocked(); @@ -323,14 +325,14 @@ void ResourceFile::setFileName( const QString &fileName ) { mDirWatch.stopScan(); mDirWatch.removeFile( mFileName ); - + mFileName = fileName; - + mDirWatch.addFile( mFileName ); mDirWatch.startScan(); -//US simulate KDirWatch event +//US simulate KDirWatch event //US fileChanged(); } @@ -346,7 +348,7 @@ void ResourceFile::setFormat( const QString &format ) FormatFactory *factory = FormatFactory::self(); mFormat = factory->format( mFormatName ); -/*US +/*US //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); if (mFormatName == "vcard") { mFormat = new VCardFormatPlugin2(); @@ -359,7 +361,7 @@ void ResourceFile::setFormat( const QString &format ) else qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); */ - + } QString ResourceFile::format() const @@ -373,8 +375,8 @@ void ResourceFile::fileChanged() // we are fully constructed if (!addressBook()) return; - - + + QString text( i18n( "File resource '%1'
has been changed by third party.
Do you want to reload?").arg( mFileName ) ); if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { load(); diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index 4522d78..0a3027c 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -58,12 +58,12 @@ public: @param cfg The config object where custom resource settings are stored. */ - ResourceFile( const KConfig *cfg ); + ResourceFile( const KConfig *cfg, bool syncable ); /** Construct file resource on file @arg fileName using format @arg formatName. */ - ResourceFile( const QString &fileName, const QString &formatName = "vcard" ); + ResourceFile( const QString &fileName, bool syncable , const QString &formatName = "vcard" ); /** * Destructor. @@ -85,7 +85,7 @@ public: * Closes the file again. */ virtual void doClose(); - + /** * Requests a save ticket, that is used by @ref save() */ @@ -153,7 +153,7 @@ private: FormatPlugin *mFormat; QString mLockUniqueName; - + KDirWatch mDirWatch; }; -- cgit v0.9.0.2