11 files changed, 50 insertions, 222 deletions

diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index 030b547..24e82bc 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -42,5 +42,4 @@
 #include "configwidget.h"
 #include "configdialog.h"
-#include "syncwidget.h"
 
 using namespace KRES;
@@ -48,6 +47,6 @@ using namespace KRES;
 ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
     Resource* resource, const char *name )
-  : KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ),
-    Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget_Settings(0), mSyncWidget_Conflicts(0),mSyncWidget_Remote(0), mResource( resource ), mPersistentReadOnly(false)
+  : KDialogBase( parent, name, true, i18n( "Resource Configuration" ),
+    Ok|Cancel, Ok, true )/*, mConfig( config )*/, mResource( resource ), mPersistentReadOnly(false)
 {
 
@@ -59,8 +58,5 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
   QFrame *main;
 
-  if (!mResource->isSyncable())
-    main = plainPage();
-  else
-    main = addPage("Profile");
+  main = plainPage();
 
   QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() );
@@ -71,16 +67,15 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
   generalGroupBox->setTitle( i18n( "General Settings" ) );
 
-  new QLabel( mResource->isSyncable()?i18n( "Profile Name:" ):i18n( "Name:" ), generalGroupBox );
+  new QLabel( i18n( "Name:" ), generalGroupBox );
 
   mName = new KLineEdit( generalGroupBox );
 
-  if (!mResource->isSyncable()) {
-    new QLabel("", generalGroupBox );
-          mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox );
-    mReadOnly->setChecked( mResource->readOnly() );
-    new QLabel("", generalGroupBox );
-          mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox );
-    mIncludeInSync->setChecked( mResource->includeInSync() );
-  }
+  new QLabel("", generalGroupBox );
+  mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox );
+  mReadOnly->setChecked( mResource->readOnly() );
+
+  new QLabel("", generalGroupBox );
+  mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox );
+  mIncludeInSync->setChecked( mResource->includeInSync() );
 
   mName->setText( mResource->resourceName() );
@@ -100,4 +95,6 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
     connect( mConfigWidget, SIGNAL( setReadOnly( bool ) ),
         SLOT( setReadOnly( bool ) ) );
+    connect( mConfigWidget, SIGNAL( setIncludeInSync( bool ) ),
+        SLOT( setIncludeInSync( bool ) ) );
     connect( mConfigWidget, SIGNAL( setPersistentReadOnly( bool ) ),
         SLOT( setPersistentReadOnly( bool ) ) );
@@ -108,57 +105,4 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
   }
 
-  if (mResource->isSyncable())
-  {
-    SyncWidgetContainer* c = factory->syncWidgetContainer( resource->type() );
-
-    QFrame* syncPage = addPage("Settings");
-          QVBoxLayout *syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
-    mSyncWidget_Settings = c->generateSettingsTab(syncPage);
-    syncLayout->addWidget( mSyncWidget_Settings );
-
-    syncPage = addPage("Conflicts");
-          syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
-    mSyncWidget_Conflicts = c->generateConflictsTab(syncPage);
-    syncLayout->addWidget( mSyncWidget_Conflicts );
-
-    syncPage = addPage("Remote");
-          syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
-    mSyncWidget_Remote = c->generateRemoteTab(syncPage);
-    syncLayout->addWidget( mSyncWidget_Remote );
-
-
-    mSyncWidget_Settings->setInEditMode( false );
-    mSyncWidget_Settings->loadSettings( mResource );
-    mSyncWidget_Settings->show();
-
-    mSyncWidget_Conflicts->setInEditMode( false );
-    mSyncWidget_Conflicts->loadSettings( mResource );
-    mSyncWidget_Conflicts->show();
-
-    mSyncWidget_Remote->setInEditMode( false );
-    mSyncWidget_Remote->loadSettings( mResource );
-    mSyncWidget_Remote->show();
-
-    delete c;
-
-//    QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal,  syncPage );
-//    syncGroupBox->layout()->setSpacing( spacingHint());
-//    syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) );
-//    syncLayout->addWidget( syncGroupBox );
-
-//    syncLayout->addStretch();
-/*US
-    mSyncWidget = factory->syncWidget( resource->type(), syncPage );
-    syncLayout->addWidget( mSyncWidget );
-    if ( mSyncWidget ) {
-      mSyncWidget->setInEditMode( false );
-      mSyncWidget->loadSettings( mResource );
-      mSyncWidget->show();
-    }
-    */
-  }
-
-
-
 
   connect( mName, SIGNAL( textChanged(const QString &)),
@@ -176,12 +120,4 @@ void ConfigDialog::setInEditMode( bool value )
   if ( mConfigWidget )
     mConfigWidget->setInEditMode( value );
-
-  if ( mSyncWidget_Settings )
-    mSyncWidget_Settings->setInEditMode( value );
-  if ( mSyncWidget_Conflicts )
-    mSyncWidget_Conflicts->setInEditMode( value );
-  if ( mSyncWidget_Remote )
-    mSyncWidget_Remote->setInEditMode( value );
-
 }
 
