| -rw-r--r-- | microkde/kresources/factory.cpp | 100 | ||||
| -rw-r--r-- | microkde/kresources/factory.h | 13 |
2 files changed, 75 insertions, 38 deletions
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp index 709cd4a..56b0ef3 100644 --- a/microkde/kresources/factory.cpp +++ b/microkde/kresources/factory.cpp @@ -21,27 +21,20 @@ Boston, MA 02111-1307, USA. */ #include <kdebug.h> #include <klocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> +#include <klibloader.h> #include <qfile.h> -#include <plugins/file/resourcefile.h> -#include <plugins/file/resourcefileconfig.h> -#include <plugins/dir/resourcedir.h> -#include <plugins/dir/resourcedirconfig.h> -//#include <plugins/ldap/resourceldap.h> -//#include <plugins/ldap/resourceldapconfig.h> - - #include "resource.h" #include "factory.h" using namespace KRES; QDict<Factory> *Factory::mSelves = 0; static KStaticDeleter< QDict<Factory> > staticDeleter; @@ -77,107 +70,137 @@ Factory::Factory( const QString& resourceFamily ) : KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { QVariant type = (*it)->property( "X-KDE-ResourceType" ); if ( !type.toString().isEmpty() ) mTypeMap.insert( type.toString(), *it ); } */ -//US !!!!!!!!!!!!!!! - KRES::PluginFactoryBase* pf = (KRES::PluginFactoryBase*)new KRES::PluginFactory<KABC::ResourceFile,KABC::ResourceFileConfig>(); - mTypeMap.insert( "file", pf ); +//US new + PluginInfo* info = new PluginInfo; + info->library = "microkabc_file"; + info->nameLabel = i18n( "file" ); + info->descriptionLabel = i18n( "No description available." ); + mTypeMap.insert( "file", info ); + + info = new PluginInfo; + info->library = "microkabc_dir"; + info->nameLabel = i18n( "dir" ); + info->descriptionLabel = i18n( "No description available." ); + mTypeMap.insert( "dir", info ); + + info = new PluginInfo; + info->library = "microkabc_ldap"; + info->nameLabel = i18n( "ldap" ); + info->descriptionLabel = i18n( "No description available." ); + mTypeMap.insert( "ldap", info ); + + //US add opie plugin only, if the library exists + QString libname = "microkabc_opie"; + QString path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); + if ( !path.isEmpty() ) + { + info = new PluginInfo; + info->library = libname; + info->nameLabel = i18n( "opie" ); + info->descriptionLabel = i18n( "Opie PIM Addressbook." ); + mTypeMap.insert( "opie", info ); + } + + //US add qtopia plugin only, if the library exists + libname = "microkabc_qtopia"; + path = KLibLoader::findLibrary( QFile::encodeName( libname ) ); + if ( !path.isEmpty() ) + { + info = new PluginInfo; + info->library = libname; + info->nameLabel = i18n( "qtopia" ); + info->descriptionLabel = i18n( "Qtopia PIM Addressbook." ); + mTypeMap.insert( "qtopia", info ); + } + - pf = (KRES::PluginFactoryBase*)new KRES::PluginFactory<KABC::ResourceDir,KABC::ResourceDirConfig>(); - mTypeMap.insert( "dir", pf ); - /* - pf = (KRES::PluginFactoryBase*)new KRES::PluginFactory<KABC::ResourceLDAP,KABC::ResourceLDAPConfig>(); - mTypeMap.insert( "ldap", pf ); - */ } Factory::~Factory() { } QStringList Factory::typeNames() const { //US method QMap::keys() not available yet. SO collect the data manually //US return mTypeMap.keys(); QStringList result; - QMap<QString, PluginFactoryBase*>::ConstIterator it; + QMap<QString, PluginInfo*>::ConstIterator it; for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { result << it.key().latin1(); // qDebug("Factory::typeNames() : %s ", it.key().latin1()); } return result; } ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent ) { if ( type.isEmpty() || !mTypeMap.contains( type ) ) return 0; -/*US load the lib not dynamically. !! - KService::Ptr ptr = mTypeMap[ type ]; - KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); - if ( !factory ) { - kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl; - return 0; - } -*/ - PluginFactoryBase *factory = mTypeMap[ type ]; +//US KService::Ptr ptr = mTypeMap[ type ]; +//US KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); + PluginInfo* pi = mTypeMap[ type ]; + KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() ); if ( !factory ) { + qDebug("KRES::Factory::configWidget(): Factory creation failed for library %s", pi->library.latin1()); kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl; return 0; } - PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); if ( !pluginFactory ) { + qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1()); kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl; return 0; } ConfigWidget *wdg = pluginFactory->configWidget( parent ); if ( !wdg ) { //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; - kdDebug() << " is not a " + mResourceFamily + " plugin." << endl; + qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); return 0; } return wdg; } QString Factory::typeName( const QString &type ) const { if ( type.isEmpty() || !mTypeMap.contains( type ) ) return QString(); - + + //US KService::Ptr ptr = mTypeMap[ type ]; //US return ptr->name(); -//US I guess this is correct since we loaded the factory staticly. - return type; + PluginInfo* pi = mTypeMap[ type ]; + return pi->nameLabel; } QString Factory::typeDescription( const QString &type ) const { if ( type.isEmpty() || !mTypeMap.contains( type ) ) return QString(); //US KService::Ptr ptr = mTypeMap[ type ]; //US return ptr->comment(); -//US I guess this is correct since we loaded the factory staticly. - return type; - + PluginInfo* pi = mTypeMap[ type ]; + return pi->descriptionLabel; } Resource *Factory::resource( const QString& type, const KConfig *config ) { kdDebug() << "Factory::resource( " << type << ", config)" << endl; if ( type.isEmpty() || !mTypeMap.contains( type ) ) return 0; @@ -185,32 +208,35 @@ Resource *Factory::resource( const QString& type, const KConfig *config ) /*US load the lib not dynamicly. !! KService::Ptr ptr = mTypeMap[ type ]; KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); if ( !factory ) { kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; return 0; } */ - PluginFactoryBase *factory = mTypeMap[ type ]; + PluginInfo* pi = mTypeMap[ type ]; + KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() ); if ( !factory ) { + qDebug("KRES::Factory::resource(): Factory creation failed for library %s", pi->library.latin1()); kdDebug() << "KRES::Factory::resource(): Factory creation failed" << endl; return 0; } PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); if ( !pluginFactory ) { + qDebug("KRES::Factory::resource(): no plugin factory for library %s", pi->library.latin1()); kdDebug() << "KRES::Factory::resource(): no plugin factory." << endl; return 0; } Resource *resource = pluginFactory->resource( config ); if ( !resource ) { //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; - kdDebug() << " is not a " + mResourceFamily + " plugin." << endl; + qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); return 0; } resource->setType( type ); return resource; } diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h index f391bb3..ad67ab3 100644 --- a/microkde/kresources/factory.h +++ b/microkde/kresources/factory.h @@ -29,16 +29,25 @@ #include <kconfig.h> #include "resource.h" namespace KRES { +//US +struct PluginInfo +{ + QString library; + QString nameLabel; + QString descriptionLabel; +}; + + /** * Class for loading resource plugins. * Do not use this class directly. Use ResourceManager instead * * Example: * * <pre> * KABC::Factory<Calendar> *factory = KABC::Factory<Calendar>::self(); @@ -51,16 +60,17 @@ namespace KRES { * // do something with resource * } * </pre> */ class Factory { public: + /** * Returns the global resource factory. */ static Factory *self( const QString& resourceFamily ); ~Factory(); /** @@ -101,13 +111,14 @@ class Factory protected: Factory( const QString& resourceFamily ); private: static QDict<Factory> *mSelves; QString mResourceFamily; //US QMap<QString, KService::Ptr> mTypeMap; - QMap<QString, PluginFactoryBase*> mTypeMap; +//US lets store the pluginfo struct as value instead of a KService + QMap<QString, PluginInfo*> mTypeMap; }; } #endif |