author | zautrix <zautrix> | 2005-07-06 09:52:24 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-06 09:52:24 (UTC) |
commit | 3b77a857e17e04e47d22ba6017dd723ed922e3fc (patch) (unidiff) | |
tree | 0ce40d3e6480ae4016e3f2e464c3180be96bdd27 /korganizer | |
parent | 4ac63cce98fabb59a47970baa2906b2fe8d0f2b0 (diff) | |
download | kdepimpi-3b77a857e17e04e47d22ba6017dd723ed922e3fc.zip kdepimpi-3b77a857e17e04e47d22ba6017dd723ed922e3fc.tar.gz kdepimpi-3b77a857e17e04e47d22ba6017dd723ed922e3fc.tar.bz2 |
fixx
-rw-r--r-- | korganizer/koprefs.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index f1f1442..138028d 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -496,96 +496,98 @@ void KOPrefs::deleteCalendar( int num ) | |||
496 | { | 496 | { |
497 | KopiCalendarFile * kkf = mCalendars.first(); | 497 | KopiCalendarFile * kkf = mCalendars.first(); |
498 | while ( kkf ) { | 498 | while ( kkf ) { |
499 | if ( kkf->mCalNumber == num ) { | 499 | if ( kkf->mCalNumber == num ) { |
500 | qDebug("KOPrefs::deleteCalendar %d ", num ); | 500 | qDebug("KOPrefs::deleteCalendar %d ", num ); |
501 | mCalendars.remove( kkf ); | 501 | mCalendars.remove( kkf ); |
502 | delete kkf; | 502 | delete kkf; |
503 | return; | 503 | return; |
504 | } | 504 | } |
505 | kkf = mCalendars.next(); | 505 | kkf = mCalendars.next(); |
506 | } | 506 | } |
507 | } | 507 | } |
508 | int KOPrefs::getCalendarID( const QString & name ) | 508 | int KOPrefs::getCalendarID( const QString & name ) |
509 | { | 509 | { |
510 | KopiCalendarFile * kkf = mCalendars.first(); | 510 | KopiCalendarFile * kkf = mCalendars.first(); |
511 | while ( kkf ) { | 511 | while ( kkf ) { |
512 | if ( name == kkf->mName) | 512 | if ( name == kkf->mName) |
513 | return kkf->mCalNumber; | 513 | return kkf->mCalNumber; |
514 | kkf = mCalendars.next(); | 514 | kkf = mCalendars.next(); |
515 | } | 515 | } |
516 | return 1; | 516 | return 1; |
517 | } | 517 | } |
518 | QString KOPrefs::calName( int calNum) const | 518 | QString KOPrefs::calName( int calNum) const |
519 | { | 519 | { |
520 | return (mDefCalColors[calNum-1])->mName; | 520 | return (mDefCalColors[calNum-1])->mName; |
521 | } | 521 | } |
522 | QColor KOPrefs::defaultColor( int calNum ) const | 522 | QColor KOPrefs::defaultColor( int calNum ) const |
523 | { | 523 | { |
524 | if ( calNum == 1 ) return mEventColor; | 524 | if ( calNum == 1 ) return mEventColor; |
525 | return (mDefCalColors[calNum-1])->mDefaultColor; | 525 | return (mDefCalColors[calNum-1])->mDefaultColor; |
526 | } | 526 | } |
527 | void KOPrefs::usrWriteConfig() | 527 | void KOPrefs::usrWriteConfig() |
528 | { | 528 | { |
529 | config()->setGroup("General"); | 529 | config()->setGroup("General"); |
530 | config()->writeEntry("Custom Categories",mCustomCategories); | 530 | config()->writeEntry("Custom Categories",mCustomCategories); |
531 | 531 | ||
532 | config()->setGroup("Personal Settings"); | 532 | config()->setGroup("Personal Settings"); |
533 | config()->writeEntry("user_name",mName); | 533 | config()->writeEntry("user_name",mName); |
534 | config()->writeEntry("user_email",mEmail); | 534 | config()->writeEntry("user_email",mEmail); |
535 | 535 | ||
536 | config()->setGroup("Category Colors"); | 536 | config()->setGroup("Category Colors"); |
537 | QDictIterator<QColor> it(mCategoryColors); | 537 | QDictIterator<QColor> it(mCategoryColors); |
538 | while (it.current()) { | 538 | while (it.current()) { |
539 | config()->writeEntry(it.currentKey(),*(it.current())); | 539 | config()->writeEntry(it.currentKey(),*(it.current())); |
540 | ++it; | 540 | ++it; |
541 | } | 541 | } |
542 | KConfig fc (locateLocal("config","kopicalendarrc")); | 542 | KConfig fc (locateLocal("config","kopicalendarrc")); |
543 | fc.setGroup("CC"); | 543 | fc.setGroup("CC"); |
544 | fc.deleteGroup( "CC"); | ||
545 | fc.setGroup("CC"); | ||
544 | fc.writeEntry("NumberCalendars",mCalendars.count()); | 546 | fc.writeEntry("NumberCalendars",mCalendars.count()); |
545 | int numCal = 1; | 547 | int numCal = 1; |
546 | int writeCal = 0; | 548 | int writeCal = 0; |
547 | while ( numCal < mNextAvailableCalendar ) { | 549 | while ( numCal < mNextAvailableCalendar ) { |
548 | KopiCalendarFile * kkf = mCalendars.first(); | 550 | KopiCalendarFile * kkf = mCalendars.first(); |
549 | while ( kkf ) { | 551 | while ( kkf ) { |
550 | //qDebug("cal num %d %d ", kkf->mCalNumber, numCal); | 552 | //qDebug("cal num %d %d ", kkf->mCalNumber, numCal); |
551 | if ( kkf->mCalNumber == numCal ) { | 553 | if ( kkf->mCalNumber == numCal ) { |
552 | ++writeCal; | 554 | ++writeCal; |
553 | //qDebug("Write calendar %d %d ", numCal , writeCal); | 555 | //qDebug("Write calendar %d %d ", numCal , writeCal); |
554 | QString prefix = "Cal_" + QString::number( writeCal ); | 556 | QString prefix = "Cal_" + QString::number( writeCal ); |
555 | fc.writeEntry( prefix+"_isStandard", kkf->isStandard ); | 557 | fc.writeEntry( prefix+"_isStandard", kkf->isStandard ); |
556 | fc.writeEntry( prefix+"_isEnabled", kkf->isEnabled ); | 558 | fc.writeEntry( prefix+"_isEnabled", kkf->isEnabled ); |
557 | fc.writeEntry( prefix+"_isAlarmEnabled", kkf->isAlarmEnabled ); | 559 | fc.writeEntry( prefix+"_isAlarmEnabled", kkf->isAlarmEnabled ); |
558 | fc.writeEntry( prefix+"_isReadOnly", kkf->isReadOnly ); | 560 | fc.writeEntry( prefix+"_isReadOnly", kkf->isReadOnly ); |
559 | fc.writeEntry( prefix+"_isRelative", kkf->isRelative ); | 561 | fc.writeEntry( prefix+"_isRelative", kkf->isRelative ); |
560 | fc.writeEntry( prefix+"_Name", kkf->mName); | 562 | fc.writeEntry( prefix+"_Name", kkf->mName); |
561 | fc.writeEntry( prefix+"_FileName", kkf->mFileName); | 563 | fc.writeEntry( prefix+"_FileName", kkf->mFileName); |
562 | fc.writeEntry( prefix+"_SavedFileName", kkf->mSavedFileName); | 564 | fc.writeEntry( prefix+"_SavedFileName", kkf->mSavedFileName); |
563 | fc.writeEntry( prefix+"_Color",kkf->mDefaultColor); | 565 | fc.writeEntry( prefix+"_Color",kkf->mDefaultColor); |
564 | } | 566 | } |
565 | kkf = mCalendars.next(); | 567 | kkf = mCalendars.next(); |
566 | } | 568 | } |
567 | ++numCal; | 569 | ++numCal; |
568 | } | 570 | } |
569 | fc.sync(); | 571 | fc.sync(); |
570 | KPimPrefs::usrWriteConfig(); | 572 | KPimPrefs::usrWriteConfig(); |
571 | } | 573 | } |
572 | 574 | ||
573 | void KOPrefs::setCategoryColor(QString cat,const QColor & color) | 575 | void KOPrefs::setCategoryColor(QString cat,const QColor & color) |
574 | { | 576 | { |
575 | mCategoryColors.replace(cat,new QColor(color)); | 577 | mCategoryColors.replace(cat,new QColor(color)); |
576 | } | 578 | } |
577 | 579 | ||
578 | QColor *KOPrefs::categoryColor(QString cat) | 580 | QColor *KOPrefs::categoryColor(QString cat) |
579 | { | 581 | { |
580 | QColor *color = 0; | 582 | QColor *color = 0; |
581 | 583 | ||
582 | if (!cat.isEmpty()) color = mCategoryColors[cat]; | 584 | if (!cat.isEmpty()) color = mCategoryColors[cat]; |
583 | 585 | ||
584 | if (color) return color; | 586 | if (color) return color; |
585 | else return &mDefaultCategoryColor; | 587 | else return &mDefaultCategoryColor; |
586 | } | 588 | } |
587 | 589 | ||
588 | void KOPrefs::setFullName(const QString &name) | 590 | void KOPrefs::setFullName(const QString &name) |
589 | { | 591 | { |
590 | mName = name; | 592 | mName = name; |
591 | } | 593 | } |