@@ -193,37 +129,42 @@ void ConfigDialog::slotNameChanged( const QString &text)
 void ConfigDialog::setReadOnly( bool value )
 {
-  if (!mResource->isSyncable()) {
-
     if (mPersistentReadOnly == false)
       mReadOnly->setChecked( value );
     else
       mReadOnly->setChecked( true );
-  }
 }
 
-void ConfigDialog::setPersistentReadOnly( bool value )
+void ConfigDialog::setIncludeInSync( bool value )
 {
-  if (!mResource->isSyncable()) {
+    if (mPersistentReadOnly == false)
+      mIncludeInSync->setChecked( value );
+    else
+      mIncludeInSync->setChecked( true );
+}
 
+void ConfigDialog::setPersistentReadOnly( bool value )
+{
     mPersistentReadOnly = value;
 
-    if (value == true)
+    if (value == true) {
       setReadOnly( true );
+      setIncludeInSync( true );
+    }
 
     mReadOnly->setEnabled( !value );
-  }
+    mIncludeInSync->setEnabled (!value );
 }
 
+
 void ConfigDialog::accept()
 {
   if ( mName->text().isEmpty() ) {
-    KMessageBox::sorry( this, mResource->isSyncable()?i18n( "Please enter a profile name" ):i18n( "Please enter a resource name" ) );
+    KMessageBox::sorry( this, i18n( "Please enter a resource name" ) );
     return;
   }
 
   mResource->setResourceName( mName->text() );
-  if (!mResource->isSyncable())
-    mResource->setReadOnly( mReadOnly->isChecked() );
-    mResource->setIncludeInSync( mIncludeInSync->isChecked() );
+  mResource->setReadOnly( mReadOnly->isChecked() );
+  mResource->setIncludeInSync( mIncludeInSync->isChecked() );
 
   if ( mConfigWidget ) {
@@ -233,12 +174,4 @@ void ConfigDialog::accept()
   }
 
-  if ( mSyncWidget_Settings )
-    mSyncWidget_Settings->saveSettings( mResource );
-  if ( mSyncWidget_Conflicts )
-    mSyncWidget_Conflicts->saveSettings( mResource );
-  if ( mSyncWidget_Remote )
-    mSyncWidget_Remote->saveSettings( mResource );
-
-
   KDialog::accept();
 }
diff --git a/microkde/kresources/configdialog.h b/microkde/kresources/configdialog.h
index ed3ecab..b205975 100644
--- a/microkde/kresources/configdialog.h
+++ b/microkde/kresources/configdialog.h
@@ -32,5 +32,4 @@ namespace KRES {
   class Resource;
   class ConfigWidget;
-  class SyncWidget;
 
 class ConfigDialog : public KDialogBase
@@ -47,4 +46,5 @@ class ConfigDialog : public KDialogBase
     void accept();
     void setReadOnly( bool value );
+    void setIncludeInSync( bool value );
     void setPersistentReadOnly( bool value );
     void slotNameChanged( const QString &text);
@@ -52,7 +52,4 @@ class ConfigDialog : public KDialogBase
   private:
     ConfigWidget *mConfigWidget;
-    SyncWidget *mSyncWidget_Settings;
-    SyncWidget *mSyncWidget_Conflicts;
-    SyncWidget *mSyncWidget_Remote;
     Resource* mResource;
 
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index 02c5fb1..533be51 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -58,7 +58,4 @@ $Id$
 using namespace KRES;
 
-const QString ConfigPage::syncfamily = "syncprofiles";
-
-
 class ConfigViewItem : public QCheckListItem
 {
@@ -185,5 +182,5 @@ void ConfigPage::load()
 //US    QString family = tmp.toString();
   QStringList families;
-  families << "contact" << syncfamily;
+  families << "contact";
 
 
@@ -193,5 +190,5 @@ void ConfigPage::load()
     if ( !family.isEmpty() ) {
       if ( !mFamilyMap.contains( family ) ) {
-        mCurrentManager = new Manager<Resource>( family, (family == syncfamily) );
+        mCurrentManager = new Manager<Resource>( family );
         if ( mCurrentManager ) {
           mFamilyMap.append( family );
@@ -206,6 +203,4 @@ void ConfigPage::load()
           } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) {
             info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) );
-          } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) {
-            info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) );
           } else {
             QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) );
@@ -311,16 +306,7 @@ void ConfigPage::slotAdd()
   QString desc;
 
