removal of syncresources

11 files changed, 38 insertions, 210 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
@@ -43,3 +43,2 @@
 #include "configdialog.h"
-#include "syncwidget.h"
 
@@ -49,4 +48,4 @@ 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)
 {
@@ -60,6 +59,3 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
 
-  if (!mResource->isSyncable())
     main = plainPage();
-  else
-    main = addPage("Profile");
 
@@ -72,3 +68,3 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
 
-  new QLabel( mResource->isSyncable()?i18n( "Profile Name:" ):i18n( "Name:" ), generalGroupBox );
+  new QLabel( i18n( "Name:" ), generalGroupBox );
 
@@ -76,3 +72,2 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
 
-  if (!mResource->isSyncable()) {
     new QLabel("", generalGroupBox );
@@ -80,2 +75,3 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
     mReadOnly->setChecked( mResource->readOnly() );
+
     new QLabel("", generalGroupBox );
@@ -83,3 +79,2 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
     mIncludeInSync->setChecked( mResource->includeInSync() );
-  }
 
@@ -101,2 +96,4 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
         SLOT( setReadOnly( bool ) ) );
+    connect( mConfigWidget, SIGNAL( setIncludeInSync( bool ) ),
+        SLOT( setIncludeInSync( bool ) ) );
     connect( mConfigWidget, SIGNAL( setPersistentReadOnly( bool ) ),
@@ -109,55 +106,2 @@ 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();
-    }
-    */
-  }
-
-
-
 
@@ -177,10 +121,2 @@ void ConfigDialog::setInEditMode( bool value )
     mConfigWidget->setInEditMode( value );
-
-  if ( mSyncWidget_Settings )
-    mSyncWidget_Settings->setInEditMode( value );
-  if ( mSyncWidget_Conflicts )
-    mSyncWidget_Conflicts->setInEditMode( value );
-  if ( mSyncWidget_Remote )
-    mSyncWidget_Remote->setInEditMode( value );
-
 }
@@ -194,4 +130,2 @@ void ConfigDialog::setReadOnly( bool value )
 {
-  if (!mResource->isSyncable()) {
-
     if (mPersistentReadOnly == false)
@@ -201,2 +135,9 @@ void ConfigDialog::setReadOnly( bool value )
   }
+
+void ConfigDialog::setIncludeInSync( bool value )
+{
+    if (mPersistentReadOnly == false)
+      mIncludeInSync->setChecked( value );
+    else
+      mIncludeInSync->setChecked( true );
 }
@@ -205,12 +146,13 @@ void ConfigDialog::setPersistentReadOnly( bool value )
 {
-  if (!mResource->isSyncable()) {
-
     mPersistentReadOnly = value;
 
-    if (value == true)
+    if (value == true) {
       setReadOnly( true );
+      setIncludeInSync( true );
+    }
 
     mReadOnly->setEnabled( !value );
+    mIncludeInSync->setEnabled (!value );
   }
-}
+
 
@@ -219,3 +161,3 @@ 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;
@@ -224,3 +166,2 @@ void ConfigDialog::accept()
   mResource->setResourceName( mName->text() );
-  if (!mResource->isSyncable())
     mResource->setReadOnly( mReadOnly->isChecked() );
@@ -234,10 +175,2 @@ 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
@@ -33,3 +33,2 @@ namespace KRES {
   class ConfigWidget;
-  class SyncWidget;
 
@@ -48,2 +47,3 @@ class ConfigDialog : public KDialogBase
     void setReadOnly( bool value );
+    void setIncludeInSync( bool value );
     void setPersistentReadOnly( bool value );
@@ -53,5 +53,2 @@ class ConfigDialog : public KDialogBase
     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
@@ -59,5 +59,2 @@ using namespace KRES;
 
-const QString ConfigPage::syncfamily = "syncprofiles";
-
-
 class ConfigViewItem : public QCheckListItem
@@ -186,3 +183,3 @@ void ConfigPage::load()
   QStringList families;
-  families << "contact" << syncfamily;
+  families << "contact";
 
@@ -194,3 +191,3 @@ void ConfigPage::load()
       if ( !mFamilyMap.contains( family ) ) {
-        mCurrentManager = new Manager<Resource>( family, (family == syncfamily) );
+        mCurrentManager = new Manager<Resource>( family );
         if ( mCurrentManager ) {
@@ -207,4 +204,2 @@ void ConfigPage::load()
             info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) );
-          } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) {
-            info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) );
           } else {
@@ -312,10 +307,2 @@ void ConfigPage::slotAdd()
 
-  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" ),
@@ -323,3 +310,2 @@ void ConfigPage::slotAdd()
                     false, &ok, this );
-  }
 
@@ -338,10 +324,3 @@ void ConfigPage::slotAdd()
 
