author | zautrix <zautrix> | 2005-08-17 20:40:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-17 20:40:41 (UTC) |
commit | 671857b232224314ad7720ad4bc037758a90fa4b (patch) (unidiff) | |
tree | 0dc33183b05febc146a0138e98a076b0cc2d0642 /korganizer/koprefs.cpp | |
parent | c49a7d17b98d59010e88305d8a66f8318b3d4aed (diff) | |
download | kdepimpi-671857b232224314ad7720ad4bc037758a90fa4b.zip kdepimpi-671857b232224314ad7720ad4bc037758a90fa4b.tar.gz kdepimpi-671857b232224314ad7720ad4bc037758a90fa4b.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/koprefs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index eb997f5..77f572c 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -404,120 +404,120 @@ QStringList KOPrefs::getDefaultList() | |||
404 | << i18n("PHB") << i18n("Phone Calls") << i18n("Shopping") | 404 | << i18n("PHB") << i18n("Phone Calls") << i18n("Shopping") |
405 | << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") | 405 | << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") |
406 | << i18n("Vacation") ; | 406 | << i18n("Vacation") ; |
407 | retval.sort(); | 407 | retval.sort(); |
408 | //qDebug("cat %s ", retval.join("-").latin1()); | 408 | //qDebug("cat %s ", retval.join("-").latin1()); |
409 | return retval; | 409 | return retval; |
410 | } | 410 | } |
411 | // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting") << i18n("Recurring") << i18n("Personal Travel") << i18n("Speach") << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<< i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent") << i18n("Cinema") | 411 | // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting") << i18n("Recurring") << i18n("Personal Travel") << i18n("Speach") << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<< i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent") << i18n("Cinema") |
412 | void KOPrefs::usrReadConfig() | 412 | void KOPrefs::usrReadConfig() |
413 | { | 413 | { |
414 | config()->setGroup("General"); | 414 | config()->setGroup("General"); |
415 | 415 | ||
416 | //qDebug("KOPrefs::usrReadConfig() "); | 416 | //qDebug("KOPrefs::usrReadConfig() "); |
417 | mCustomCategories = config()->readListEntry("Custom Categories"); | 417 | mCustomCategories = config()->readListEntry("Custom Categories"); |
418 | mOldLoadedLanguage = mOldLanguage ; | 418 | mOldLoadedLanguage = mOldLanguage ; |
419 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | 419 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; |
420 | if (mLocationDefaults.isEmpty()) { | 420 | if (mLocationDefaults.isEmpty()) { |
421 | mLocationDefaults = getLocationDefaultList(); | 421 | mLocationDefaults = getLocationDefaultList(); |
422 | } | 422 | } |
423 | 423 | ||
424 | if (mEventSummaryUser.isEmpty()) { | 424 | if (mEventSummaryUser.isEmpty()) { |
425 | mEventSummaryUser = getDefaultList() ; | 425 | mEventSummaryUser = getDefaultList() ; |
426 | } | 426 | } |
427 | if (mTodoSummaryUser.isEmpty()) { | 427 | if (mTodoSummaryUser.isEmpty()) { |
428 | mTodoSummaryUser = getDefaultList() ; | 428 | mTodoSummaryUser = getDefaultList() ; |
429 | } | 429 | } |
430 | 430 | ||
431 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); | 431 | if (mCustomCategories.isEmpty()) setCategoryDefaults(); |
432 | 432 | ||
433 | config()->setGroup("Personal Settings"); | 433 | config()->setGroup("Personal Settings"); |
434 | mName = config()->readEntry("user_name",""); | 434 | mName = config()->readEntry("user_name",""); |
435 | mEmail = config()->readEntry("user_email",""); | 435 | mEmail = config()->readEntry("user_email",""); |
436 | fillMailDefaults(); | 436 | fillMailDefaults(); |
437 | 437 | ||
438 | config()->setGroup("Category Colors"); | 438 | config()->setGroup("Category Colors"); |
439 | QStringList::Iterator it; | 439 | QStringList::Iterator it; |
440 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 440 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
441 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); | 441 | setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); |
442 | 442 | ||
443 | } | 443 | } |
444 | KConfig fc (locateLocal("config","kopicalendarrc")); | 444 | KConfig fc (locateLocal("config","kopicalendarrc")); |
445 | fc.setGroup("CC"); | 445 | fc.setGroup("CC"); |
446 | int numCals = fc.readNumEntry("NumberCalendars",0 ); | 446 | int numCals = fc.readNumEntry("NumberCalendars",0 ); |
447 | mNextAvailableCalendar = 1; | 447 | mNextAvailableCalendar = 1; |
448 | if ( numCals == 0 ) { | 448 | if ( numCals == 0 ) { |
449 | KopiCalendarFile *kkf = getNewCalendar(); | 449 | KopiCalendarFile *kkf = getNewCalendar(); |
450 | kkf->isStandard = true; | 450 | kkf->isStandard = true; |
451 | kkf->mName = i18n("Standard"); | 451 | kkf->mName = i18n("Standard"); |
452 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); | 452 | kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) ); |
453 | } | 453 | } |
454 | while ( mNextAvailableCalendar <= numCals ) { | 454 | while ( mNextAvailableCalendar <= numCals ) { |
455 | //qDebug("Read cal #%d ", mNextAvailableCalendar ); | 455 | //qDebug("Read cal #%d ", mNextAvailableCalendar ); |
456 | QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); | 456 | QString prefix = "Cal_" +QString::number( mNextAvailableCalendar ); |
457 | KopiCalendarFile *kkf = getNewCalendar(); | 457 | KopiCalendarFile *kkf = getNewCalendar(); |
458 | kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false ); | 458 | kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false ); |
459 | kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true); | 459 | kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true); |
460 | kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false ); | 460 | kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false ); |
461 | kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true); | 461 | kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true); |
462 | kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false); | 462 | kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false); |
463 | kkf->mName = fc.readEntry( prefix+"_Name", "Calendar"); | 463 | kkf->mName = fc.readEntry( prefix+"_Name", "Calendar"); |
464 | kkf->mFileName = fc.readEntry( prefix+"_FileName", kkf->mFileName); | 464 | kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) ); |
465 | kkf->mSavedFileName = fc.readEntry( prefix+"_SavedFileName", kkf->mFileName); | 465 | kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) ); |
466 | kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor); | 466 | kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor); |
467 | if ( kkf->mCalNumber == 1 ) { | 467 | if ( kkf->mCalNumber == 1 ) { |
468 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); | 468 | kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" ); |
469 | } | 469 | } |
470 | //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() ); | 470 | //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() ); |
471 | if ( kkf->mName == i18n("Birthdays") ) { | 471 | if ( kkf->mName == i18n("Birthdays") ) { |
472 | kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); | 472 | kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); |
473 | } | 473 | } |
474 | if ( kkf->isRelative ) | 474 | if ( kkf->isRelative ) |
475 | kkf->mFileName = KGlobalSettings::calendarDir() + kkf->mSavedFileName; | 475 | kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName ); |
476 | } | 476 | } |
477 | 477 | ||
478 | KPimPrefs::usrReadConfig(); | 478 | KPimPrefs::usrReadConfig(); |
479 | } | 479 | } |
480 | 480 | ||
481 | KopiCalendarFile * KOPrefs::getCalendar( int num ) | 481 | KopiCalendarFile * KOPrefs::getCalendar( int num ) |
482 | { | 482 | { |
483 | return mDefCalColors[num-1]; | 483 | return mDefCalColors[num-1]; |
484 | } | 484 | } |
485 | 485 | ||
486 | KopiCalendarFile * KOPrefs::getNewCalendar() | 486 | KopiCalendarFile * KOPrefs::getNewCalendar() |
487 | { | 487 | { |
488 | KopiCalendarFile * kkf = new KopiCalendarFile(); | 488 | KopiCalendarFile * kkf = new KopiCalendarFile(); |
489 | kkf->mCalNumber = mNextAvailableCalendar; | 489 | kkf->mCalNumber = mNextAvailableCalendar; |
490 | mDefCalColors.resize( mNextAvailableCalendar ); | 490 | mDefCalColors.resize( mNextAvailableCalendar ); |
491 | mDefCalColors[mNextAvailableCalendar-1] = kkf; | 491 | mDefCalColors[mNextAvailableCalendar-1] = kkf; |
492 | ++mNextAvailableCalendar; | 492 | ++mNextAvailableCalendar; |
493 | kkf->mDefaultColor = mEventColor; | 493 | kkf->mDefaultColor = mEventColor; |
494 | kkf->mName = i18n("New Calendar"); | 494 | kkf->mName = i18n("New Calendar"); |
495 | mCalendars.append( kkf ); | 495 | mCalendars.append( kkf ); |
496 | return kkf; | 496 | return kkf; |
497 | } | 497 | } |
498 | void KOPrefs::deleteCalendar( int num ) | 498 | void KOPrefs::deleteCalendar( int num ) |
499 | { | 499 | { |
500 | KopiCalendarFile * kkf = mCalendars.first(); | 500 | KopiCalendarFile * kkf = mCalendars.first(); |
501 | while ( kkf ) { | 501 | while ( kkf ) { |
502 | if ( kkf->mCalNumber == num ) { | 502 | if ( kkf->mCalNumber == num ) { |
503 | qDebug("KOPrefs::deleteCalendar %d ", num ); | 503 | qDebug("KOPrefs::deleteCalendar %d ", num ); |
504 | mCalendars.remove( kkf ); | 504 | mCalendars.remove( kkf ); |
505 | delete kkf; | 505 | delete kkf; |
506 | return; | 506 | return; |
507 | } | 507 | } |
508 | kkf = mCalendars.next(); | 508 | kkf = mCalendars.next(); |
509 | } | 509 | } |
510 | } | 510 | } |
511 | int KOPrefs::getCalendarID( const QString & name ) | 511 | int KOPrefs::getCalendarID( const QString & name ) |
512 | { | 512 | { |
513 | KopiCalendarFile * kkf = mCalendars.first(); | 513 | KopiCalendarFile * kkf = mCalendars.first(); |
514 | while ( kkf ) { | 514 | while ( kkf ) { |
515 | if ( name == kkf->mName) | 515 | if ( name == kkf->mName) |
516 | return kkf->mCalNumber; | 516 | return kkf->mCalNumber; |
517 | kkf = mCalendars.next(); | 517 | kkf = mCalendars.next(); |
518 | } | 518 | } |
519 | return 1; | 519 | return 1; |
520 | } | 520 | } |
521 | QString KOPrefs::calName( int calNum) const | 521 | QString KOPrefs::calName( int calNum) const |
522 | { | 522 | { |
523 | return (mDefCalColors[calNum-1])->mName; | 523 | return (mDefCalColors[calNum-1])->mName; |