-  if (mFamily == syncfamily)
-  {
-          desc = QInputDialog::getItem( i18n( "Sync Configuration" ),
-                    i18n( "Select resource type for the new sync profile:" ), descs, 0,
-                    false, &ok, this );
-  }
-  else
-  {
-    desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
+  desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
                     i18n( "Select type of the new resource:" ), descs, 0,
                     false, &ok, this );
-  }
 
   if ( !ok )
@@ -337,12 +323,5 @@ void ConfigPage::slotAdd()
   }
 
-  if (mFamily == syncfamily)
-  {
-          resource->setResourceName( type + "-syncprofile" );
-  }
-  else
-  {
-          resource->setResourceName( type + "-resource" );
-  }
+  resource->setResourceName( type + "-resource" );
 
   ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" );
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index e44fce3..4e4456d 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -188,38 +188,4 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
 }
 
-SyncWidgetContainer *Factory::syncWidgetContainer( const QString& type )
-{
-  if ( type.isEmpty() || !mTypeMap.contains( type ) )
-    return 0;
-
-//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::syncWidget(): Factory creation failed for library %s", pi->library.latin1());
-    kdDebug() << "KRES::Factory::syncWidget(): Factory creation failed" << endl;
-    return 0;
-  }
-
-  PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
-
-  if ( !pluginFactory ) {
-    qDebug("KRES::Factory::syncWidget(): no plugin factory for library %s", pi->library.latin1());
-    kdDebug() << "KRES::Factory::syncWidget(): no plugin factory." << endl;
-    return 0;
-  }
-
-  SyncWidgetContainer *wdg = pluginFactory->syncWidgetContainer( );
-  if ( !wdg ) {
-//US    kdDebug() << "'" << ptr->library() << "' 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
 {
@@ -246,5 +212,5 @@ QString Factory::typeDescription( const QString &type ) const
 }
 
-Resource *Factory::resource( const QString& type, const KConfig *config, bool syncable )
+Resource *Factory::resource( const QString& type, const KConfig *config )
 {
 
@@ -277,5 +243,5 @@ Resource *Factory::resource( const QString& type, const KConfig *config, bool sy
   }
 
-  Resource *resource = pluginFactory->resource( config, syncable );
+  Resource *resource = pluginFactory->resource( config );
   if ( !resource ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h
index 0e4231b..ea01b23 100644
--- a/microkde/kresources/factory.h
+++ b/microkde/kresources/factory.h
@@ -35,5 +35,4 @@
 namespace KRES {
 
-class SyncWidgetContainer;
 class ConfigWidget;
 
@@ -88,15 +87,4 @@ class Factory
 
     /**
-     * Returns the sync widget for the given resource type,
-     * or a null pointer if resource type doesn't exist,
-     * or a null pointer if resource does not support syncing.
-     *
-     * @param type   The type of the resource, returned by @ref resources()
-     * @param resource The resource to be editted.
-     * @param parent The parent widget
-     */
-    SyncWidgetContainer *syncWidgetContainer( const QString& type );
-
-    /**
      * Returns a pointer to a resource object or a null pointer
      * if resource type doesn't exist.
@@ -105,7 +93,6 @@ class Factory
      * @param ab     The address book, the resource should belong to
      * @param config The config object where the resource get it settings from, or 0 if a new resource should be created.
-     * @param syncable If the resource should support syncing capabilities.
      */
-    Resource *resource( const QString& type, const KConfig *config, bool syncable );
+    Resource *resource( const QString& type, const KConfig *config);
 
     /**
diff --git a/microkde/kresources/manager.h b/microkde/kresources/manager.h
index 7e9e19a..0e6f838 100644
--- a/microkde/kresources/manager.h
+++ b/microkde/kresources/manager.h
@@ -168,15 +168,10 @@ class Manager : private ManagerImplListener
     bool isEmpty() const { return mImpl->resourceList()->isEmpty(); }
 
-    /**
-      Return true, if the manager manages syncable resources.
-    */
-    bool manageSyncable() { return mImpl->manageSyncable(); }
-
-    Manager( const QString &family, bool syncable )
+    Manager( const QString &family )
     {
       mFactory = Factory::self( family );
       // The managerimpl will use the same Factory object as the manager
       // because of the Factory::self() pattern
-      mImpl = new ManagerImpl( family, syncable );
+      mImpl = new ManagerImpl( family );
       mImpl->setListener( this );
 
@@ -261,9 +256,8 @@ class Manager : private ManagerImplListener
       @param type   The type of the resource, one of those returned
                     by @ref resourceTypeNames()
-     * @param syncable If the resource should support syncing capabilities.
     */
     T *createResource( const QString& type )
     {
-      return (T *)( mFactory->resource( type, 0, mImpl->manageSyncable() ) );
+      return (T *)( mFactory->resource( type, 0 ) );
     }
 
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 3655f50..81bbbec 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -42,6 +42,6 @@ $Id$
 using namespace KRES;
 
-ManagerImpl::ManagerImpl( const QString &family, bool syncable )
-  : mFamily( family ), mSyncable(syncable), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
+ManagerImpl::ManagerImpl( const QString &family )
+  : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
     mFactory( 0 )
 
@@ -269,5 +269,5 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier,
   QString type = mConfig->readEntry( "ResourceType" );
   QString name = mConfig->readEntry( "ResourceName" );
-  Resource *resource = mFactory->resource( type, mConfig, mSyncable );
+  Resource *resource = mFactory->resource( type, mConfig );
   if ( !resource ) {
       qDebug("Failed to create resource with id %s ",identifier.latin1() );
@@ -365,10 +365,3 @@ Resource* ManagerImpl::getResource( const QString& identifier )
 }
 
-/**
-  Return true, if the manager manages syncable resources.
-*/
-bool ManagerImpl::manageSyncable() const
-{
-        return mSyncable;
-}
 
diff --git a/microkde/kresources/managerimpl.h b/microkde/kresources/managerimpl.h
index 0425279..56a2db6 100644
--- a/microkde/kresources/managerimpl.h
+++ b/microkde/kresources/managerimpl.h
@@ -66,5 +66,5 @@ class ManagerImpl : public QObject
     Q_OBJECT
   public:
-    ManagerImpl( const QString &family, bool syncable);
+    ManagerImpl( const QString &family);
     ~ManagerImpl();
 
@@ -91,9 +91,4 @@ class ManagerImpl : public QObject
     void setListener( ManagerImplListener *listener );
 
-    /**
-      Return true, if the manager manages syncable resources.
-    */
-    bool manageSyncable() const;
-
   public slots:
     void resourceChanged( Resource *resource );
@@ -113,5 +108,4 @@ class ManagerImpl : public QObject
 
     QString mFamily;
-    bool mSyncable;
     KConfig *mConfig;
     KConfig *mStdConfig;
diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index f79bcd0..cccd485 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
@@ -199,4 +199,5 @@ void Resource::dump() const
   kdDebug(5650) << "  OpenCount: " << d->mOpenCount << endl;
   kdDebug(5650) << "  ReadOnly: " << ( d->mReadOnly ? "yes" : "no" ) << endl;
+  kdDebug(5650) << "  IncludeInSync: " << ( d->mIncludeInSync ? "yes" : "no" ) << endl;
   kdDebug(5650) << "  Active: " << ( d->mActive ? "yes" : "no" ) << endl;
   kdDebug(5650) << "  IsOpen: " << ( d->mIsOpen ? "yes" : "no" ) << endl;
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index 70b5613..ed5af96 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -41,5 +41,4 @@ namespace KRES {
 
 class ConfigWidget;
-class SyncWidgetContainer;
 
 /**
@@ -233,5 +232,5 @@ link_DATA= resourceexample.desktop
  *
  * A subclass should reimplement at least the constructor and the
- * @ref writeConfig method.
+k * @ref writeConfig method.
  *
    */
@@ -324,9 +323,4 @@ class Resource : public QObject
     virtual QString resourceName() const;
 
-
-
-          virtual bool isSyncable() const = 0;
-
-
     /**
       Sets, if the resource is active.
@@ -377,10 +371,8 @@ class PluginFactoryBase : public KLibFactory
 {
   public:
-    virtual Resource *resource( const KConfig *config, bool syncable ) = 0;
+    virtual Resource *resource( const KConfig *config) = 0;
 
     virtual ConfigWidget *configWidget( QWidget *parent ) = 0;
 
-    virtual SyncWidgetContainer *syncWidgetContainer() = 0;
-
   protected:
     virtual QObject* createObject( QObject*, const char*, const char*,
@@ -391,11 +383,11 @@ class PluginFactoryBase : public KLibFactory
 };
 
-template<class TR,class TC, class TS>
+template<class TR,class TC>
 class PluginFactory : public PluginFactoryBase
 {
   public:
-    Resource *resource( const KConfig *config, bool syncable )
+    Resource *resource( const KConfig *config)
     {
-      return new TR( config, syncable );
+      return new TR( config );
     }
 
@@ -404,10 +396,4 @@ class PluginFactory : public PluginFactoryBase
       return new TC( parent );
     }
-
-    SyncWidgetContainer *syncWidgetContainer()
-    {
-      return new TS();
-    }
-
 };
 
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index df914ce..071ceb3 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -90,5 +90,4 @@ osmartpointer.h \
  kresources/configdialog.h \
  kresources/kcmkresources.h \
- kresources/syncwidget.h \
  kdecore/kmdcodec.h \
  kdecore/kconfigbase.h \
@@ -174,5 +173,4 @@ oprocess.cpp \
  kresources/resource.cpp \
  kresources/selectdialog.cpp \
- kresources/syncwidget.cpp \
  kutils/kcmultidialog.cpp  \
  kidmanager.cpp