-rw-r--r-- | korganizer/koprefs.cpp | 65 |
1 files changed, 38 insertions, 27 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 9366c11..8f37793 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -336,6 +336,14 @@ void KOPrefs::setTimeZoneIdDefault() | |||
336 | ; | 336 | ; |
337 | } | 337 | } |
338 | 338 | ||
339 | void KOPrefs::setAllDefaults() | ||
340 | { | ||
341 | setCategoryDefaults(); | ||
342 | mEventSummaryUser = getDefaultList() ; | ||
343 | mTodoSummaryUser = getDefaultList() ; | ||
344 | mLocationDefaults = getLocationDefaultList(); | ||
345 | } | ||
346 | |||
339 | void KOPrefs::setCategoryDefaults() | 347 | void KOPrefs::setCategoryDefaults() |
340 | { | 348 | { |
341 | mCustomCategories.clear(); | 349 | mCustomCategories.clear(); |
@@ -346,7 +354,18 @@ void KOPrefs::setCategoryDefaults() | |||
346 | setCategoryColor(*it,mDefaultCategoryColor); | 354 | setCategoryColor(*it,mDefaultCategoryColor); |
347 | } | 355 | } |
348 | } | 356 | } |
357 | QStringList KOPrefs::getLocationDefaultList() | ||
358 | { | ||
359 | QStringList retval ; | ||
360 | retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") | ||
361 | << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") | ||
362 | << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") | ||
363 | << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; | ||
364 | // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") | ||
349 | 365 | ||
366 | retval.sort(); | ||
367 | return retval; | ||
368 | } | ||
350 | QStringList KOPrefs::getDefaultList() | 369 | QStringList KOPrefs::getDefaultList() |
351 | { | 370 | { |
352 | QStringList retval ; | 371 | QStringList retval ; |
@@ -359,7 +378,7 @@ QStringList KOPrefs::getDefaultList() | |||
359 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") | 378 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") |
360 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; | 379 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; |
361 | retval.sort(); | 380 | retval.sort(); |
362 | //qDebug("cat %s ", retval.join("-").latin1()); | 381 | qDebug("cat %s ", retval.join("-").latin1()); |
363 | return retval; | 382 | return retval; |
364 | } | 383 | } |
365 | 384 | ||
@@ -367,44 +386,36 @@ void KOPrefs::usrReadConfig() | |||
367 | { | 386 | { |
368 | config()->setGroup("General"); | 387 | config()->setGroup("General"); |
369 | 388 | ||
389 | //qDebug("KOPrefs::usrReadConfig() "); | ||
370 | mCustomCategories = config()->readListEntry("Custom Categories"); | 390 | mCustomCategories = config()->readListEntry("Custom Categories"); |
371 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) { | ||
372 | mLocationDefaults.clear(); | ||
373 | mEventSummaryUser.clear(); | ||
374 | mTodoSummaryUser.clear(); | ||
375 | } | ||
376 | mOldLoadedLanguage = mOldLanguage ; | 391 | mOldLoadedLanguage = mOldLanguage ; |
377 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | 392 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; |
378 | if (mLocationDefaults.isEmpty()) { | 393 | if (mLocationDefaults.isEmpty()) { |
379 | mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") | 394 | mLocationDefaults = getLocationDefaultList(); |
380 | << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") | ||
381 | << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; | ||
382 | // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") | ||
383 | mLocationDefaults.sort(); | ||
384 | } | 395 | } |
385 | 396 | ||
386 | if (mEventSummaryUser.isEmpty()) { | 397 | if (mEventSummaryUser.isEmpty()) { |
387 | mEventSummaryUser = getDefaultList() ; | 398 | mEventSummaryUser = getDefaultList() ; |
388 | } | 399 | } |
389 | if (mTodoSummaryUser.isEmpty()) { | 400 | if (mTodoSummaryUser.isEmpty()) { |
390 | mTodoSummaryUser = getDefaultList() ; | 401 | mTodoSummaryUser = getDefaultList() ; |
391 | } | 402 | } |
392 | 403 | ||
393 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); | 404 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); |
394 | 405 | ||
395 | config()->setGroup("Personal Settings"); | 406 | config()->setGroup("Personal Settings"); |
396 | mName = config()->readEntry("user_name",""); | 407 | mName = config()->readEntry("user_name",""); |
397 | mEmail = config()->readEntry("user_email",""); | 408 | mEmail = config()->readEntry("user_email",""); |
398 | fillMailDefaults(); | 409 | fillMailDefaults(); |
399 | 410 | ||
400 | config()->setGroup("Category Colors"); | 411 | config()->setGroup("Category Colors"); |
401 | QStringList::Iterator it; | 412 | QStringList::Iterator it; |
402 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 413 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
403 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); | 414 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); |
404 | 415 | ||
405 | } | 416 | } |
406 | 417 | ||
407 | KPimPrefs::usrReadConfig(); | 418 | KPimPrefs::usrReadConfig(); |
408 | } | 419 | } |
409 | 420 | ||
410 | 421 | ||