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 | |||
@@ -533,96 +533,101 @@ void KOPrefsDialog::setupViewsTab() | |||
533 | topLayout = new QGridLayout(topFrame,6,1); | 533 | topLayout = new QGridLayout(topFrame,6,1); |
534 | topLayout->setSpacing(mSpacingHint); | 534 | topLayout->setSpacing(mSpacingHint); |
535 | topLayout->setMargin(mMarginHint); | 535 | topLayout->setMargin(mMarginHint); |
536 | ii = 0; | 536 | ii = 0; |
537 | 537 | ||
538 | #endif | 538 | #endif |
539 | 539 | ||
540 | dummy = | 540 | dummy = |
541 | addWidBool(i18n("Hold fullscreen on view change"), | 541 | addWidBool(i18n("Hold fullscreen on view change"), |
542 | &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); | 542 | &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); |
543 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 543 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
544 | 544 | ||
545 | dummy = | 545 | dummy = |
546 | addWidBool(i18n("Hold non-fullscreen on view change"), | 546 | addWidBool(i18n("Hold non-fullscreen on view change"), |
547 | &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); | 547 | &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); |
548 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 548 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
549 | 549 | ||
550 | 550 | ||
551 | 551 | ||
552 | KPrefsDialogWidBool *fullViewMonth = | 552 | KPrefsDialogWidBool *fullViewMonth = |
553 | addWidBool(i18n("Next days view uses full window"), | 553 | addWidBool(i18n("Next days view uses full window"), |
554 | &(KOPrefs::instance()->mFullViewMonth),topFrame); | 554 | &(KOPrefs::instance()->mFullViewMonth),topFrame); |
555 | topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); | 555 | topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); |
556 | 556 | ||
557 | 557 | ||
558 | KPrefsDialogWidBool *fullViewTodo = | 558 | KPrefsDialogWidBool *fullViewTodo = |
559 | addWidBool(i18n("Event list view uses full window"), | 559 | addWidBool(i18n("Event list view uses full window"), |
560 | &(KOPrefs::instance()->mFullViewTodo),topFrame); | 560 | &(KOPrefs::instance()->mFullViewTodo),topFrame); |
561 | topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); | 561 | topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); |
562 | dummy = | 562 | dummy = |
563 | addWidBool(i18n("Listview uses monthly timespan"), | 563 | addWidBool(i18n("Listview uses monthly timespan"), |
564 | &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); | 564 | &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); |
565 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 565 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
566 | dummy = | 566 | dummy = |
567 | addWidBool(i18n("Highlight selection in Time Edit"), | 567 | addWidBool(i18n("Highlight selection in Time Edit"), |
568 | &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); | 568 | &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); |
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); |
593 | topLayout->setSpacing(mSpacingHint); | 598 | topLayout->setSpacing(mSpacingHint); |
594 | topLayout->setMargin(mMarginHint); | 599 | topLayout->setMargin(mMarginHint); |
595 | ii = 0; | 600 | ii = 0; |
596 | 601 | ||
597 | 602 | ||
598 | dummy = | 603 | dummy = |
599 | addWidBool(i18n("Show time in agenda items"), | 604 | addWidBool(i18n("Show time in agenda items"), |
600 | &(KOPrefs::instance()->mShowTimeInAgenda),topFrame); | 605 | &(KOPrefs::instance()->mShowTimeInAgenda),topFrame); |
601 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 606 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
602 | 607 | ||
603 | dummy = | 608 | dummy = |
604 | addWidBool(i18n("Highlight current day in agenda"), | 609 | addWidBool(i18n("Highlight current day in agenda"), |
605 | &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); | 610 | &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); |
606 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 611 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
607 | 612 | ||
608 | dummy = | 613 | dummy = |
609 | addWidBool(i18n("Use light color for highlight current day"), | 614 | addWidBool(i18n("Use light color for highlight current day"), |
610 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); | 615 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); |
611 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 616 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
612 | 617 | ||
613 | 618 | ||
614 | KPrefsDialogWidBool *marcusBainsEnabled = | 619 | KPrefsDialogWidBool *marcusBainsEnabled = |
615 | addWidBool(i18n("Show current time"), | 620 | addWidBool(i18n("Show current time"), |
616 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); | 621 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); |
617 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); | 622 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); |
618 | 623 | ||
619 | 624 | ||
620 | dummy = | 625 | dummy = |
621 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), | 626 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), |
622 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); | 627 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); |
623 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 628 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
624 | 629 | ||
625 | dummy = | 630 | dummy = |
626 | addWidBool(i18n("Set agenda to current time on change"), | 631 | addWidBool(i18n("Set agenda to current time on change"), |
627 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); | 632 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); |
628 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 633 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
@@ -888,103 +893,107 @@ dummy = | |||
888 | topLayout = new QGridLayout(topFrame,4,1); | 893 | topLayout = new QGridLayout(topFrame,4,1); |
889 | topLayout->setSpacing(mSpacingHint); | 894 | topLayout->setSpacing(mSpacingHint); |
890 | topLayout->setMargin(mMarginHint); | 895 | topLayout->setMargin(mMarginHint); |
891 | ii = 0; | 896 | ii = 0; |
892 | 897 | ||
893 | dummy = | 898 | dummy = |
894 | addWidBool(i18n("Show Sync Events"), | 899 | addWidBool(i18n("Show Sync Events"), |
895 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | 900 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); |
896 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 901 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
897 | 902 | ||
898 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); | 903 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); |
899 | topLayout->addWidget(lab ,ii++,0); | 904 | topLayout->addWidget(lab ,ii++,0); |
900 | 905 | ||
901 | dummy = addWidBool(i18n("Details"), | 906 | dummy = addWidBool(i18n("Details"), |
902 | &(KOPrefs::instance()->mEVshowDetails),topFrame); | 907 | &(KOPrefs::instance()->mEVshowDetails),topFrame); |
903 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 908 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
904 | dummy = addWidBool(i18n("Created time"), | 909 | dummy = addWidBool(i18n("Created time"), |
905 | &(KOPrefs::instance()->mEVshowCreated),topFrame); | 910 | &(KOPrefs::instance()->mEVshowCreated),topFrame); |
906 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 911 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
907 | dummy = addWidBool(i18n("Last modified time"), | 912 | dummy = addWidBool(i18n("Last modified time"), |
908 | &(KOPrefs::instance()->mEVshowChanged),topFrame); | 913 | &(KOPrefs::instance()->mEVshowChanged),topFrame); |
909 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 914 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
910 | 915 | ||
911 | 916 | ||
912 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); | 917 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); |
913 | topLayout->addWidget(lab ,ii++,0); | 918 | topLayout->addWidget(lab ,ii++,0); |
914 | 919 | ||
915 | dummy = addWidBool(i18n("Details"), | 920 | dummy = addWidBool(i18n("Details"), |
916 | &(KOPrefs::instance()->mWTshowDetails),topFrame); | 921 | &(KOPrefs::instance()->mWTshowDetails),topFrame); |
917 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 922 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
918 | dummy = addWidBool(i18n("Created time"), | 923 | dummy = addWidBool(i18n("Created time"), |
919 | &(KOPrefs::instance()->mWTshowCreated),topFrame); | 924 | &(KOPrefs::instance()->mWTshowCreated),topFrame); |
920 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 925 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
921 | dummy = addWidBool(i18n("Last modified time"), | 926 | dummy = addWidBool(i18n("Last modified time"), |
922 | &(KOPrefs::instance()->mWTshowChanged),topFrame); | 927 | &(KOPrefs::instance()->mWTshowChanged),topFrame); |
923 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 928 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
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"), |
955 | &(KOPrefs::instance()->mCheckConflictsNonADNonAD),topFrame); | 964 | &(KOPrefs::instance()->mCheckConflictsNonADNonAD),topFrame); |
956 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 965 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
957 | 966 | ||
958 | 967 | ||
959 | 968 | ||
960 | 969 | ||
961 | topFrame = addPage(i18n("Alarm"),0,0); | 970 | topFrame = addPage(i18n("Alarm"),0,0); |
962 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 971 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
963 | 972 | ||
964 | topLayout = new QGridLayout(topFrame,2,1); | 973 | topLayout = new QGridLayout(topFrame,2,1); |
965 | topLayout->setSpacing(mSpacingHint); | 974 | topLayout->setSpacing(mSpacingHint); |
966 | topLayout->setMargin(mMarginHint); | 975 | topLayout->setMargin(mMarginHint); |
967 | int iii = 0; | 976 | int iii = 0; |
968 | 977 | ||
969 | dummy = | 978 | dummy = |
970 | addWidBool(i18n("Use internal alarm notification"), | 979 | addWidBool(i18n("Use internal alarm notification"), |
971 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); | 980 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); |
972 | topLayout->addWidget(dummy->checkBox(),iii++,0); | 981 | topLayout->addWidget(dummy->checkBox(),iii++,0); |
973 | 982 | ||
974 | if ( QApplication::desktop()->height() > 240 ) { | 983 | if ( QApplication::desktop()->height() > 240 ) { |
975 | 984 | ||
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); | 985 | 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); |
977 | 986 | ||
978 | topLayout->addWidget(lab ,iii++,0); | 987 | topLayout->addWidget(lab ,iii++,0); |
979 | } | 988 | } |
980 | #ifndef DESKTOP_VERSION | 989 | #ifndef DESKTOP_VERSION |
981 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); | 990 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); |
982 | #else | 991 | #else |
983 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); | 992 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); |
984 | lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); | 993 | lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); |
985 | #endif | 994 | #endif |
986 | 995 | ||
987 | QHBox* dummyBox = new QHBox(topFrame); | 996 | QHBox* dummyBox = new QHBox(topFrame); |
988 | new QLabel(i18n("Play beeps count:"),dummyBox); | 997 | new QLabel(i18n("Play beeps count:"),dummyBox); |
989 | mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); | 998 | mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); |
990 | topLayout->addWidget(dummyBox,iii++,0); | 999 | topLayout->addWidget(dummyBox,iii++,0); |