Diffstat (limited to 'korganizer/koprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koprefsdialog.cpp | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 9e2378a..bbdf508 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -901,48 +901,83 @@ dummy = | |||
901 | dummy = addWidBool(i18n("Details"), | 901 | dummy = addWidBool(i18n("Details"), |
902 | &(KOPrefs::instance()->mEVshowDetails),topFrame); | 902 | &(KOPrefs::instance()->mEVshowDetails),topFrame); |
903 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 903 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
904 | dummy = addWidBool(i18n("Created time"), | 904 | dummy = addWidBool(i18n("Created time"), |
905 | &(KOPrefs::instance()->mEVshowCreated),topFrame); | 905 | &(KOPrefs::instance()->mEVshowCreated),topFrame); |
906 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 906 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
907 | dummy = addWidBool(i18n("Last modified time"), | 907 | dummy = addWidBool(i18n("Last modified time"), |
908 | &(KOPrefs::instance()->mEVshowChanged),topFrame); | 908 | &(KOPrefs::instance()->mEVshowChanged),topFrame); |
909 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 909 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
910 | 910 | ||
911 | 911 | ||
912 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); | 912 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); |
913 | topLayout->addWidget(lab ,ii++,0); | 913 | topLayout->addWidget(lab ,ii++,0); |
914 | 914 | ||
915 | dummy = addWidBool(i18n("Details"), | 915 | dummy = addWidBool(i18n("Details"), |
916 | &(KOPrefs::instance()->mWTshowDetails),topFrame); | 916 | &(KOPrefs::instance()->mWTshowDetails),topFrame); |
917 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 917 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
918 | dummy = addWidBool(i18n("Created time"), | 918 | dummy = addWidBool(i18n("Created time"), |
919 | &(KOPrefs::instance()->mWTshowCreated),topFrame); | 919 | &(KOPrefs::instance()->mWTshowCreated),topFrame); |
920 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 920 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
921 | dummy = addWidBool(i18n("Last modified time"), | 921 | dummy = addWidBool(i18n("Last modified time"), |
922 | &(KOPrefs::instance()->mWTshowChanged),topFrame); | 922 | &(KOPrefs::instance()->mWTshowChanged),topFrame); |
923 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 923 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
924 | 924 | ||
925 | topFrame = addPage(i18n("Conflict detection"),0,0); | ||
926 | |||
927 | topLayout = new QGridLayout(topFrame,2,1); | ||
928 | topLayout->setSpacing(mSpacingHint); | ||
929 | topLayout->setMargin(mMarginHint); | ||
930 | ii = 0; | ||
931 | dummy = addWidBool(i18n("Enable conflict detection"), | ||
932 | &(KOPrefs::instance()->mDetectConflicts),topFrame); | ||
933 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
934 | topFrame = new QFrame( topFrame ); | ||
935 | topLayout->addWidget(topFrame ,ii++,0); | ||
936 | topLayout = new QGridLayout(topFrame,4,1); | ||
937 | connect ( dummy->checkBox(), SIGNAL( toggled( bool ) ), topFrame, SLOT ( setEnabled( bool ) ) ); | ||
938 | topLayout->addWidget( new QLabel ( i18n("Conflict detection checks an <b>edited event</b> with other <b>existing events</b> for overlapping. You can define which events are checked:"), topFrame ) , ii++,0); | ||
939 | topLayout->addWidget( new QLabel ( i18n("Filter for the edited event"), topFrame ) , ii++,0); | ||
940 | mFilterEditItem = new QComboBox( topFrame ); | ||
941 | topLayout->addWidget(mFilterEditItem,ii++,0); | ||
942 | topLayout->addWidget( new QLabel ( i18n("Filter for other existing events"), topFrame ) , ii++,0); | ||
943 | mFilterAllItem = new QComboBox( topFrame ); | ||
944 | topLayout->addWidget(mFilterAllItem,ii++,0); | ||
945 | dummy = addWidBool(i18n("Check Allday with Allday"), | ||
946 | &(KOPrefs::instance()->mCheckConflictsAllDayAllDay),topFrame); | ||
947 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
948 | dummy = addWidBool(i18n("Check Allday with NonAllday"), | ||
949 | &(KOPrefs::instance()->mCheckConflictsAllDayNonAD),topFrame); | ||
950 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
951 | dummy = addWidBool(i18n("Check NonAllday with Allday"), | ||
952 | &(KOPrefs::instance()->mCheckConflictsNonADAllDay),topFrame); | ||
953 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
954 | dummy = addWidBool(i18n("Check NonAllday with NonAllday"), | ||
955 | &(KOPrefs::instance()->mCheckConflictsNonADNonAD),topFrame); | ||
956 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
957 | |||
958 | |||
959 | |||
925 | 960 | ||
926 | topFrame = addPage(i18n("Alarm"),0,0); | 961 | topFrame = addPage(i18n("Alarm"),0,0); |
927 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 962 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
928 | 963 | ||
929 | topLayout = new QGridLayout(topFrame,2,1); | 964 | topLayout = new QGridLayout(topFrame,2,1); |
930 | topLayout->setSpacing(mSpacingHint); | 965 | topLayout->setSpacing(mSpacingHint); |
931 | topLayout->setMargin(mMarginHint); | 966 | topLayout->setMargin(mMarginHint); |
932 | int iii = 0; | 967 | int iii = 0; |
933 | 968 | ||
934 | dummy = | 969 | dummy = |
935 | addWidBool(i18n("Use internal alarm notification"), | 970 | addWidBool(i18n("Use internal alarm notification"), |
936 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); | 971 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); |
937 | topLayout->addWidget(dummy->checkBox(),iii++,0); | 972 | topLayout->addWidget(dummy->checkBox(),iii++,0); |
938 | 973 | ||
939 | if ( QApplication::desktop()->height() > 240 ) { | 974 | if ( QApplication::desktop()->height() > 240 ) { |
940 | 975 | ||
941 | lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); | 976 | lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); |
942 | 977 | ||
943 | topLayout->addWidget(lab ,iii++,0); | 978 | topLayout->addWidget(lab ,iii++,0); |
944 | } | 979 | } |
945 | #ifndef DESKTOP_VERSION | 980 | #ifndef DESKTOP_VERSION |
946 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); | 981 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); |
947 | #else | 982 | #else |
948 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); | 983 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); |
@@ -1414,92 +1449,109 @@ void KOPrefsDialog::usrReadConfig() | |||
1414 | 1449 | ||
1415 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); | 1450 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); |
1416 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); | 1451 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); |
1417 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); | 1452 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); |
1418 | 1453 | ||
1419 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); | 1454 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); |
1420 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); | 1455 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); |
1421 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); | 1456 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); |
1422 | // mAMails->clear(); | 1457 | // mAMails->clear(); |
1423 | // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); | 1458 | // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); |
1424 | // it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { | 1459 | // it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { |
1425 | // QListViewItem *item = new QListViewItem(mAMails); | 1460 | // QListViewItem *item = new QListViewItem(mAMails); |
1426 | // item->setText(0,*it); | 1461 | // item->setText(0,*it); |
1427 | // mAMails->insertItem(item); | 1462 | // mAMails->insertItem(item); |
1428 | // } | 1463 | // } |
1429 | 1464 | ||
1430 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); | 1465 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); |
1431 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); | 1466 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); |
1432 | updateCategories(); | 1467 | updateCategories(); |
1433 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1468 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1434 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1469 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
1435 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); | 1470 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); |
1436 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1471 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1437 | mCatDefaultColor = KOPrefs::instance()->mEventColor; | 1472 | mCatDefaultColor = KOPrefs::instance()->mEventColor; |
1473 | |||
1474 | |||
1475 | KConfig cfgko(locateLocal("config","korganizerrc")); | ||
1476 | cfgko.setGroup("General"); | ||
1477 | QStringList temp = cfgko.readListEntry("CalendarFilters"); | ||
1478 | temp.prepend(i18n("No Filter") ); | ||
1479 | mFilterEditItem->insertStringList( temp ); | ||
1480 | mFilterAllItem->insertStringList( temp ); | ||
1481 | int index = temp.findIndex( KOPrefs::instance()->mFilterConflictEditItem ); | ||
1482 | if ( index >= 0 ) | ||
1483 | mFilterEditItem->setCurrentItem( index ); | ||
1484 | index = temp.findIndex( KOPrefs::instance()->mFilterConflictAllItem ); | ||
1485 | if ( index >= 0 ) | ||
1486 | mFilterAllItem->setCurrentItem( index ); | ||
1438 | } | 1487 | } |
1439 | 1488 | ||
1440 | 1489 | ||
1441 | void KOPrefsDialog::usrWriteConfig() | 1490 | void KOPrefsDialog::usrWriteConfig() |
1442 | { | 1491 | { |
1443 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); | 1492 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); |
1444 | KOPrefs::instance()->setFullName(mNameEdit->text()); | 1493 | KOPrefs::instance()->setFullName(mNameEdit->text()); |
1445 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1494 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1446 | 1495 | ||
1447 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); | 1496 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); |
1448 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); | 1497 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); |
1449 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); | 1498 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); |
1450 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); | 1499 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); |
1451 | if ( mCatDefaultColor != KOPrefs::instance()->mEventColor ) { | 1500 | if ( mCatDefaultColor != KOPrefs::instance()->mEventColor ) { |
1452 | QStringList cat = KOPrefs::instance()->mCustomCategories; | 1501 | QStringList cat = KOPrefs::instance()->mCustomCategories; |
1453 | int iii = 0; | 1502 | int iii = 0; |
1454 | while ( iii < cat.count() ) { | 1503 | while ( iii < cat.count() ) { |
1455 | if ( *KOPrefs::instance()->categoryColor( cat[ iii ] ) == mCatDefaultColor ) | 1504 | if ( *KOPrefs::instance()->categoryColor( cat[ iii ] ) == mCatDefaultColor ) |
1456 | KOPrefs::instance()->setCategoryColor( cat[ iii ], KOPrefs::instance()->mEventColor ); | 1505 | KOPrefs::instance()->setCategoryColor( cat[ iii ], KOPrefs::instance()->mEventColor ); |
1457 | ++iii; | 1506 | ++iii; |
1458 | } | 1507 | } |
1459 | } | 1508 | } |
1460 | QDictIterator<QColor> it(mCategoryDict); | 1509 | QDictIterator<QColor> it(mCategoryDict); |
1461 | while (it.current()) { | 1510 | while (it.current()) { |
1462 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); | 1511 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); |
1463 | ++it; | 1512 | ++it; |
1464 | } | 1513 | } |
1465 | 1514 | ||
1466 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); | 1515 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); |
1467 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); | 1516 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); |
1468 | KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); | 1517 | KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); |
1469 | 1518 | ||
1470 | KOPrefs::instance()->mAdditionalMails.clear(); | 1519 | KOPrefs::instance()->mAdditionalMails.clear(); |
1471 | // QListViewItem *item; | 1520 | // QListViewItem *item; |
1472 | // item = mAMails->firstChild(); | 1521 | // item = mAMails->firstChild(); |
1473 | // while (item) | 1522 | // while (item) |
1474 | // { | 1523 | // { |
1475 | // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); | 1524 | // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); |
1476 | // item = item->nextSibling(); | 1525 | // item = item->nextSibling(); |
1477 | // } | 1526 | // } |
1478 | KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); | 1527 | KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); |
1479 | KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; | 1528 | KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; |
1480 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; | 1529 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; |
1481 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; | 1530 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; |
1531 | |||
1532 | KOPrefs::instance()->mFilterConflictEditItem = mFilterEditItem->currentText(); | ||
1533 | KOPrefs::instance()->mFilterConflictAllItem = mFilterAllItem->currentText(); | ||
1482 | } | 1534 | } |
1483 | 1535 | ||
1484 | void KOPrefsDialog::updateCategories() | 1536 | void KOPrefsDialog::updateCategories() |
1485 | { | 1537 | { |
1486 | mCategoryCombo->clear(); | 1538 | mCategoryCombo->clear(); |
1487 | mCategoryDict.clear(); | 1539 | mCategoryDict.clear(); |
1488 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); | 1540 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); |
1489 | updateCategoryColor(); | 1541 | updateCategoryColor(); |
1490 | } | 1542 | } |
1491 | 1543 | ||
1492 | void KOPrefsDialog::toggleEmailSettings(bool on) | 1544 | void KOPrefsDialog::toggleEmailSettings(bool on) |
1493 | { | 1545 | { |
1494 | if (on) { | 1546 | if (on) { |
1495 | mEmailEdit->setEnabled(false); | 1547 | mEmailEdit->setEnabled(false); |
1496 | mNameEdit->setEnabled(false); | 1548 | mNameEdit->setEnabled(false); |
1497 | mEmailLabel->setEnabled(false); | 1549 | mEmailLabel->setEnabled(false); |
1498 | mNameLabel->setEnabled(false); | 1550 | mNameLabel->setEnabled(false); |
1499 | 1551 | ||
1500 | KEMailSettings settings; | 1552 | KEMailSettings settings; |
1501 | mNameEdit->setText(settings.getSetting(KEMailSettings::RealName)); | 1553 | mNameEdit->setText(settings.getSetting(KEMailSettings::RealName)); |
1502 | mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress)); | 1554 | mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress)); |
1503 | } else { | 1555 | } else { |
1504 | mEmailEdit->setEnabled(true); | 1556 | mEmailEdit->setEnabled(true); |
1505 | mNameEdit->setEnabled(true); | 1557 | mNameEdit->setEnabled(true); |