author | ulf69 <ulf69> | 2004-08-04 22:45:22 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-04 22:45:22 (UTC) |
commit | c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852 (patch) (unidiff) | |
tree | dc59744a6d59ba241e793ce051da485d0bf16d06 /microkde/kresources/configpage.cpp | |
parent | b83866e08ddcc5cb2734801977927f48b53a2e1c (diff) | |
download | kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.zip kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.tar.gz kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.tar.bz2 |
final changes for addressbook sync config dialog
Diffstat (limited to 'microkde/kresources/configpage.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | microkde/kresources/configpage.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp index 2fe021d..1a3a22c 100644 --- a/microkde/kresources/configpage.cpp +++ b/microkde/kresources/configpage.cpp | |||
@@ -205,6 +205,8 @@ void ConfigPage::load() | |||
205 | info.mConfig = new KConfig( locateLocal( "config", "kabcrc" ) ); | 205 | info.mConfig = new KConfig( locateLocal( "config", "kabcrc" ) ); |
206 | } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) { | 206 | } else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) { |
207 | info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) ); | 207 | info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) ); |
208 | } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) { | ||
209 | info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) ); | ||
208 | } else { | 210 | } else { |
209 | QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) ); | 211 | QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) ); |
210 | info.mConfig = new KConfig( configFile ); | 212 | info.mConfig = new KConfig( configFile ); |
@@ -311,13 +313,13 @@ void ConfigPage::slotAdd() | |||
311 | if (mFamily == syncfamily) | 313 | if (mFamily == syncfamily) |
312 | { | 314 | { |
313 | desc = QInputDialog::getItem( i18n( "Sync Configuration" ), | 315 | desc = QInputDialog::getItem( i18n( "Sync Configuration" ), |
314 | i18n( "Please select resource type for new sync profile:" ), descs, 0, | 316 | i18n( "Select resource type for the new sync profile:" ), descs, 0, |
315 | false, &ok, this ); | 317 | false, &ok, this ); |
316 | } | 318 | } |
317 | else | 319 | else |
318 | { | 320 | { |
319 | desc = QInputDialog::getItem( i18n( "Resource Configuration" ), | 321 | desc = QInputDialog::getItem( i18n( "Resource Configuration" ), |
320 | i18n( "Please select type of the new resource:" ), descs, 0, | 322 | i18n( "Select type of the new resource:" ), descs, 0, |
321 | false, &ok, this ); | 323 | false, &ok, this ); |
322 | } | 324 | } |
323 | 325 | ||
@@ -334,7 +336,14 @@ void ConfigPage::slotAdd() | |||
334 | return; | 336 | return; |
335 | } | 337 | } |
336 | 338 | ||
337 | resource->setResourceName( type + "-resource" ); | 339 | if (mFamily == syncfamily) |
340 | { | ||
341 | resource->setResourceName( type + "-syncprofile" ); | ||
342 | } | ||
343 | else | ||
344 | { | ||
345 | resource->setResourceName( type + "-resource" ); | ||
346 | } | ||
338 | 347 | ||
339 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); | 348 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); |
340 | 349 | ||