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
@@ -26,17 +26,10 @@
 #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"
 
@@ -82,16 +75,50 @@ Factory::Factory( const QString& resourceFamily ) :
   }
 */  
 
-//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()
@@ -105,7 +132,7 @@ QStringList Factory::typeNames() const
   
   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());
@@ -119,24 +146,20 @@ 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;
   }
@@ -144,7 +167,7 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
   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;
@@ -155,11 +178,12 @@ 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;
   
 }
 
@@ -170,9 +194,8 @@ QString Factory::typeDescription( const QString &type ) const
 
 //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 )
@@ -190,8 +213,10 @@ Resource *Factory::resource( const QString& type, const KConfig *config )
     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;
   }
@@ -199,6 +224,7 @@ Resource *Factory::resource( const QString& type, const KConfig *config )
   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;
   }
@@ -206,7 +232,7 @@ Resource *Factory::resource( const QString& type, const KConfig *config )
   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;
   }
 
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
@@ -34,6 +34,15 @@
 
 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
@@ -56,6 +65,7 @@ class Factory
 {
   public:
 
+  
     /**
      * Returns the global resource factory.
      */
@@ -106,7 +116,8 @@ class Factory
 
     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;    
 };
 
 }