-rw-r--r-- | korganizer/koprefsdialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index ebcff33..05bd73f 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -610,192 +610,196 @@ void KOPrefsDialog::setupViewsTab() | |||
610 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); | 610 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); |
611 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 611 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
612 | 612 | ||
613 | 613 | ||
614 | KPrefsDialogWidBool *marcusBainsEnabled = | 614 | KPrefsDialogWidBool *marcusBainsEnabled = |
615 | addWidBool(i18n("Show current time"), | 615 | addWidBool(i18n("Show current time"), |
616 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); | 616 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); |
617 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); | 617 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); |
618 | 618 | ||
619 | 619 | ||
620 | dummy = | 620 | dummy = |
621 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), | 621 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), |
622 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); | 622 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); |
623 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 623 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
624 | 624 | ||
625 | dummy = | 625 | dummy = |
626 | addWidBool(i18n("Set agenda to current time on change"), | 626 | addWidBool(i18n("Set agenda to current time on change"), |
627 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); | 627 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); |
628 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 628 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
629 | 629 | ||
630 | 630 | ||
631 | dummy = | 631 | dummy = |
632 | addWidBool(i18n("Allday Agenda view shows todos"), | 632 | addWidBool(i18n("Allday Agenda view shows todos"), |
633 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); | 633 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); |
634 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 634 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
635 | 635 | ||
636 | 636 | ||
637 | 637 | ||
638 | dummy = | 638 | dummy = |
639 | addWidBool(i18n("Agenda view shows completed todos"), | 639 | addWidBool(i18n("Agenda view shows completed todos"), |
640 | &(KOPrefs::instance()->mShowCompletedTodoInAgenda),topFrame); | 640 | &(KOPrefs::instance()->mShowCompletedTodoInAgenda),topFrame); |
641 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 641 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
642 | 642 | ||
643 | 643 | ||
644 | 644 | ||
645 | 645 | ||
646 | 646 | ||
647 | topFrame = addPage(i18n("Month View"),0,0); | 647 | topFrame = addPage(i18n("Month View"),0,0); |
648 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 648 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
649 | 649 | ||
650 | topLayout = new QGridLayout(topFrame,5,1); | 650 | topLayout = new QGridLayout(topFrame,5,1); |
651 | topLayout->setSpacing(mSpacingHint); | 651 | topLayout->setSpacing(mSpacingHint); |
652 | topLayout->setMargin(mMarginHint); | 652 | topLayout->setMargin(mMarginHint); |
653 | ii = 0; | 653 | ii = 0; |
654 | QLabel *lab; | 654 | QLabel *lab; |
655 | QHBox *habo = new QHBox( topFrame ); | 655 | QHBox *habo = new QHBox( topFrame ); |
656 | if ( QApplication::desktop()->width() <= 480 ) { | 656 | if ( QApplication::desktop()->width() <= 480 ) { |
657 | lab = new QLabel ( i18n("Show events that recur "), topFrame ); | 657 | lab = new QLabel ( i18n("Show events that recur "), topFrame ); |
658 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 658 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
659 | ii++; | 659 | ii++; |
660 | } else { | 660 | } else { |
661 | new QLabel ( i18n("Show events that recur "), habo ); | 661 | new QLabel ( i18n("Show events that recur "), habo ); |
662 | } | 662 | } |
663 | dailyRecur = | 663 | dailyRecur = |
664 | addWidBool(i18n("daily"), | 664 | addWidBool(i18n("daily"), |
665 | &(KOPrefs::instance()->mMonthDailyRecur),habo); | 665 | &(KOPrefs::instance()->mMonthDailyRecur),habo); |
666 | // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); | 666 | // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); |
667 | 667 | ||
668 | weeklyRecur = | 668 | weeklyRecur = |
669 | addWidBool(i18n("weekly"), | 669 | addWidBool(i18n("weekly"), |
670 | &(KOPrefs::instance()->mMonthWeeklyRecur),habo); | 670 | &(KOPrefs::instance()->mMonthWeeklyRecur),habo); |
671 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); | 671 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); |
672 | ii++; | 672 | ii++; |
673 | 673 | ||
674 | 674 | ||
675 | habo = new QHBox( topFrame ); | 675 | habo = new QHBox( topFrame ); |
676 | if ( QApplication::desktop()->width() <= 480 ) { | 676 | if ( QApplication::desktop()->width() <= 480 ) { |
677 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); | 677 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); |
678 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 678 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
679 | ii++; | 679 | ii++; |
680 | 680 | ||
681 | } else { | 681 | } else { |
682 | new QLabel ( i18n("Show in every cell "), habo ); | 682 | new QLabel ( i18n("Show in every cell "), habo ); |
683 | } | 683 | } |
684 | weeklyRecur = | 684 | weeklyRecur = |
685 | addWidBool(i18n("short month"), | 685 | addWidBool(i18n("short month"), |
686 | &(KOPrefs::instance()->mMonthShowShort),habo); | 686 | &(KOPrefs::instance()->mMonthShowShort),habo); |
687 | weeklyRecur = | 687 | weeklyRecur = |
688 | addWidBool(i18n("icons"), | 688 | addWidBool(i18n("icons"), |
689 | &(KOPrefs::instance()->mMonthShowIcons),habo); | 689 | &(KOPrefs::instance()->mMonthShowIcons),habo); |
690 | weeklyRecur = | 690 | weeklyRecur = |
691 | addWidBool(i18n("times"), | 691 | addWidBool(i18n("times"), |
692 | &(KOPrefs::instance()->mMonthShowTimes),habo); | 692 | &(KOPrefs::instance()->mMonthShowTimes),habo); |
693 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); | 693 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); |
694 | ii++; | 694 | ii++; |
695 | #ifdef DESKTOP_VERSION | 695 | #ifdef DESKTOP_VERSION |
696 | KPrefsDialogWidBool *enableMonthScroll = | 696 | KPrefsDialogWidBool *enableMonthScroll = |
697 | addWidBool(i18n("Enable scrollbars in month view cells"), | 697 | addWidBool(i18n("Enable scrollbars in month view cells"), |
698 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); | 698 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); |
699 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); | 699 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); |
700 | #endif | 700 | #endif |
701 | dummy = | 701 | dummy = |
702 | addWidBool(i18n("Week view mode uses bigger font"), | 702 | addWidBool(i18n("Week view mode uses bigger font"), |
703 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); | 703 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); |
704 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 704 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
705 | dummy = | 705 | dummy = |
706 | addWidBool(i18n("Week view mode uses row layout"), | ||
707 | &(KOPrefs::instance()->mMonthViewWeekRowlayout),topFrame); | ||
708 | topLayout->addWidget(dummy->checkBox(),ii++,0); | ||
709 | dummy = | ||
706 | addWidBool(i18n("Show Sat/Sun together"), | 710 | addWidBool(i18n("Show Sat/Sun together"), |
707 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); | 711 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); |
708 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 712 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
709 | 713 | ||
710 | KPrefsDialogWidBool *coloredCategoriesInMonthView = | 714 | KPrefsDialogWidBool *coloredCategoriesInMonthView = |
711 | addWidBool(i18n("Month view uses category colors"), | 715 | addWidBool(i18n("Month view uses category colors"), |
712 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); | 716 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); |
713 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 717 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
714 | 718 | ||
715 | dummy = | 719 | dummy = |
716 | addWidBool(i18n("Category colors are applied to text"), | 720 | addWidBool(i18n("Category colors are applied to text"), |
717 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); | 721 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); |
718 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 722 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
719 | 723 | ||
720 | 724 | ||
721 | 725 | ||
722 | if ( QApplication::desktop()->height() <= 240 ) { | 726 | if ( QApplication::desktop()->height() <= 240 ) { |
723 | topFrame = addPage(i18n("Month View") +" 2",0,0); | 727 | topFrame = addPage(i18n("Month View") +" 2",0,0); |
724 | topLayout = new QGridLayout(topFrame,4,1); | 728 | topLayout = new QGridLayout(topFrame,4,1); |
725 | topLayout->setSpacing(2); | 729 | topLayout->setSpacing(2); |
726 | topLayout->setMargin(1); | 730 | topLayout->setMargin(1); |
727 | ii = 0; | 731 | ii = 0; |
728 | } | 732 | } |
729 | 733 | ||
730 | 734 | ||
731 | coloredCategoriesInMonthView = | 735 | coloredCategoriesInMonthView = |
732 | addWidBool(i18n("Month view uses day colors"), | 736 | addWidBool(i18n("Month view uses day colors"), |
733 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); | 737 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); |
734 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 738 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
735 | 739 | ||
736 | KPrefsDialogWidColor *holidayColor = | 740 | KPrefsDialogWidColor *holidayColor = |
737 | addWidColor(i18n("Day color odd months"), | 741 | addWidColor(i18n("Day color odd months"), |
738 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); | 742 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); |
739 | topLayout->addWidget(holidayColor->label(),ii,0); | 743 | topLayout->addWidget(holidayColor->label(),ii,0); |
740 | topLayout->addWidget(holidayColor->button(),ii++,1); | 744 | topLayout->addWidget(holidayColor->button(),ii++,1); |
741 | 745 | ||
742 | holidayColor = | 746 | holidayColor = |
743 | addWidColor(i18n("Day color even months"), | 747 | addWidColor(i18n("Day color even months"), |
744 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); | 748 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); |
745 | topLayout->addWidget(holidayColor->label(),ii,0); | 749 | topLayout->addWidget(holidayColor->label(),ii,0); |
746 | topLayout->addWidget(holidayColor->button(),ii++,1); | 750 | topLayout->addWidget(holidayColor->button(),ii++,1); |
747 | 751 | ||
748 | 752 | ||
749 | holidayColor = | 753 | holidayColor = |
750 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), | 754 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), |
751 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); | 755 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); |
752 | topLayout->addWidget(holidayColor->label(),ii,0); | 756 | topLayout->addWidget(holidayColor->label(),ii,0); |
753 | topLayout->addWidget(holidayColor->button(),ii++,1); | 757 | topLayout->addWidget(holidayColor->button(),ii++,1); |
754 | // *********************** What'sNext View | 758 | // *********************** What'sNext View |
755 | topFrame = addPage(i18n("What's Next View"),0,0); | 759 | topFrame = addPage(i18n("What's Next View"),0,0); |
756 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 760 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
757 | 761 | ||
758 | topLayout = new QGridLayout(topFrame,4,1); | 762 | topLayout = new QGridLayout(topFrame,4,1); |
759 | topLayout->setSpacing(mSpacingHint); | 763 | topLayout->setSpacing(mSpacingHint); |
760 | topLayout->setMargin(mMarginHint); | 764 | topLayout->setMargin(mMarginHint); |
761 | ii = 0; | 765 | ii = 0; |
762 | 766 | ||
763 | 767 | ||
764 | QHBox* hdummy = new QHBox(topFrame); | 768 | QHBox* hdummy = new QHBox(topFrame); |
765 | new QLabel(i18n("Days in What's Next:"),hdummy); | 769 | new QLabel(i18n("Days in What's Next:"),hdummy); |
766 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); | 770 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); |
767 | 771 | ||
768 | topLayout->addWidget(hdummy,ii++,0); | 772 | topLayout->addWidget(hdummy,ii++,0); |
769 | 773 | ||
770 | QHBox *prioBox = new QHBox(topFrame); | 774 | QHBox *prioBox = new QHBox(topFrame); |
771 | // intervalBox->setSpacing(mSpacingHint); | 775 | // intervalBox->setSpacing(mSpacingHint); |
772 | topLayout->addWidget(prioBox,ii++,0); | 776 | topLayout->addWidget(prioBox,ii++,0); |
773 | 777 | ||
774 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); | 778 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); |
775 | mPrioSpin = new QSpinBox(0,5,1,prioBox); | 779 | mPrioSpin = new QSpinBox(0,5,1,prioBox); |
776 | if ( QApplication::desktop()->width() < 300 ) | 780 | if ( QApplication::desktop()->width() < 300 ) |
777 | mPrioSpin->setFixedWidth( 40 ); | 781 | mPrioSpin->setFixedWidth( 40 ); |
778 | 782 | ||
779 | KPrefsDialogWidBool *passwdk = | 783 | KPrefsDialogWidBool *passwdk = |
780 | 784 | ||
781 | addWidBool(i18n("Show events that are done"), | 785 | addWidBool(i18n("Show events that are done"), |
782 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); | 786 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); |
783 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 787 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
784 | passwdk = | 788 | passwdk = |
785 | addWidBool(i18n("Show parent To-Do's"), | 789 | addWidBool(i18n("Show parent To-Do's"), |
786 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | 790 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); |
787 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 791 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
788 | 792 | ||
789 | passwdk = | 793 | passwdk = |
790 | addWidBool(i18n("Show location"), | 794 | addWidBool(i18n("Show location"), |
791 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | 795 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); |
792 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 796 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
793 | 797 | ||
794 | 798 | ||
795 | passwdk = | 799 | passwdk = |
796 | addWidBool(i18n("Use short date in WN+Event view"), | 800 | addWidBool(i18n("Use short date in WN+Event view"), |
797 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | 801 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); |
798 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 802 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
799 | 803 | ||
800 | 804 | ||
801 | 805 | ||