-rw-r--r-- | korganizer/koprefs.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 179f586..bc6aae4 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -439,13 +439,13 @@ void KOPrefs::usrReadConfig() | |||
439 | config()->setGroup("CCal"); | 439 | config()->setGroup("CCal"); |
440 | int numCals = config()->readNumEntry("NumberCalendars",0 ); | 440 | int numCals = config()->readNumEntry("NumberCalendars",0 ); |
441 | mNextAvailableCalendar = 1; | 441 | mNextAvailableCalendar = 1; |
442 | if ( numCals == 0 ) { | 442 | if ( numCals == 0 ) { |
443 | KopiCalendarFile *kkf = getNewCalendar(); | 443 | KopiCalendarFile *kkf = getNewCalendar(); |
444 | kkf->isStandard = true; | 444 | kkf->isStandard = true; |
445 | kkf->mName = i18n("Standard Calendar"); | 445 | kkf->mName = i18n("Standard"); |
446 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); | 446 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); |
447 | } | 447 | } |
448 | while ( mNextAvailableCalendar <= numCals ) { | 448 | while ( mNextAvailableCalendar <= numCals ) { |
449 | qDebug("Read cal #%d ", mNextAvailableCalendar ); | 449 | qDebug("Read cal #%d ", mNextAvailableCalendar ); |
450 | QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); | 450 | QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); |
451 | KopiCalendarFile *kkf = getNewCalendar(); | 451 | KopiCalendarFile *kkf = getNewCalendar(); |
@@ -455,19 +455,22 @@ void KOPrefs::usrReadConfig() | |||
455 | kkf->isReadOnly = config()->readBoolEntry( prefix+"_isReadOnly", false); | 455 | kkf->isReadOnly = config()->readBoolEntry( prefix+"_isReadOnly", false); |
456 | kkf->mName = config()->readEntry( prefix+"_Name", "Calendar"); | 456 | kkf->mName = config()->readEntry( prefix+"_Name", "Calendar"); |
457 | kkf->mFileName = config()->readEntry( prefix+"_FileName", kkf->mFileName); | 457 | kkf->mFileName = config()->readEntry( prefix+"_FileName", kkf->mFileName); |
458 | kkf->mDefaultColor = config()->readColorEntry( prefix+"_Color",&mEventColor); | 458 | kkf->mDefaultColor = config()->readColorEntry( prefix+"_Color",&mEventColor); |
459 | if ( kkf->mCalNumber == 1 ) { | 459 | if ( kkf->mCalNumber == 1 ) { |
460 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); | 460 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); |
461 | //kkf->mName = i18n("Standard Calendar"); | ||
462 | } | 461 | } |
463 | } | 462 | } |
464 | 463 | ||
465 | KPimPrefs::usrReadConfig(); | 464 | KPimPrefs::usrReadConfig(); |
466 | } | 465 | } |
467 | 466 | ||
467 | KopiCalendarFile * KOPrefs::getCalendar( int num ) | ||
468 | { | ||
469 | return mDefCalColors[num-1]; | ||
470 | } | ||
468 | 471 | ||
469 | KopiCalendarFile * KOPrefs::getNewCalendar() | 472 | KopiCalendarFile * KOPrefs::getNewCalendar() |
470 | { | 473 | { |
471 | KopiCalendarFile * kkf = new KopiCalendarFile(); | 474 | KopiCalendarFile * kkf = new KopiCalendarFile(); |
472 | kkf->mCalNumber = mNextAvailableCalendar; | 475 | kkf->mCalNumber = mNextAvailableCalendar; |
473 | mDefCalColors.resize( mNextAvailableCalendar ); | 476 | mDefCalColors.resize( mNextAvailableCalendar ); |