| -rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 18 | ||||
| -rw-r--r-- | kabc/plugins/file/resourcefile.h | 1 |
2 files changed, 13 insertions, 6 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 0e6c2a3..af76558 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -86,2 +86,3 @@ ResourceFile::ResourceFile( const KConfig *config ) formatName = cfg->readEntry( "FileFormat", "vcard" ); + mFamily = cfg->readEntry( "ResourceName", "std" ); } else { @@ -123,4 +124,3 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) - - QString localKdeDir; + QString localKdeDir; localKdeDir = readEnvPath("LOCALMICROKDEHOME"); @@ -131,6 +131,12 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) QFileInfo fi2 ( localname ); - if ( ! fi2.exists() ) { - KMessageBox::error(0,i18n("Addressbook resource file not found:\n '%1'.\nIn LOCAL mode only resource files in\n'%2'\nare supported.\n(i.e. in the dir ./apps/kabc/ relative to the kapi(.exe) binary.)\n\nIf you are starting KA/Pi for the very first time\nyou will get this error message as well.\nIt will create the missing file automatically for you.").arg(localname).arg(localKdeDir+"/apps/kabc/") ); - setFileName( localname ); - return; + if ( ! fi2.exists() || mFamily == "sync_res" ) { + if ( fi.exists() && mFamily == "sync_res") { + qDebug("LOCAL mode SYNC mode using absolute file path "); + setFileName( fileName ); + return; + } else { + KMessageBox::error(0,i18n("Addressbook resource file not found:\n '%1'.\nIn LOCAL mode only resource files in\n'%2'\nare supported.\n(i.e. in the dir ./apps/kabc/ relative to the kapi(.exe) binary.)\n\nIf you are starting KA/Pi for the very first time\nyou will get this error message as well.\nIt will create the missing file automatically for you.").arg(localname).arg(localKdeDir+"/apps/kabc/") ); + setFileName( localname ); + return; + } diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index dd38a9d..3e9edfc 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -149,2 +149,3 @@ protected: private: + QString mFamily; QString mFileName2; |