-rw-r--r-- | microkde/kresources/configdialog.cpp | 125 | ||||
-rw-r--r-- | microkde/kresources/configdialog.h | 5 | ||||
-rw-r--r-- | microkde/kresources/configpage.cpp | 29 | ||||
-rw-r--r-- | microkde/kresources/factory.cpp | 38 | ||||
-rw-r--r-- | microkde/kresources/factory.h | 15 | ||||
-rw-r--r-- | microkde/kresources/manager.h | 12 | ||||
-rw-r--r-- | microkde/kresources/managerimpl.cpp | 13 | ||||
-rw-r--r-- | microkde/kresources/managerimpl.h | 8 | ||||
-rw-r--r-- | microkde/kresources/resource.cpp | 1 | ||||
-rw-r--r-- | microkde/kresources/resource.h | 24 | ||||
-rw-r--r-- | microkde/microkdeE.pro | 2 |
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 | |||
@@ -41,14 +41,13 @@ | |||
41 | #include "factory.h" | 41 | #include "factory.h" |
42 | #include "configwidget.h" | 42 | #include "configwidget.h" |
43 | #include "configdialog.h" | 43 | #include "configdialog.h" |
44 | #include "syncwidget.h" | ||
45 | 44 | ||
46 | using namespace KRES; | 45 | using namespace KRES; |
47 | 46 | ||
48 | ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | 47 | ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, |
49 | Resource* resource, const char *name ) | 48 | Resource* resource, const char *name ) |
50 | : KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ), | 49 | : KDialogBase( parent, name, true, i18n( "Resource Configuration" ), |
51 | Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget_Settings(0), mSyncWidget_Conflicts(0),mSyncWidget_Remote(0), mResource( resource ), mPersistentReadOnly(false) | 50 | Ok|Cancel, Ok, true )/*, mConfig( config )*/, mResource( resource ), mPersistentReadOnly(false) |
52 | { | 51 | { |
53 | 52 | ||
54 | Factory *factory = Factory::self( resourceFamily ); | 53 | Factory *factory = Factory::self( resourceFamily ); |
@@ -58,10 +57,7 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
58 | 57 | ||
59 | QFrame *main; | 58 | QFrame *main; |
60 | 59 | ||
61 | if (!mResource->isSyncable()) | 60 | main = plainPage(); |
62 | main = plainPage(); | ||
63 | else | ||
64 | main = addPage("Profile"); | ||
65 | 61 | ||
66 | QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() ); | 62 | QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() ); |
67 | 63 | ||
@@ -70,18 +66,17 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
70 | generalGroupBox->layout()->setSpacing( spacingHint() ); | 66 | generalGroupBox->layout()->setSpacing( spacingHint() ); |
71 | generalGroupBox->setTitle( i18n( "General Settings" ) ); | 67 | generalGroupBox->setTitle( i18n( "General Settings" ) ); |
72 | 68 | ||
73 | new QLabel( mResource->isSyncable()?i18n( "Profile Name:" ):i18n( "Name:" ), generalGroupBox ); | 69 | new QLabel( i18n( "Name:" ), generalGroupBox ); |
74 | 70 | ||
75 | mName = new KLineEdit( generalGroupBox ); | 71 | mName = new KLineEdit( generalGroupBox ); |
76 | 72 | ||
77 | if (!mResource->isSyncable()) { | 73 | new QLabel("", generalGroupBox ); |
78 | new QLabel("", generalGroupBox ); | 74 | mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox ); |
79 | mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox ); | 75 | mReadOnly->setChecked( mResource->readOnly() ); |
80 | mReadOnly->setChecked( mResource->readOnly() ); | 76 | |
81 | new QLabel("", generalGroupBox ); | 77 | new QLabel("", generalGroupBox ); |
82 | mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox ); | 78 | mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox ); |
83 | mIncludeInSync->setChecked( mResource->includeInSync() ); | 79 | mIncludeInSync->setChecked( mResource->includeInSync() ); |
84 | } | ||
85 | 80 | ||
86 | mName->setText( mResource->resourceName() ); | 81 | mName->setText( mResource->resourceName() ); |
87 | 82 | ||
@@ -99,6 +94,8 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
99 | if ( mConfigWidget ) { | 94 | if ( mConfigWidget ) { |
100 | connect( mConfigWidget, SIGNAL( setReadOnly( bool ) ), | 95 | connect( mConfigWidget, SIGNAL( setReadOnly( bool ) ), |
101 | SLOT( setReadOnly( bool ) ) ); | 96 | SLOT( setReadOnly( bool ) ) ); |
97 | connect( mConfigWidget, SIGNAL( setIncludeInSync( bool ) ), | ||
98 | SLOT( setIncludeInSync( bool ) ) ); | ||
102 | connect( mConfigWidget, SIGNAL( setPersistentReadOnly( bool ) ), | 99 | connect( mConfigWidget, SIGNAL( setPersistentReadOnly( bool ) ), |
103 | SLOT( setPersistentReadOnly( bool ) ) ); | 100 | SLOT( setPersistentReadOnly( bool ) ) ); |
104 | mConfigWidget->setInEditMode( false ); | 101 | mConfigWidget->setInEditMode( false ); |
@@ -107,59 +104,6 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
107 | 104 | ||
108 | } | 105 | } |
109 | 106 | ||
110 | if (mResource->isSyncable()) | ||
111 | { | ||
112 | SyncWidgetContainer* c = factory->syncWidgetContainer( resource->type() ); | ||
113 | |||
114 | QFrame* syncPage = addPage("Settings"); | ||
115 | QVBoxLayout *syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() ); | ||
116 | mSyncWidget_Settings = c->generateSettingsTab(syncPage); | ||
117 | syncLayout->addWidget( mSyncWidget_Settings ); | ||
118 | |||
119 | syncPage = addPage("Conflicts"); | ||
120 | syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() ); | ||
121 | mSyncWidget_Conflicts = c->generateConflictsTab(syncPage); | ||
122 | syncLayout->addWidget( mSyncWidget_Conflicts ); | ||
123 | |||
124 | syncPage = addPage("Remote"); | ||
125 | syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() ); | ||
126 | mSyncWidget_Remote = c->generateRemoteTab(syncPage); | ||
127 | syncLayout->addWidget( mSyncWidget_Remote ); | ||
128 | |||
129 | |||
130 | mSyncWidget_Settings->setInEditMode( false ); | ||
131 | mSyncWidget_Settings->loadSettings( mResource ); | ||
132 | mSyncWidget_Settings->show(); | ||
133 | |||
134 | mSyncWidget_Conflicts->setInEditMode( false ); | ||
135 | mSyncWidget_Conflicts->loadSettings( mResource ); | ||
136 | mSyncWidget_Conflicts->show(); | ||
137 | |||
138 | mSyncWidget_Remote->setInEditMode( false ); | ||
139 | mSyncWidget_Remote->loadSettings( mResource ); | ||
140 | mSyncWidget_Remote->show(); | ||
141 | |||
142 | delete c; | ||
143 | |||
144 | // QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal, syncPage ); | ||
145 | // syncGroupBox->layout()->setSpacing( spacingHint()); | ||
146 | // syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) ); | ||
147 | // syncLayout->addWidget( syncGroupBox ); | ||
148 | |||
149 | // syncLayout->addStretch(); | ||
150 | /*US | ||
151 | mSyncWidget = factory->syncWidget( resource->type(), syncPage ); | ||
152 | syncLayout->addWidget( mSyncWidget ); | ||
153 | if ( mSyncWidget ) { | ||
154 | mSyncWidget->setInEditMode( false ); | ||
155 | mSyncWidget->loadSettings( mResource ); | ||
156 | mSyncWidget->show(); | ||
157 | } | ||
158 | */ | ||
159 | } | ||
160 | |||
161 | |||
162 | |||
163 | 107 | ||
164 | connect( mName, SIGNAL( textChanged(const QString &)), | 108 | connect( mName, SIGNAL( textChanged(const QString &)), |
165 | SLOT( slotNameChanged(const QString &))); | 109 | SLOT( slotNameChanged(const QString &))); |
@@ -175,14 +119,6 @@ void ConfigDialog::setInEditMode( bool value ) | |||
175 | { | 119 | { |
176 | if ( mConfigWidget ) | 120 | if ( mConfigWidget ) |
177 | mConfigWidget->setInEditMode( value ); | 121 | mConfigWidget->setInEditMode( value ); |
178 | |||
179 | if ( mSyncWidget_Settings ) | ||
180 | mSyncWidget_Settings->setInEditMode( value ); | ||
181 | if ( mSyncWidget_Conflicts ) | ||
182 | mSyncWidget_Conflicts->setInEditMode( value ); | ||
183 | if ( mSyncWidget_Remote ) | ||
184 | mSyncWidget_Remote->setInEditMode( value ); | ||
185 | |||
186 | } | 122 | } |
187 | 123 | ||
188 | void ConfigDialog::slotNameChanged( const QString &text) | 124 | void ConfigDialog::slotNameChanged( const QString &text) |
@@ -192,39 +128,44 @@ void ConfigDialog::slotNameChanged( const QString &text) | |||
192 | 128 | ||
193 | void ConfigDialog::setReadOnly( bool value ) | 129 | void ConfigDialog::setReadOnly( bool value ) |
194 | { | 130 | { |
195 | if (!mResource->isSyncable()) { | ||
196 | |||
197 | if (mPersistentReadOnly == false) | 131 | if (mPersistentReadOnly == false) |
198 | mReadOnly->setChecked( value ); | 132 | mReadOnly->setChecked( value ); |
199 | else | 133 | else |
200 | mReadOnly->setChecked( true ); | 134 | mReadOnly->setChecked( true ); |
201 | } | ||
202 | } | 135 | } |
203 | 136 | ||
204 | void ConfigDialog::setPersistentReadOnly( bool value ) | 137 | void ConfigDialog::setIncludeInSync( bool value ) |
205 | { | 138 | { |
206 | if (!mResource->isSyncable()) { | 139 | if (mPersistentReadOnly == false) |
140 | mIncludeInSync->setChecked( value ); | ||
141 | else | ||
142 | mIncludeInSync->setChecked( true ); | ||
143 | } | ||
207 | 144 | ||
145 | void ConfigDialog::setPersistentReadOnly( bool value ) | ||
146 | { | ||
208 | mPersistentReadOnly = value; | 147 | mPersistentReadOnly = value; |
209 | 148 | ||
210 | if (value == true) | 149 | if (value == true) { |
211 | setReadOnly( true ); | 150 | setReadOnly( true ); |
151 | setIncludeInSync( true ); | ||
152 | } | ||
212 | 153 | ||
213 | mReadOnly->setEnabled( !value ); | 154 | mReadOnly->setEnabled( !value ); |
214 | } | 155 | mIncludeInSync->setEnabled (!value ); |
215 | } | 156 | } |
216 | 157 | ||
158 | |||
217 | void ConfigDialog::accept() | 159 | void ConfigDialog::accept() |
218 | { | 160 | { |
219 | if ( mName->text().isEmpty() ) { | 161 | if ( mName->text().isEmpty() ) { |
220 | KMessageBox::sorry( this, mResource->isSyncable()?i18n( "Please enter a profile name" ):i18n( "Please enter a resource name" ) ); | 162 | KMessageBox::sorry( this, i18n( "Please enter a resource name" ) ); |
221 | return; | 163 | return; |
222 | } | 164 | } |
223 | 165 | ||
224 | mResource->setResourceName( mName->text() ); | 166 | mResource->setResourceName( mName->text() ); |
225 | if (!mResource->isSyncable()) | 167 | mResource->setReadOnly( mReadOnly->isChecked() ); |
226 | mResource->setReadOnly( mReadOnly->isChecked() ); | 168 | mResource->setIncludeInSync( mIncludeInSync->isChecked() ); |
227 | mResource->setIncludeInSync( mIncludeInSync->isChecked() ); | ||
228 | 169 | ||
229 | if ( mConfigWidget ) { | 170 | if ( mConfigWidget ) { |
230 | // First save generic information | 171 | // First save generic information |
@@ -232,14 +173,6 @@ void ConfigDialog::accept() | |||
232 | mConfigWidget->saveSettings( mResource ); | 173 | mConfigWidget->saveSettings( mResource ); |
233 | } | 174 | } |
234 | 175 | ||
235 | if ( mSyncWidget_Settings ) | ||
236 | mSyncWidget_Settings->saveSettings( mResource ); | ||
237 | if ( mSyncWidget_Conflicts ) | ||
238 | mSyncWidget_Conflicts->saveSettings( mResource ); | ||
239 | if ( mSyncWidget_Remote ) | ||
240 | mSyncWidget_Remote->saveSettings( mResource ); | ||
241 | |||
242 | |||
243 | KDialog::accept(); | 176 | KDialog::accept(); |
244 | } | 177 | } |
245 | 178 | ||
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 | |||
@@ -31,7 +31,6 @@ class KButtonBox; | |||
31 | namespace KRES { | 31 | namespace KRES { |
32 | class Resource; | 32 | class Resource; |
33 | class ConfigWidget; | 33 | class ConfigWidget; |
34 | class SyncWidget; | ||
35 | 34 | ||
36 | class ConfigDialog : public KDialogBase | 35 | class ConfigDialog : public KDialogBase |
37 | { | 36 | { |
@@ -46,14 +45,12 @@ class ConfigDialog : public KDialogBase | |||
46 | protected slots: | 45 | protected slots: |
47 | void accept(); | 46 | void accept(); |
48 | void setReadOnly( bool value ); | 47 | void setReadOnly( bool value ); |
48 | void setIncludeInSync( bool value ); | ||
49 | void setPersistentReadOnly( bool value ); | 49 | void setPersistentReadOnly( bool value ); |
50 | void slotNameChanged( const QString &text); | 50 | void slotNameChanged( const QString &text); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | ConfigWidget *mConfigWidget; | 53 | ConfigWidget *mConfigWidget; |
54 | SyncWidget *mSyncWidget_Settings; | ||
55 | SyncWidget *mSyncWidget_Conflicts; | ||
56 | SyncWidget *mSyncWidget_Remote; | ||
57 | Resource* mResource; | 54 | Resource* mResource; |
58 | 55 | ||
59 | KLineEdit *mName; | 56 | KLineEdit *mName; |
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 | |||
@@ -57,9 +57,6 @@ $Id$ | |||
57 | 57 | ||
58 | using namespace KRES; | 58 | using namespace KRES; |
59 | 59 | ||
60 | const QString ConfigPage::syncfamily = "syncprofiles"; | ||
61 | |||
62 | |||
63 | class ConfigViewItem : public QCheckListItem | 60 | class ConfigViewItem : public QCheckListItem |
64 | { | 61 | { |
65 | public: | 62 | public: |
@@ -184,7 +181,7 @@ void ConfigPage::load() | |||
184 | //US QVariant tmp = (*it)->property( "X-KDE-ResourceFamily" ); | 181 | //US QVariant tmp = (*it)->property( "X-KDE-ResourceFamily" ); |
185 | //US QString family = tmp.toString(); | 182 | //US QString family = tmp.toString(); |
186 | QStringList families; | 183 | QStringList families; |
187 | families << "contact" << syncfamily; | 184 | families << "contact"; |
188 | 185 | ||
189 | 186 | ||
190 | for ( QStringList::Iterator it = families.begin(); it != families.end(); ++it ) | 187 | for ( QStringList::Iterator it = families.begin(); it != families.end(); ++it ) |
@@ -192,7 +189,7 @@ void ConfigPage::load() | |||
192 | QString family = (*it); | 189 | QString family = (*it); |
193 | if ( !family.isEmpty() ) { | 190 | if ( !family.isEmpty() ) { |
194 | if ( !mFamilyMap.contains( family ) ) { | 191 | if ( !mFamilyMap.contains( family ) ) { |
195 | mCurrentManager = new Manager<Resource>( family, (family == syncfamily) ); | 192 | mCurrentManager = new Manager<Resource>( family ); |
196 | if ( mCurrentManager ) { | 193 | if ( mCurrentManager ) { |
197 | mFamilyMap.append( family ); | 194 | mFamilyMap.append( family ); |
198 | mCurrentManager->addListener( this ); | 195 | mCurrentManager->addListener( this ); |
@@ -205,8 +202,6 @@ void ConfigPage::load() | |||
205 | info.mConfig = new KConfig( locateLocal( "config", "kabcrc" ) ); | 202 | info.mConfig = new KConfig( locateLocal( "config", "kabcrc" ) ); |
206 | } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) { | 203 | } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) { |
207 | info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) ); | 204 | info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) ); |
208 | } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) { | ||
209 | info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) ); | ||
210 | } else { | 205 | } else { |
211 | QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) ); | 206 | QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) ); |
212 | info.mConfig = new KConfig( configFile ); | 207 | info.mConfig = new KConfig( configFile ); |
@@ -310,18 +305,9 @@ void ConfigPage::slotAdd() | |||
310 | 305 | ||
311 | QString desc; | 306 | QString desc; |
312 | 307 | ||
313 | if (mFamily == syncfamily) | 308 | desc = QInputDialog::getItem( i18n( "Resource Configuration" ), |
314 | { | ||
315 | desc = QInputDialog::getItem( i18n( "Sync Configuration" ), | ||
316 | i18n( "Select resource type for the new sync profile:" ), descs, 0, | ||
317 | false, &ok, this ); | ||
318 | } | ||
319 | else | ||
320 | { | ||
321 | desc = QInputDialog::getItem( i18n( "Resource Configuration" ), | ||
322 | i18n( "Select type of the new resource:" ), descs, 0, | 309 | i18n( "Select type of the new resource:" ), descs, 0, |
323 | false, &ok, this ); | 310 | false, &ok, this ); |
324 | } | ||
325 | 311 | ||
326 | if ( !ok ) | 312 | if ( !ok ) |
327 | return; | 313 | return; |
@@ -336,14 +322,7 @@ void ConfigPage::slotAdd() | |||
336 | return; | 322 | return; |
337 | } | 323 | } |
338 | 324 | ||
339 | if (mFamily == syncfamily) | 325 | resource->setResourceName( type + "-resource" ); |
340 | { | ||
341 | resource->setResourceName( type + "-syncprofile" ); | ||
342 | } | ||
343 | else | ||
344 | { | ||
345 | resource->setResourceName( type + "-resource" ); | ||
346 | } | ||
347 | 326 | ||
348 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); | 327 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); |
349 | 328 | ||
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 | |||
@@ -187,40 +187,6 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent ) | |||
187 | 187 | ||
188 | } | 188 | } |
189 | 189 | ||
190 | SyncWidgetContainer *Factory::syncWidgetContainer( const QString& type ) | ||
191 | { | ||
192 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) | ||
193 | return 0; | ||
194 | |||
195 | //US KService::Ptr ptr = mTypeMap[ type ]; | ||
196 | //US KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); | ||
197 | PluginInfo* pi = mTypeMap[ type ]; | ||
198 | KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() ); | ||
199 | if ( !factory ) { | ||
200 | qDebug("KRES::Factory::syncWidget(): Factory creation failed for library %s", pi->library.latin1()); | ||
201 | kdDebug() << "KRES::Factory::syncWidget(): Factory creation failed" << endl; | ||
202 | return 0; | ||
203 | } | ||
204 | |||
205 | PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory ); | ||
206 | |||
207 | if ( !pluginFactory ) { | ||
208 | qDebug("KRES::Factory::syncWidget(): no plugin factory for library %s", pi->library.latin1()); | ||
209 | kdDebug() << "KRES::Factory::syncWidget(): no plugin factory." << endl; | ||
210 | return 0; | ||
211 | } | ||
212 | |||
213 | SyncWidgetContainer *wdg = pluginFactory->syncWidgetContainer( ); | ||
214 | if ( !wdg ) { | ||
215 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; | ||
216 | qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); | ||
217 | return 0; | ||
218 | } | ||
219 | return wdg; | ||
220 | |||
221 | } | ||
222 | |||
223 | |||
224 | QString Factory::typeName( const QString &type ) const | 190 | QString Factory::typeName( const QString &type ) const |
225 | { | 191 | { |
226 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) | 192 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) |
@@ -245,7 +211,7 @@ QString Factory::typeDescription( const QString &type ) const | |||
245 | return pi->descriptionLabel; | 211 | return pi->descriptionLabel; |
246 | } | 212 | } |
247 | 213 | ||
248 | Resource *Factory::resource( const QString& type, const KConfig *config, bool syncable ) | 214 | Resource *Factory::resource( const QString& type, const KConfig *config ) |
249 | { | 215 | { |
250 | 216 | ||
251 | 217 | ||
@@ -276,7 +242,7 @@ Resource *Factory::resource( const QString& type, const KConfig *config, bool sy | |||
276 | return 0; | 242 | return 0; |
277 | } | 243 | } |
278 | 244 | ||
279 | Resource *resource = pluginFactory->resource( config, syncable ); | 245 | Resource *resource = pluginFactory->resource( config ); |
280 | if ( !resource ) { | 246 | if ( !resource ) { |
281 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; | 247 | //US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl; |
282 | qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); | 248 | qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1()); |
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 | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | namespace KRES { | 35 | namespace KRES { |
36 | 36 | ||
37 | class SyncWidgetContainer; | ||
38 | class ConfigWidget; | 37 | class ConfigWidget; |
39 | 38 | ||
40 | //US | 39 | //US |
@@ -87,26 +86,14 @@ class Factory | |||
87 | ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 ); | 86 | ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 ); |
88 | 87 | ||
89 | /** | 88 | /** |
90 | * Returns the sync widget for the given resource type, | ||
91 | * or a null pointer if resource type doesn't exist, | ||
92 | * or a null pointer if resource does not support syncing. | ||
93 | * | ||
94 | * @param type The type of the resource, returned by @ref resources() | ||
95 | * @param resource The resource to be editted. | ||
96 | * @param parent The parent widget | ||
97 | */ | ||
98 | SyncWidgetContainer *syncWidgetContainer( const QString& type ); | ||
99 | |||
100 | /** | ||
101 | * Returns a pointer to a resource object or a null pointer | 89 | * Returns a pointer to a resource object or a null pointer |
102 | * if resource type doesn't exist. | 90 | * if resource type doesn't exist. |
103 | * | 91 | * |
104 | * @param type The type of the resource, returned by @ref resources() | 92 | * @param type The type of the resource, returned by @ref resources() |
105 | * @param ab The address book, the resource should belong to | 93 | * @param ab The address book, the resource should belong to |
106 | * @param config The config object where the resource get it settings from, or 0 if a new resource should be created. | 94 | * @param config The config object where the resource get it settings from, or 0 if a new resource should be created. |
107 | * @param syncable If the resource should support syncing capabilities. | ||
108 | */ | 95 | */ |
109 | Resource *resource( const QString& type, const KConfig *config, bool syncable ); | 96 | Resource *resource( const QString& type, const KConfig *config); |
110 | 97 | ||
111 | /** | 98 | /** |
112 | * Returns a list of all available resource types. | 99 | * Returns a list of all available resource types. |
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 | |||
@@ -167,17 +167,12 @@ class Manager : private ManagerImplListener | |||
167 | 167 | ||
168 | bool isEmpty() const { return mImpl->resourceList()->isEmpty(); } | 168 | bool isEmpty() const { return mImpl->resourceList()->isEmpty(); } |
169 | 169 | ||
170 | /** | 170 | Manager( const QString &family ) |
171 | Return true, if the manager manages syncable resources. | ||
172 | */ | ||
173 | bool manageSyncable() { return mImpl->manageSyncable(); } | ||
174 | |||
175 | Manager( const QString &family, bool syncable ) | ||
176 | { | 171 | { |
177 | mFactory = Factory::self( family ); | 172 | mFactory = Factory::self( family ); |
178 | // The managerimpl will use the same Factory object as the manager | 173 | // The managerimpl will use the same Factory object as the manager |
179 | // because of the Factory::self() pattern | 174 | // because of the Factory::self() pattern |
180 | mImpl = new ManagerImpl( family, syncable ); | 175 | mImpl = new ManagerImpl( family ); |
181 | mImpl->setListener( this ); | 176 | mImpl->setListener( this ); |
182 | 177 | ||
183 | mListeners = new QPtrList<ManagerListener<T> >; | 178 | mListeners = new QPtrList<ManagerListener<T> >; |
@@ -260,11 +255,10 @@ class Manager : private ManagerImplListener | |||
260 | 255 | ||
261 | @param type The type of the resource, one of those returned | 256 | @param type The type of the resource, one of those returned |
262 | by @ref resourceTypeNames() | 257 | by @ref resourceTypeNames() |
263 | * @param syncable If the resource should support syncing capabilities. | ||
264 | */ | 258 | */ |
265 | T *createResource( const QString& type ) | 259 | T *createResource( const QString& type ) |
266 | { | 260 | { |
267 | return (T *)( mFactory->resource( type, 0, mImpl->manageSyncable() ) ); | 261 | return (T *)( mFactory->resource( type, 0 ) ); |
268 | } | 262 | } |
269 | 263 | ||
270 | /** | 264 | /** |
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 | |||
@@ -41,8 +41,8 @@ $Id$ | |||
41 | 41 | ||
42 | using namespace KRES; | 42 | using namespace KRES; |
43 | 43 | ||
44 | ManagerImpl::ManagerImpl( const QString &family, bool syncable ) | 44 | ManagerImpl::ManagerImpl( const QString &family ) |
45 | : mFamily( family ), mSyncable(syncable), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), | 45 | : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), |
46 | mFactory( 0 ) | 46 | mFactory( 0 ) |
47 | 47 | ||
48 | { | 48 | { |
@@ -268,7 +268,7 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier, | |||
268 | #endif | 268 | #endif |
269 | QString type = mConfig->readEntry( "ResourceType" ); | 269 | QString type = mConfig->readEntry( "ResourceType" ); |
270 | QString name = mConfig->readEntry( "ResourceName" ); | 270 | QString name = mConfig->readEntry( "ResourceName" ); |
271 | Resource *resource = mFactory->resource( type, mConfig, mSyncable ); | 271 | Resource *resource = mFactory->resource( type, mConfig ); |
272 | if ( !resource ) { | 272 | if ( !resource ) { |
273 | qDebug("Failed to create resource with id %s ",identifier.latin1() ); | 273 | qDebug("Failed to create resource with id %s ",identifier.latin1() ); |
274 | return 0; | 274 | return 0; |
@@ -364,11 +364,4 @@ Resource* ManagerImpl::getResource( const QString& identifier ) | |||
364 | return 0; | 364 | return 0; |
365 | } | 365 | } |
366 | 366 | ||
367 | /** | ||
368 | Return true, if the manager manages syncable resources. | ||
369 | */ | ||
370 | bool ManagerImpl::manageSyncable() const | ||
371 | { | ||
372 | return mSyncable; | ||
373 | } | ||
374 | 367 | ||
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 | |||
@@ -65,7 +65,7 @@ class ManagerImpl : public QObject | |||
65 | { | 65 | { |
66 | Q_OBJECT | 66 | Q_OBJECT |
67 | public: | 67 | public: |
68 | ManagerImpl( const QString &family, bool syncable); | 68 | ManagerImpl( const QString &family); |
69 | ~ManagerImpl(); | 69 | ~ManagerImpl(); |
70 | 70 | ||
71 | void readConfig( KConfig * ); | 71 | void readConfig( KConfig * ); |
@@ -90,11 +90,6 @@ class ManagerImpl : public QObject | |||
90 | 90 | ||
91 | void setListener( ManagerImplListener *listener ); | 91 | void setListener( ManagerImplListener *listener ); |
92 | 92 | ||
93 | /** | ||
94 | Return true, if the manager manages syncable resources. | ||
95 | */ | ||
96 | bool manageSyncable() const; | ||
97 | |||
98 | public slots: | 93 | public slots: |
99 | void resourceChanged( Resource *resource ); | 94 | void resourceChanged( Resource *resource ); |
100 | 95 | ||
@@ -112,7 +107,6 @@ class ManagerImpl : public QObject | |||
112 | Resource *getResource( const QString& identifier ); | 107 | Resource *getResource( const QString& identifier ); |
113 | 108 | ||
114 | QString mFamily; | 109 | QString mFamily; |
115 | bool mSyncable; | ||
116 | KConfig *mConfig; | 110 | KConfig *mConfig; |
117 | KConfig *mStdConfig; | 111 | KConfig *mStdConfig; |
118 | Resource *mStandard; | 112 | Resource *mStandard; |
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 | |||
@@ -198,6 +198,7 @@ void Resource::dump() const | |||
198 | kdDebug(5650) << " Type: " << d->mType << endl; | 198 | kdDebug(5650) << " Type: " << d->mType << endl; |
199 | kdDebug(5650) << " OpenCount: " << d->mOpenCount << endl; | 199 | kdDebug(5650) << " OpenCount: " << d->mOpenCount << endl; |
200 | kdDebug(5650) << " ReadOnly: " << ( d->mReadOnly ? "yes" : "no" ) << endl; | 200 | kdDebug(5650) << " ReadOnly: " << ( d->mReadOnly ? "yes" : "no" ) << endl; |
201 | kdDebug(5650) << " IncludeInSync: " << ( d->mIncludeInSync ? "yes" : "no" ) << endl; | ||
201 | kdDebug(5650) << " Active: " << ( d->mActive ? "yes" : "no" ) << endl; | 202 | kdDebug(5650) << " Active: " << ( d->mActive ? "yes" : "no" ) << endl; |
202 | kdDebug(5650) << " IsOpen: " << ( d->mIsOpen ? "yes" : "no" ) << endl; | 203 | kdDebug(5650) << " IsOpen: " << ( d->mIsOpen ? "yes" : "no" ) << endl; |
203 | } | 204 | } |
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 | |||
@@ -40,7 +40,6 @@ class KConfig; | |||
40 | namespace KRES { | 40 | namespace KRES { |
41 | 41 | ||
42 | class ConfigWidget; | 42 | class ConfigWidget; |
43 | class SyncWidgetContainer; | ||
44 | 43 | ||
45 | /** | 44 | /** |
46 | * @internal | 45 | * @internal |
@@ -232,7 +231,7 @@ link_DATA= resourceexample.desktop | |||
232 | * A @ref Resource is a ... | 231 | * A @ref Resource is a ... |
233 | * | 232 | * |
234 | * A subclass should reimplement at least the constructor and the | 233 | * A subclass should reimplement at least the constructor and the |
235 | * @ref writeConfig method. | 234 | k * @ref writeConfig method. |
236 | * | 235 | * |
237 | */ | 236 | */ |
238 | class Resource : public QObject | 237 | class Resource : public QObject |
@@ -323,11 +322,6 @@ class Resource : public QObject | |||
323 | */ | 322 | */ |
324 | virtual QString resourceName() const; | 323 | virtual QString resourceName() const; |
325 | 324 | ||
326 | |||
327 | |||
328 | virtual bool isSyncable() const = 0; | ||
329 | |||
330 | |||
331 | /** | 325 | /** |
332 | Sets, if the resource is active. | 326 | Sets, if the resource is active. |
333 | */ | 327 | */ |
@@ -376,12 +370,10 @@ class Resource : public QObject | |||
376 | class PluginFactoryBase : public KLibFactory | 370 | class PluginFactoryBase : public KLibFactory |
377 | { | 371 | { |
378 | public: | 372 | public: |
379 | virtual Resource *resource( const KConfig *config, bool syncable ) = 0; | 373 | virtual Resource *resource( const KConfig *config) = 0; |
380 | 374 | ||
381 | virtual ConfigWidget *configWidget( QWidget *parent ) = 0; | 375 | virtual ConfigWidget *configWidget( QWidget *parent ) = 0; |
382 | 376 | ||
383 | virtual SyncWidgetContainer *syncWidgetContainer() = 0; | ||
384 | |||
385 | protected: | 377 | protected: |
386 | virtual QObject* createObject( QObject*, const char*, const char*, | 378 | virtual QObject* createObject( QObject*, const char*, const char*, |
387 | const QStringList & ) | 379 | const QStringList & ) |
@@ -390,25 +382,19 @@ class PluginFactoryBase : public KLibFactory | |||
390 | } | 382 | } |
391 | }; | 383 | }; |
392 | 384 | ||
393 | template<class TR,class TC, class TS> | 385 | template<class TR,class TC> |
394 | class PluginFactory : public PluginFactoryBase | 386 | class PluginFactory : public PluginFactoryBase |
395 | { | 387 | { |
396 | public: | 388 | public: |
397 | Resource *resource( const KConfig *config, bool syncable ) | 389 | Resource *resource( const KConfig *config) |
398 | { | 390 | { |
399 | return new TR( config, syncable ); | 391 | return new TR( config ); |
400 | } | 392 | } |
401 | 393 | ||
402 | ConfigWidget *configWidget( QWidget *parent ) | 394 | ConfigWidget *configWidget( QWidget *parent ) |
403 | { | 395 | { |
404 | return new TC( parent ); | 396 | return new TC( parent ); |
405 | } | 397 | } |
406 | |||
407 | SyncWidgetContainer *syncWidgetContainer() | ||
408 | { | ||
409 | return new TS(); | ||
410 | } | ||
411 | |||
412 | }; | 398 | }; |
413 | 399 | ||
414 | 400 | ||
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro index df914ce..071ceb3 100644 --- a/microkde/microkdeE.pro +++ b/microkde/microkdeE.pro | |||
@@ -89,7 +89,6 @@ osmartpointer.h \ | |||
89 | kresources/configwidget.h \ | 89 | kresources/configwidget.h \ |
90 | kresources/configdialog.h \ | 90 | kresources/configdialog.h \ |
91 | kresources/kcmkresources.h \ | 91 | kresources/kcmkresources.h \ |
92 | kresources/syncwidget.h \ | ||
93 | kdecore/kmdcodec.h \ | 92 | kdecore/kmdcodec.h \ |
94 | kdecore/kconfigbase.h \ | 93 | kdecore/kconfigbase.h \ |
95 | kdecore/klocale.h \ | 94 | kdecore/klocale.h \ |
@@ -173,7 +172,6 @@ oprocess.cpp \ | |||
173 | kresources/managerimpl.cpp \ | 172 | kresources/managerimpl.cpp \ |
174 | kresources/resource.cpp \ | 173 | kresources/resource.cpp \ |
175 | kresources/selectdialog.cpp \ | 174 | kresources/selectdialog.cpp \ |
176 | kresources/syncwidget.cpp \ | ||
177 | kutils/kcmultidialog.cpp \ | 175 | kutils/kcmultidialog.cpp \ |
178 | kidmanager.cpp | 176 | kidmanager.cpp |
179 | 177 | ||