| -rw-r--r-- | kabc/plugins/opie/kabc_opieE.pro | 24 | ||||
| -rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 117 | ||||
| -rw-r--r-- | kabc/plugins/opie/resourceopie.h | 9 | ||||
| -rw-r--r-- | kabc/plugins/opie/resourceopieconfig.cpp | 9 |
4 files changed, 113 insertions, 46 deletions
diff --git a/kabc/plugins/opie/kabc_opieE.pro b/kabc/plugins/opie/kabc_opieE.pro index 7341ca8..f3e2ac4 100644 --- a/kabc/plugins/opie/kabc_opieE.pro +++ b/kabc/plugins/opie/kabc_opieE.pro @@ -1,21 +1,31 @@ TEMPLATE = lib -CONFIG += qt warn_on release +CONFIG += qt warn_on #release debug - TARGET = microkabc_opie -INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat + +INCLUDEPATH += ../.. ../../converter/opie ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include + + OBJECTS_DIR = obj/$(PLATFORM) -MOC_DIR = moc +MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib -LIBS += -lmicrokde -lmicrokabc +LIBS += -lmicrokde +LIBS += -lmicrokabc LIBS += -L$(QPEDIR)/lib +LIBS += -lopie +LIBS += -lqpe +LIBS += -lqte +LIBS += -lmicrokabc_opieconverter +#LIBS += -L../../lib/$(PLATFORM) + INTERFACES = \ HEADERS = \ resourceopie.h \ - resourceopieconfig.h + resourceopieconfig.h \ SOURCES = \ resourceopie.cpp \ - resourceopieconfig.cpp + resourceopieconfig.cpp \ + diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index 47e22b4..f992301 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp @@ -28,8 +28,9 @@ $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 <qtimer.h> @@ -41,46 +42,49 @@ $Id$ //US #include <ksavefile.h> #include <kstandarddirs.h> //US #include "formatfactory.h" +//US #include <qpe/qpeapplication.h> + +#include <opie/ocontactaccess.h> #include "resource.h" #include "resourceopieconfig.h" #include "stdaddressbook.h" +#include "opieconverter.h" + #include "resourceopie.h" using namespace KABC; extern "C" { -//US void *init_kabc_file() void *init_microkabc_opie() { return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>(); } } ResourceOpie::ResourceOpie( const KConfig *config ) - : Resource( config ) + : Resource( config ), mConverter (0) { - QString fileName; + QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; KConfig *cfg = (KConfig *)config; if ( cfg ) { - fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() ); -// qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() ); - } else { - fileName = StdAddressBook::fileName(); -// qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() ); + fileName = cfg->readEntry( "FileName", fileName ); + } +// qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() ); + init( fileName ); } ResourceOpie::ResourceOpie( const QString &fileName ) : Resource( 0 ) { -// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); +// qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1()); init( fileName ); } void ResourceOpie::init( const QString &fileName ) @@ -90,18 +94,26 @@ 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 + setReadOnly( true ); setFileName( fileName ); + } ResourceOpie::~ResourceOpie() { + if (mConverter != 0) + delete mConverter; } void ResourceOpie::writeConfig( KConfig *config ) { + //US opie addressbook is always readonly + setReadOnly( true ); + Resource::writeConfig( config ); config->writeEntry( "FileName", mFileName ); @@ -125,8 +137,10 @@ Ticket *ResourceOpie::requestSaveTicket() bool ResourceOpie::doOpen() { +// qDebug("ResourceOpie::doOpen() %s", mFileName.latin1()); +/*US QFile file( mFileName ); if ( !file.exists() ) { // try to create the file @@ -150,38 +164,73 @@ bool ResourceOpie::doOpen() 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; - - QFile file( mFileName ); - if ( !file.open( IO_ReadOnly ) ) { - addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); + + OContactAccess* access = new OContactAccess("KDEPim/Pi", mFileName, 0l, 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 + + if (mConverter == 0) + mConverter = new OpieConverter(); -// qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); + + OContactAccess::List::Iterator it; + OContactAccess::List allList = access->allRecords(); + bool res = false; + for ( it = allList.begin(); it != allList.end(); ++it ) + { + 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; - //US return mFormat->loadAll( addressBook(), this, &file ); return true; } bool ResourceOpie::save( Ticket *ticket ) { -// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); + 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 ); @@ -193,9 +242,9 @@ bool ResourceOpie::save( Ticket *ticket ) 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 ); @@ -217,13 +266,19 @@ bool ResourceOpie::save( Ticket *ticket ) return ok; qDebug("ResourceOpie::save has to be changed"); +*/ return true; + } bool ResourceOpie::lock( const QString &fileName ) { + qDebug("ResourceOpie::lock() has to be fixed - %s", mFileName.latin1()); + +/*US +// qDebug("ResourceOpie::lock() %s", fileName.latin1()); kdDebug(5700) << "ResourceOpie::lock()" << endl; QString fn = fileName; @@ -262,12 +317,19 @@ bool ResourceOpie::lock( const QString &fileName ) // TODO: check stat return false; +*/ + + return true; } void ResourceOpie::unlock( const QString &fileName ) { + qDebug("ResourceOpie::unlock() has to be fixed - %s", mFileName.latin1()); +/*US +// 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" ); @@ -277,8 +339,9 @@ void ResourceOpie::unlock( const QString &fileName ) QFile::remove( lockName ); QFile::remove( mLockUniqueName ); addressBook()->emitAddressBookUnlocked(); +*/ } void ResourceOpie::setFileName( const QString &fileName ) { @@ -301,24 +364,8 @@ QString ResourceOpie::fileName() const { return mFileName; } -/*US -void ResourceOpie::setFormat( const QString &format ) -{ - mFormatName = format; - delete mFormat; - - FormatFactory *factory = FormatFactory::self(); - mFormat = factory->format( mFormatName ); -} - -QString ResourceOpie::format() const -{ - return mFormatName; -} -*/ - void ResourceOpie::fileChanged() { // There is a small theoretical chance that KDirWatch calls us before // we are fully constructed @@ -338,8 +385,10 @@ 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/opie/resourceopie.h b/kabc/plugins/opie/resourceopie.h index d21272a..9db9485 100644 --- a/kabc/plugins/opie/resourceopie.h +++ b/kabc/plugins/opie/resourceopie.h @@ -35,16 +35,17 @@ $Id$ #include <sys/types.h> #include "resource.h" -class QTimer; -class FormatPlugin; + +//class QTimer; +//class FormatPlugin; namespace KABC { //US class FormatPlugin; class ResourceConfigWidget; - +class OpieConverter; /** @internal */ class ResourceOpie : public Resource @@ -136,8 +137,10 @@ protected: bool lock( const QString &fileName ); void unlock( const QString &fileName ); private: + OpieConverter* mConverter; + QString mFileName; QString mLockUniqueName; diff --git a/kabc/plugins/opie/resourceopieconfig.cpp b/kabc/plugins/opie/resourceopieconfig.cpp index b92cfa1..f4cc4f9 100644 --- a/kabc/plugins/opie/resourceopieconfig.cpp +++ b/kabc/plugins/opie/resourceopieconfig.cpp @@ -34,11 +34,14 @@ $Id$ #include <kdialog.h> #include <unistd.h> +#include <qdir.h> #include <qfile.h> #include "resourceopie.h" -#include "stdaddressbook.h" +//US #include <qpe/qpeapplication.h> + +//US #include "stdaddressbook.h" #include "resourceopieconfig.h" using namespace KABC; @@ -80,9 +83,9 @@ void ResourceOpieConfig::loadSettings( KRES::Resource *res ) } mFileNameEdit->setURL( resource->fileName() ); if ( mFileNameEdit->url().isEmpty() ) - mFileNameEdit->setURL( KABC::StdAddressBook::fileName() ); + mFileNameEdit->setURL( QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml" ); } void ResourceOpieConfig::saveSettings( KRES::Resource *res ) { @@ -99,9 +102,11 @@ void ResourceOpieConfig::saveSettings( KRES::Resource *res ) void ResourceOpieConfig::checkFilePermissions( const QString& fileName ) { // If file exist but is not writeable... +/*US if ( access( QFile::encodeName( fileName ), F_OK ) == 0 ) emit setReadOnly( access( QFile::encodeName( fileName ), W_OK ) < 0 ); +*/ } //US #include "resourceopieconfig.moc" |