-  if (mFamily == syncfamily)
-  {
-  	resource->setResourceName( type + "-syncprofile" );
-  }
-  else
-  {
   	resource->setResourceName( type + "-resource" );
-  }
 
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
@@ -189,36 +189,2 @@ 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
@@ -247,3 +213,3 @@ 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 )
 {
@@ -278,3 +244,3 @@ Resource *Factory::resource( const QString& type, const KConfig *config, bool sy
 
-  Resource *resource = pluginFactory->resource( config, syncable );
+  Resource *resource = pluginFactory->resource( config );
   if ( !resource ) {
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
@@ -36,3 +36,2 @@ namespace KRES {
 
-class SyncWidgetContainer;
 class ConfigWidget;
@@ -89,13 +88,2 @@ 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
@@ -106,5 +94,4 @@ class Factory
      * @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
@@ -169,8 +169,3 @@ class Manager : private ManagerImplListener
 
-    /**
-      Return true, if the manager manages syncable resources.
-    */
-    bool manageSyncable() { return mImpl->manageSyncable(); }
-
-    Manager( const QString &family, bool syncable )
+    Manager( const QString &family )
     {
@@ -179,3 +174,3 @@ class Manager : private ManagerImplListener
       // because of the Factory::self() pattern
-      mImpl = new ManagerImpl( family, syncable );
+      mImpl = new ManagerImpl( family );
       mImpl->setListener( this );
@@ -262,3 +257,2 @@ class Manager : private ManagerImplListener
                     by @ref resourceTypeNames()
-     * @param syncable If the resource should support syncing capabilities.
     */
@@ -266,3 +260,3 @@ class Manager : private ManagerImplListener
     {
-      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
@@ -43,4 +43,4 @@ 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 )
@@ -270,3 +270,3 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier,
   QString name = mConfig->readEntry( "ResourceName" );
-  Resource *resource = mFactory->resource( type, mConfig, mSyncable );
+  Resource *resource = mFactory->resource( type, mConfig );
   if ( !resource ) {
@@ -366,9 +366,2 @@ 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
@@ -67,3 +67,3 @@ class ManagerImpl : public QObject
   public:
-    ManagerImpl( const QString &family, bool syncable);
+    ManagerImpl( const QString &family);
     ~ManagerImpl();
@@ -92,7 +92,2 @@ class ManagerImpl : public QObject
 
-    /**
-      Return true, if the manager manages syncable resources.
-    */
-    bool manageSyncable() const;
-
   public slots:
@@ -114,3 +109,2 @@ class ManagerImpl : public QObject
     QString mFamily;
-    bool mSyncable;
     KConfig *mConfig;
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
@@ -200,2 +200,3 @@ void Resource::dump() const
   kdDebug(5650) << "  ReadOnly: " << ( d->mReadOnly ? "yes" : "no" ) << endl;
+  kdDebug(5650) << "  IncludeInSync: " << ( d->mIncludeInSync ? "yes" : "no" ) << endl;
   kdDebug(5650) << "  Active: " << ( d->mActive ? "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
@@ -42,3 +42,2 @@ namespace KRES {
 class ConfigWidget;
-class SyncWidgetContainer;
 
@@ -234,3 +233,3 @@ link_DATA= resourceexample.desktop
  * A subclass should reimplement at least the constructor and the
- * @ref writeConfig method.
+k * @ref writeConfig method.
  *
@@ -325,7 +324,2 @@ class Resource : public QObject
 
-
-
-  	virtual bool isSyncable() const = 0;
-
-
     /**
@@ -378,3 +372,3 @@ class PluginFactoryBase : public KLibFactory
   public:
-    virtual Resource *resource( const KConfig *config, bool syncable ) = 0;
+    virtual Resource *resource( const KConfig *config) = 0;
 
@@ -382,4 +376,2 @@ class PluginFactoryBase : public KLibFactory
 
-    virtual SyncWidgetContainer *syncWidgetContainer() = 0;
-
   protected:
@@ -392,3 +384,3 @@ class PluginFactoryBase : public KLibFactory
 
-template<class TR,class TC, class TS>
+template<class TR,class TC>
 class PluginFactory : public PluginFactoryBase
@@ -396,5 +388,5 @@ 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 );
     }
@@ -405,8 +397,2 @@ class PluginFactory : public PluginFactoryBase
     }
-
-    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
@@ -91,3 +91,2 @@ osmartpointer.h \
  kresources/kcmkresources.h \
- kresources/syncwidget.h \
  kdecore/kmdcodec.h \
@@ -175,3 +174,2 @@ oprocess.cpp \
  kresources/selectdialog.cpp \
- kresources/syncwidget.cpp \
  kutils/kcmultidialog.cpp  \