-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 | |||
@@ -421,71 +421,74 @@ void KOPrefs::usrReadConfig() | |||
421 | } | 421 | } |
422 | if (mTodoSummaryUser.isEmpty()) { | 422 | if (mTodoSummaryUser.isEmpty()) { |
423 | mTodoSummaryUser = getDefaultList() ; | 423 | mTodoSummaryUser = getDefaultList() ; |
424 | } | 424 | } |
425 | 425 | ||
426 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); | 426 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); |
427 | 427 | ||
428 | config()->setGroup("Personal Settings"); | 428 | config()->setGroup("Personal Settings"); |
429 | mName = config()->readEntry("user_name",""); | 429 | mName = config()->readEntry("user_name",""); |
430 | mEmail = config()->readEntry("user_email",""); | 430 | mEmail = config()->readEntry("user_email",""); |
431 | fillMailDefaults(); | 431 | fillMailDefaults(); |
432 | 432 | ||
433 | config()->setGroup("Category Colors"); | 433 | config()->setGroup("Category Colors"); |
434 | QStringList::Iterator it; | 434 | QStringList::Iterator it; |
435 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 435 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
436 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); | 436 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); |
437 | 437 | ||
438 | } | 438 | } |
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(); |
452 | kkf->isStandard = config()->readBoolEntry( prefix+"_isStandard", false ); | 452 | kkf->isStandard = config()->readBoolEntry( prefix+"_isStandard", false ); |
453 | kkf->isEnabled = config()->readBoolEntry( prefix+"_isEnabled", true); | 453 | kkf->isEnabled = config()->readBoolEntry( prefix+"_isEnabled", true); |
454 | kkf->isAlarmEnabled = config()->readBoolEntry( prefix+"_isAlarmEnabled", true); | 454 | kkf->isAlarmEnabled = config()->readBoolEntry( prefix+"_isAlarmEnabled", true); |
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 ); |
474 | mDefCalColors[mNextAvailableCalendar-1] = kkf; | 477 | mDefCalColors[mNextAvailableCalendar-1] = kkf; |
475 | ++mNextAvailableCalendar; | 478 | ++mNextAvailableCalendar; |
476 | kkf->mDefaultColor = mEventColor; | 479 | kkf->mDefaultColor = mEventColor; |
477 | kkf->mName = i18n("New Calendar"); | 480 | kkf->mName = i18n("New Calendar"); |
478 | mCalendars.append( kkf ); | 481 | mCalendars.append( kkf ); |
479 | return kkf; | 482 | return kkf; |
480 | } | 483 | } |
481 | void KOPrefs::deleteCalendar( int num ) | 484 | void KOPrefs::deleteCalendar( int num ) |
482 | { | 485 | { |
483 | KopiCalendarFile * kkf = mCalendars.first(); | 486 | KopiCalendarFile * kkf = mCalendars.first(); |
484 | while ( kkf ) { | 487 | while ( kkf ) { |
485 | if ( kkf->mCalNumber == num ) { | 488 | if ( kkf->mCalNumber == num ) { |
486 | qDebug("KOPrefs::deleteCalendar %d ", num ); | 489 | qDebug("KOPrefs::deleteCalendar %d ", num ); |
487 | mCalendars.remove( kkf ); | 490 | mCalendars.remove( kkf ); |
488 | delete kkf; | 491 | delete kkf; |
489 | return; | 492 | return; |
490 | } | 493 | } |
491 | kkf = mCalendars.next(); | 494 | kkf = mCalendars.next(); |