-rw-r--r-- | korganizer/koprefs.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 9147af3..5078c57 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -439,48 +439,49 @@ void KOPrefs::usrReadConfig() | |||
439 | } | 439 | } |
440 | 440 | ||
441 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); | 441 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); |
442 | 442 | ||
443 | config()->setGroup("Personal Settings"); | 443 | config()->setGroup("Personal Settings"); |
444 | mName = config()->readEntry("user_name",""); | 444 | mName = config()->readEntry("user_name",""); |
445 | mEmail = config()->readEntry("user_email",""); | 445 | mEmail = config()->readEntry("user_email",""); |
446 | fillMailDefaults(); | 446 | fillMailDefaults(); |
447 | 447 | ||
448 | config()->setGroup("Category Colors"); | 448 | config()->setGroup("Category Colors"); |
449 | QStringList::Iterator it; | 449 | QStringList::Iterator it; |
450 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 450 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
451 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); | 451 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); |
452 | 452 | ||
453 | } | 453 | } |
454 | KConfig fc (locateLocal("config","kopicalendarrc")); | 454 | KConfig fc (locateLocal("config","kopicalendarrc")); |
455 | fc.setGroup("CC"); | 455 | fc.setGroup("CC"); |
456 | int numCals = fc.readNumEntry("NumberCalendars",0 ); | 456 | int numCals = fc.readNumEntry("NumberCalendars",0 ); |
457 | mNextAvailableCalendar = 1; | 457 | mNextAvailableCalendar = 1; |
458 | if ( numCals == 0 ) { | 458 | if ( numCals == 0 ) { |
459 | KopiCalendarFile *kkf = getNewCalendar(); | 459 | KopiCalendarFile *kkf = getNewCalendar(); |
460 | kkf->isStandard = true; | 460 | kkf->isStandard = true; |
461 | kkf->mName = i18n("Standard"); | 461 | kkf->mName = i18n("Standard"); |
462 | kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) ); | 462 | kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) ); |
463 | kkf->isReadOnly = false; | ||
463 | } | 464 | } |
464 | while ( mNextAvailableCalendar <= numCals ) { | 465 | while ( mNextAvailableCalendar <= numCals ) { |
465 | //qDebug("Read cal #%d ", mNextAvailableCalendar ); | 466 | //qDebug("Read cal #%d ", mNextAvailableCalendar ); |
466 | QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); | 467 | QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); |
467 | KopiCalendarFile *kkf = getNewCalendar(); | 468 | KopiCalendarFile *kkf = getNewCalendar(); |
468 | kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false ); | 469 | kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false ); |
469 | kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true); | 470 | kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true); |
470 | kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false ); | 471 | kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false ); |
471 | kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true); | 472 | kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true); |
472 | kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false); | 473 | kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false); |
473 | kkf->mName = fc.readEntry( prefix+"_Name", "Calendar"); | 474 | kkf->mName = fc.readEntry( prefix+"_Name", "Calendar"); |
474 | kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) ); | 475 | kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) ); |
475 | kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) ); | 476 | kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) ); |
476 | kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor); | 477 | kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor); |
477 | if ( kkf->mCalNumber == 1 ) { | 478 | if ( kkf->mCalNumber == 1 ) { |
478 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); | 479 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); |
479 | } | 480 | } |
480 | //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() ); | 481 | //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() ); |
481 | if ( kkf->mName == i18n("Birthdays") ) { | 482 | if ( kkf->mName == i18n("Birthdays") ) { |
482 | kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); | 483 | kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); |
483 | } | 484 | } |
484 | if ( kkf->isRelative ) | 485 | if ( kkf->isRelative ) |
485 | kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName ); | 486 | kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName ); |
486 | } | 487 | } |