author | ulf69 <ulf69> | 2004-10-13 21:27:10 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-10-13 21:27:10 (UTC) |
commit | 737183a5abd7d7b02048e8a939bafd0a8e803918 (patch) (unidiff) | |
tree | ddacf864a06a6669911b1d48862e564399eeb33b /microkde/kresources/configpage.cpp | |
parent | 7bb6c5f55d29ad4632b1f5c7361eee4c0d8b7cb0 (diff) | |
download | kdepimpi-737183a5abd7d7b02048e8a939bafd0a8e803918.zip kdepimpi-737183a5abd7d7b02048e8a939bafd0a8e803918.tar.gz kdepimpi-737183a5abd7d7b02048e8a939bafd0a8e803918.tar.bz2 |
removal of syncresources
Diffstat (limited to 'microkde/kresources/configpage.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | microkde/kresources/configpage.cpp | 29 |
1 files changed, 4 insertions, 25 deletions
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 | ||