author | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
commit | 2cde25d8061acd536bccd698722952ce8555f5db (patch) (unidiff) | |
tree | 70f905e5de57b44c3503883b2f98925d9c92ef8b /korganizer/koprefsdialog.cpp | |
parent | 645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff) | |
download | kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2 |
conflict res fix
Diffstat (limited to 'korganizer/koprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koprefsdialog.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index bbdf508..f1a6c3d 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -569,24 +569,29 @@ void KOPrefsDialog::setupViewsTab() | |||
569 | topLayout->addWidget( dummy->checkBox(), ii++,0); | 569 | topLayout->addWidget( dummy->checkBox(), ii++,0); |
570 | 570 | ||
571 | KPrefsDialogWidBool *dailyRecur = | 571 | KPrefsDialogWidBool *dailyRecur = |
572 | addWidBool(i18n("Show events that recur daily in date nav."), | 572 | addWidBool(i18n("Show events that recur daily in date nav."), |
573 | &(KOPrefs::instance()->mDailyRecur),topFrame); | 573 | &(KOPrefs::instance()->mDailyRecur),topFrame); |
574 | topLayout->addWidget(dailyRecur->checkBox(),ii++,0); | 574 | topLayout->addWidget(dailyRecur->checkBox(),ii++,0); |
575 | 575 | ||
576 | KPrefsDialogWidBool *weeklyRecur = | 576 | KPrefsDialogWidBool *weeklyRecur = |
577 | addWidBool(i18n("Show ev. that recur weekly in date nav."), | 577 | addWidBool(i18n("Show ev. that recur weekly in date nav."), |
578 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); | 578 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); |
579 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); | 579 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); |
580 | 580 | ||
581 | weeklyRecur = | ||
582 | addWidBool(i18n("Show multiday allday ev. in date nav."), | ||
583 | &(KOPrefs::instance()->mLongAllday),topFrame); | ||
584 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); | ||
585 | |||
581 | #ifdef DESKTOP_VERSION | 586 | #ifdef DESKTOP_VERSION |
582 | KPrefsDialogWidBool *enableToolTips = | 587 | KPrefsDialogWidBool *enableToolTips = |
583 | addWidBool(i18n("Enable tooltips displaying summary of ev."), | 588 | addWidBool(i18n("Enable tooltips displaying summary of ev."), |
584 | &(KOPrefs::instance()->mEnableToolTips),topFrame); | 589 | &(KOPrefs::instance()->mEnableToolTips),topFrame); |
585 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); | 590 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); |
586 | #endif | 591 | #endif |
587 | // ********************************************************* | 592 | // ********************************************************* |
588 | 593 | ||
589 | topFrame = addPage(i18n("Agenda View"),0,0); | 594 | topFrame = addPage(i18n("Agenda View"),0,0); |
590 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 595 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
591 | 596 | ||
592 | topLayout = new QGridLayout(topFrame,5,1); | 597 | topLayout = new QGridLayout(topFrame,5,1); |
@@ -924,31 +929,35 @@ dummy = | |||
924 | 929 | ||
925 | topFrame = addPage(i18n("Conflict detection"),0,0); | 930 | topFrame = addPage(i18n("Conflict detection"),0,0); |
926 | 931 | ||
927 | topLayout = new QGridLayout(topFrame,2,1); | 932 | topLayout = new QGridLayout(topFrame,2,1); |
928 | topLayout->setSpacing(mSpacingHint); | 933 | topLayout->setSpacing(mSpacingHint); |
929 | topLayout->setMargin(mMarginHint); | 934 | topLayout->setMargin(mMarginHint); |
930 | ii = 0; | 935 | ii = 0; |
931 | dummy = addWidBool(i18n("Enable conflict detection"), | 936 | dummy = addWidBool(i18n("Enable conflict detection"), |
932 | &(KOPrefs::instance()->mDetectConflicts),topFrame); | 937 | &(KOPrefs::instance()->mDetectConflicts),topFrame); |
933 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 938 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
934 | topFrame = new QFrame( topFrame ); | 939 | topFrame = new QFrame( topFrame ); |
935 | topLayout->addWidget(topFrame ,ii++,0); | 940 | topLayout->addWidget(topFrame ,ii++,0); |
936 | topLayout = new QGridLayout(topFrame,4,1); | 941 | topLayout = new QGridLayout(topFrame,4,1); |
937 | connect ( dummy->checkBox(), SIGNAL( toggled( bool ) ), topFrame, SLOT ( setEnabled( bool ) ) ); | 942 | 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); | 943 | dummy = addWidBool(i18n("Include events which \"show as free\""), |
944 | &(KOPrefs::instance()->mIncludeFree),topFrame); | ||
945 | topLayout->addWidget(dummy->checkBox(), ii++,0); | ||
946 | topLayout->addWidget( new QLabel ( i18n("Conflict detection checks an <b>edited event</b> with <b>other events</b> for overlapping."), topFrame ) , ii++,0); | ||
947 | |||
939 | topLayout->addWidget( new QLabel ( i18n("Filter for the edited event"), topFrame ) , ii++,0); | 948 | topLayout->addWidget( new QLabel ( i18n("Filter for the edited event"), topFrame ) , ii++,0); |
940 | mFilterEditItem = new QComboBox( topFrame ); | 949 | mFilterEditItem = new QComboBox( topFrame ); |
941 | topLayout->addWidget(mFilterEditItem,ii++,0); | 950 | topLayout->addWidget(mFilterEditItem,ii++,0); |
942 | topLayout->addWidget( new QLabel ( i18n("Filter for other existing events"), topFrame ) , ii++,0); | 951 | topLayout->addWidget( new QLabel ( i18n("Filter for other events"), topFrame ) , ii++,0); |
943 | mFilterAllItem = new QComboBox( topFrame ); | 952 | mFilterAllItem = new QComboBox( topFrame ); |
944 | topLayout->addWidget(mFilterAllItem,ii++,0); | 953 | topLayout->addWidget(mFilterAllItem,ii++,0); |
945 | dummy = addWidBool(i18n("Check Allday with Allday"), | 954 | dummy = addWidBool(i18n("Check Allday with Allday"), |
946 | &(KOPrefs::instance()->mCheckConflictsAllDayAllDay),topFrame); | 955 | &(KOPrefs::instance()->mCheckConflictsAllDayAllDay),topFrame); |
947 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 956 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
948 | dummy = addWidBool(i18n("Check Allday with NonAllday"), | 957 | dummy = addWidBool(i18n("Check Allday with NonAllday"), |
949 | &(KOPrefs::instance()->mCheckConflictsAllDayNonAD),topFrame); | 958 | &(KOPrefs::instance()->mCheckConflictsAllDayNonAD),topFrame); |
950 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 959 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
951 | dummy = addWidBool(i18n("Check NonAllday with Allday"), | 960 | dummy = addWidBool(i18n("Check NonAllday with Allday"), |
952 | &(KOPrefs::instance()->mCheckConflictsNonADAllDay),topFrame); | 961 | &(KOPrefs::instance()->mCheckConflictsNonADAllDay),topFrame); |
953 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 962 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
954 | dummy = addWidBool(i18n("Check NonAllday with NonAllday"), | 963 | dummy = addWidBool(i18n("Check NonAllday with NonAllday"), |