-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index ab0e4d6..16031b8 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -684,64 +684,71 @@ void MainWindow::initActions() | |||
684 | mView->viewManager(), SLOT( showListView() ) ); | 684 | mView->viewManager(), SLOT( showListView() ) ); |
685 | 685 | ||
686 | 686 | ||
687 | icon = loadPixmap( pathString + "day" ); | 687 | icon = loadPixmap( pathString + "day" ); |
688 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); | 688 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); |
689 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); | 689 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); |
690 | day1_action->addTo( viewMenu ); | 690 | day1_action->addTo( viewMenu ); |
691 | // action->addTo( toolBar ); | 691 | // action->addTo( toolBar ); |
692 | connect( day1_action, SIGNAL( activated() ), | 692 | connect( day1_action, SIGNAL( activated() ), |
693 | mView->viewManager(), SLOT( showDayView() ) ); | 693 | mView->viewManager(), SLOT( showDayView() ) ); |
694 | 694 | ||
695 | icon = loadPixmap( pathString + "workweek" ); | 695 | icon = loadPixmap( pathString + "workweek" ); |
696 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); | 696 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); |
697 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); | 697 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); |
698 | day5_action->addTo( viewMenu ); | 698 | day5_action->addTo( viewMenu ); |
699 | connect( day5_action, SIGNAL( activated() ), | 699 | connect( day5_action, SIGNAL( activated() ), |
700 | mView->viewManager(), SLOT( showWorkWeekView() ) ); | 700 | mView->viewManager(), SLOT( showWorkWeekView() ) ); |
701 | 701 | ||
702 | icon = loadPixmap( pathString + "week" ); | 702 | icon = loadPixmap( pathString + "week" ); |
703 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); | 703 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); |
704 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); | 704 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); |
705 | day7_action->addTo( viewMenu ); | 705 | day7_action->addTo( viewMenu ); |
706 | connect( day7_action, SIGNAL( activated() ), | 706 | connect( day7_action, SIGNAL( activated() ), |
707 | mView->viewManager(), SLOT( showWeekView() ) ); | 707 | mView->viewManager(), SLOT( showWeekView() ) ); |
708 | 708 | ||
709 | icon = loadPixmap( pathString + "month" ); | 709 | icon = loadPixmap( pathString + "month" ); |
710 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); | 710 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); |
711 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); | 711 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); |
712 | month_action->addTo( viewMenu ); | 712 | month_action->addTo( viewMenu ); |
713 | connect( month_action, SIGNAL( activated() ), | 713 | connect( month_action, SIGNAL( activated() ), |
714 | mView->viewManager(), SLOT( showMonthView() ) ); | 714 | mView->viewManager(), SLOT( showMonthView() ) ); |
715 | 715 | ||
716 | icon = loadPixmap( pathString + "workweek2" ); | ||
717 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); | ||
718 | QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); | ||
719 | day6_action->addTo( viewMenu ); | ||
720 | connect( day6_action, SIGNAL( activated() ), | ||
721 | mView->viewManager(), SLOT( showMonthViewWeek() ) ); | ||
722 | |||
716 | icon = loadPixmap( pathString + "todo" ); | 723 | icon = loadPixmap( pathString + "todo" ); |
717 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); | 724 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); |
718 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); | 725 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); |
719 | todoview_action->addTo( viewMenu ); | 726 | todoview_action->addTo( viewMenu ); |
720 | connect( todoview_action, SIGNAL( activated() ), | 727 | connect( todoview_action, SIGNAL( activated() ), |
721 | mView->viewManager(), SLOT( showTodoView() ) ); | 728 | mView->viewManager(), SLOT( showTodoView() ) ); |
722 | 729 | ||
723 | icon = loadPixmap( pathString + "journal" ); | 730 | icon = loadPixmap( pathString + "journal" ); |
724 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | 731 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); |
725 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | 732 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); |
726 | viewjournal_action->addTo( viewMenu ); | 733 | viewjournal_action->addTo( viewMenu ); |
727 | connect( viewjournal_action, SIGNAL( activated() ), | 734 | connect( viewjournal_action, SIGNAL( activated() ), |
728 | mView->viewManager(), SLOT( showJournalView() ) ); | 735 | mView->viewManager(), SLOT( showJournalView() ) ); |
729 | 736 | ||
730 | icon = loadPixmap( pathString + "xdays" ); | 737 | icon = loadPixmap( pathString + "xdays" ); |
731 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 ); | 738 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 ); |
732 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | 739 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); |
733 | xdays_action->addTo( viewMenu ); | 740 | xdays_action->addTo( viewMenu ); |
734 | connect( xdays_action, SIGNAL( activated() ), | 741 | connect( xdays_action, SIGNAL( activated() ), |
735 | mView->viewManager(), SLOT( showNextXView() ) ); | 742 | mView->viewManager(), SLOT( showNextXView() ) ); |
736 | 743 | ||
737 | icon = loadPixmap( pathString + "whatsnext" ); | 744 | icon = loadPixmap( pathString + "whatsnext" ); |
738 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 ); | 745 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 ); |
739 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); | 746 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); |
740 | whatsnext_action->addTo( viewMenu ); | 747 | whatsnext_action->addTo( viewMenu ); |
741 | connect( whatsnext_action, SIGNAL( activated() ), | 748 | connect( whatsnext_action, SIGNAL( activated() ), |
742 | mView->viewManager(), SLOT( showWhatsNextView() ) ); | 749 | mView->viewManager(), SLOT( showWhatsNextView() ) ); |
743 | 750 | ||
744 | #if 0 | 751 | #if 0 |
745 | action = new QAction( "view_timespan", "Time Span", 0, this ); | 752 | action = new QAction( "view_timespan", "Time Span", 0, this ); |
746 | action->addTo( viewMenu ); | 753 | action->addTo( viewMenu ); |
747 | connect( action, SIGNAL( activated() ), | 754 | connect( action, SIGNAL( activated() ), |
@@ -966,120 +973,124 @@ void MainWindow::initActions() | |||
966 | action->addTo( helpMenu ); | 973 | action->addTo( helpMenu ); |
967 | connect( action, SIGNAL( activated() ), | 974 | connect( action, SIGNAL( activated() ), |
968 | SLOT( about() ) ); | 975 | SLOT( about() ) ); |
969 | //menuBar->insertSeparator(); | 976 | //menuBar->insertSeparator(); |
970 | 977 | ||
971 | // ****************************************************** | 978 | // ****************************************************** |
972 | // menubar icons | 979 | // menubar icons |
973 | 980 | ||
974 | 981 | ||
975 | iconToolBar->setHorizontalStretchable (true ); | 982 | iconToolBar->setHorizontalStretchable (true ); |
976 | //menuBar->insertItem( iconToolBar ); | 983 | //menuBar->insertItem( iconToolBar ); |
977 | //xdays_action | 984 | //xdays_action |
978 | if (p-> mShowIconNewEvent) | 985 | if (p-> mShowIconNewEvent) |
979 | ne_action->addTo( iconToolBar ); | 986 | ne_action->addTo( iconToolBar ); |
980 | if (p->mShowIconNewTodo ) | 987 | if (p->mShowIconNewTodo ) |
981 | nt_action->addTo( iconToolBar ); | 988 | nt_action->addTo( iconToolBar ); |
982 | if (p-> mShowIconSearch) | 989 | if (p-> mShowIconSearch) |
983 | search_action->addTo( iconToolBar ); | 990 | search_action->addTo( iconToolBar ); |
984 | if (p-> mShowIconNext) | 991 | if (p-> mShowIconNext) |
985 | whatsnext_action->addTo( iconToolBar ); | 992 | whatsnext_action->addTo( iconToolBar ); |
986 | if (p-> mShowIconNextDays) | 993 | if (p-> mShowIconNextDays) |
987 | xdays_action->addTo( iconToolBar ); | 994 | xdays_action->addTo( iconToolBar ); |
988 | if (p-> mShowIconList) | 995 | if (p-> mShowIconList) |
989 | showlist_action->addTo( iconToolBar ); | 996 | showlist_action->addTo( iconToolBar ); |
990 | if (p-> mShowIconDay1) | 997 | if (p-> mShowIconDay1) |
991 | day1_action->addTo( iconToolBar ); | 998 | day1_action->addTo( iconToolBar ); |
992 | if (p-> mShowIconDay5) | 999 | if (p-> mShowIconDay5) |
993 | day5_action->addTo( iconToolBar ); | 1000 | day5_action->addTo( iconToolBar ); |
994 | if (p-> mShowIconDay7) | 1001 | if (p-> mShowIconDay7) |
995 | day7_action->addTo( iconToolBar ); | 1002 | day7_action->addTo( iconToolBar ); |
996 | if (p-> mShowIconMonth) | 1003 | if (p-> mShowIconMonth) |
997 | month_action->addTo( iconToolBar ); | 1004 | month_action->addTo( iconToolBar ); |
1005 | if (p-> mShowIconDay6) | ||
1006 | day6_action->addTo( iconToolBar ); | ||
998 | if (p-> mShowIconTodoview) | 1007 | if (p-> mShowIconTodoview) |
999 | todoview_action->addTo( iconToolBar ); | 1008 | todoview_action->addTo( iconToolBar ); |
1000 | if (p-> mShowIconJournal) | 1009 | if (p-> mShowIconJournal) |
1001 | viewjournal_action->addTo( iconToolBar ); | 1010 | viewjournal_action->addTo( iconToolBar ); |
1002 | icon = loadPixmap( pathString + "2leftarrowB" ); | 1011 | icon = loadPixmap( pathString + "2leftarrowB" ); |
1003 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); | 1012 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); |
1004 | if (p-> mShowIconBackFast) { | 1013 | if (p-> mShowIconBackFast) { |
1005 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1014 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1006 | connect( action, SIGNAL( activated() ), | 1015 | connect( action, SIGNAL( activated() ), |
1007 | mView, SLOT( goPreviousMonth() ) ); | 1016 | mView, SLOT( goPreviousMonth() ) ); |
1008 | action->addTo( iconToolBar ); | 1017 | action->addTo( iconToolBar ); |
1009 | } | 1018 | } |
1010 | icon = loadPixmap( pathString + "1leftarrowB" ); | 1019 | icon = loadPixmap( pathString + "1leftarrowB" ); |
1011 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); | 1020 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); |
1012 | if (p-> mShowIconBack) { | 1021 | if (p-> mShowIconBack) { |
1013 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1022 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1014 | connect( action, SIGNAL( activated() ), | 1023 | connect( action, SIGNAL( activated() ), |
1015 | mView, SLOT( goPrevious() ) ); | 1024 | mView, SLOT( goPrevious() ) ); |
1016 | action->addTo( iconToolBar ); | 1025 | action->addTo( iconToolBar ); |
1017 | } | 1026 | } |
1018 | icon = loadPixmap( pathString + "today" ); | 1027 | icon = loadPixmap( pathString + "today" ); |
1019 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); | 1028 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); |
1020 | if (p-> mShowIconToday) | 1029 | if (p-> mShowIconToday) |
1021 | today_action->addTo( iconToolBar ); | 1030 | today_action->addTo( iconToolBar ); |
1022 | icon = loadPixmap( pathString + "1rightarrowB" ); | 1031 | icon = loadPixmap( pathString + "1rightarrowB" ); |
1023 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); | 1032 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); |
1024 | if (p-> mShowIconForward) { | 1033 | if (p-> mShowIconForward) { |
1025 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); | 1034 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); |
1026 | connect( action, SIGNAL( activated() ), | 1035 | connect( action, SIGNAL( activated() ), |
1027 | mView, SLOT( goNext() ) ); | 1036 | mView, SLOT( goNext() ) ); |
1028 | action->addTo( iconToolBar ); | 1037 | action->addTo( iconToolBar ); |
1029 | } | 1038 | } |
1030 | icon = loadPixmap( pathString + "2rightarrowB" ); | 1039 | icon = loadPixmap( pathString + "2rightarrowB" ); |
1031 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); | 1040 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); |
1032 | if (p-> mShowIconForwardFast) { | 1041 | if (p-> mShowIconForwardFast) { |
1033 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); | 1042 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); |
1034 | connect( action, SIGNAL( activated() ), | 1043 | connect( action, SIGNAL( activated() ), |
1035 | mView, SLOT( goNextMonth() ) ); | 1044 | mView, SLOT( goNextMonth() ) ); |
1036 | action->addTo( iconToolBar ); | 1045 | action->addTo( iconToolBar ); |
1037 | } | 1046 | } |
1038 | 1047 | ||
1039 | 1048 | ||
1040 | configureToolBarMenu->insertItem(i18n("What's This?"), 300); | 1049 | configureToolBarMenu->insertItem(i18n("What's This?"), 300); |
1041 | 1050 | ||
1042 | if (p-> mShowIconNewEvent) | 1051 | if (p-> mShowIconNewEvent) |
1043 | configureToolBarMenu->setItemChecked( 10, true ); | 1052 | configureToolBarMenu->setItemChecked( 10, true ); |
1044 | if (p->mShowIconNewTodo ) | 1053 | if (p->mShowIconNewTodo ) |
1045 | configureToolBarMenu->setItemChecked( 20, true ); | 1054 | configureToolBarMenu->setItemChecked( 20, true ); |
1046 | if (p-> mShowIconSearch) | 1055 | if (p-> mShowIconSearch) |
1047 | configureToolBarMenu->setItemChecked( 120, true ); | 1056 | configureToolBarMenu->setItemChecked( 120, true ); |
1048 | if (p-> mShowIconList) | 1057 | if (p-> mShowIconList) |
1049 | configureToolBarMenu->setItemChecked( 30, true ); | 1058 | configureToolBarMenu->setItemChecked( 30, true ); |
1050 | if (p-> mShowIconDay1) | 1059 | if (p-> mShowIconDay1) |
1051 | configureToolBarMenu->setItemChecked( 40, true ); | 1060 | configureToolBarMenu->setItemChecked( 40, true ); |
1052 | if (p-> mShowIconDay5) | 1061 | if (p-> mShowIconDay5) |
1053 | configureToolBarMenu->setItemChecked( 50, true ); | 1062 | configureToolBarMenu->setItemChecked( 50, true ); |
1063 | if (p-> mShowIconDay6) | ||
1064 | configureToolBarMenu->setItemChecked( 75, true ); | ||
1054 | if (p-> mShowIconDay7) | 1065 | if (p-> mShowIconDay7) |
1055 | configureToolBarMenu->setItemChecked( 60, true ); | 1066 | configureToolBarMenu->setItemChecked( 60, true ); |
1056 | if (p-> mShowIconMonth) | 1067 | if (p-> mShowIconMonth) |
1057 | configureToolBarMenu->setItemChecked( 70, true ); | 1068 | configureToolBarMenu->setItemChecked( 70, true ); |
1058 | if (p-> mShowIconTodoview) | 1069 | if (p-> mShowIconTodoview) |
1059 | configureToolBarMenu->setItemChecked( 80, true ); | 1070 | configureToolBarMenu->setItemChecked( 80, true ); |
1060 | if (p-> mShowIconBackFast) | 1071 | if (p-> mShowIconBackFast) |
1061 | configureToolBarMenu->setItemChecked( 200, true ); | 1072 | configureToolBarMenu->setItemChecked( 200, true ); |
1062 | if (p-> mShowIconBack) | 1073 | if (p-> mShowIconBack) |
1063 | configureToolBarMenu->setItemChecked( 210, true ); | 1074 | configureToolBarMenu->setItemChecked( 210, true ); |
1064 | if (p-> mShowIconToday) | 1075 | if (p-> mShowIconToday) |
1065 | configureToolBarMenu->setItemChecked( 130, true ); | 1076 | configureToolBarMenu->setItemChecked( 130, true ); |
1066 | if (p-> mShowIconForward) | 1077 | if (p-> mShowIconForward) |
1067 | configureToolBarMenu->setItemChecked( 220, true ); | 1078 | configureToolBarMenu->setItemChecked( 220, true ); |
1068 | if (p-> mShowIconForwardFast) | 1079 | if (p-> mShowIconForwardFast) |
1069 | configureToolBarMenu->setItemChecked( 230, true ); | 1080 | configureToolBarMenu->setItemChecked( 230, true ); |
1070 | if (p-> mShowIconNextDays) | 1081 | if (p-> mShowIconNextDays) |
1071 | configureToolBarMenu->setItemChecked( 100, true ); | 1082 | configureToolBarMenu->setItemChecked( 100, true ); |
1072 | if (p-> mShowIconNext) | 1083 | if (p-> mShowIconNext) |
1073 | configureToolBarMenu->setItemChecked( 110, true ); | 1084 | configureToolBarMenu->setItemChecked( 110, true ); |
1074 | if (p-> mShowIconJournal) | 1085 | if (p-> mShowIconJournal) |
1075 | configureToolBarMenu->setItemChecked( 90, true ); | 1086 | configureToolBarMenu->setItemChecked( 90, true ); |
1076 | if (p-> mShowIconWhatsThis) | 1087 | if (p-> mShowIconWhatsThis) |
1077 | configureToolBarMenu->setItemChecked( 300, true ); | 1088 | configureToolBarMenu->setItemChecked( 300, true ); |
1078 | 1089 | ||
1079 | QLabel* dummy = new QLabel( iconToolBar ); | 1090 | QLabel* dummy = new QLabel( iconToolBar ); |
1080 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); | 1091 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); |
1081 | if (!p-> mShowIconStretch) | 1092 | if (!p-> mShowIconStretch) |
1082 | iconToolBar->setStretchableWidget ( dummy ) ; | 1093 | iconToolBar->setStretchableWidget ( dummy ) ; |
1083 | else | 1094 | else |
1084 | configureToolBarMenu->setItemChecked( 5, true ); | 1095 | configureToolBarMenu->setItemChecked( 5, true ); |
1085 | if (p-> mShowIconWhatsThis) | 1096 | if (p-> mShowIconWhatsThis) |
@@ -1770,64 +1781,65 @@ void MainWindow::fillFilterMenu() | |||
1770 | while(filter) { | 1781 | while(filter) { |
1771 | selectFilterMenu->insertItem( filter->name(), iii ); | 1782 | selectFilterMenu->insertItem( filter->name(), iii ); |
1772 | if ( filter == curfilter) | 1783 | if ( filter == curfilter) |
1773 | selectFilterMenu->setItemChecked( iii, true ); | 1784 | selectFilterMenu->setItemChecked( iii, true ); |
1774 | if ( disable ) | 1785 | if ( disable ) |
1775 | selectFilterMenu->setItemEnabled( iii, false ); | 1786 | selectFilterMenu->setItemEnabled( iii, false ); |
1776 | filter = fili.next(); | 1787 | filter = fili.next(); |
1777 | ++iii; | 1788 | ++iii; |
1778 | } | 1789 | } |
1779 | } | 1790 | } |
1780 | void MainWindow::selectFilter( int fil ) | 1791 | void MainWindow::selectFilter( int fil ) |
1781 | { | 1792 | { |
1782 | if ( fil == 0 ) { | 1793 | if ( fil == 0 ) { |
1783 | mView->editFilters( ); | 1794 | mView->editFilters( ); |
1784 | } else if ( fil == 1 ){ | 1795 | } else if ( fil == 1 ){ |
1785 | mView->toggleFilerEnabled( ); | 1796 | mView->toggleFilerEnabled( ); |
1786 | } else { | 1797 | } else { |
1787 | mView->selectFilter( fil-2 ); | 1798 | mView->selectFilter( fil-2 ); |
1788 | } | 1799 | } |
1789 | } | 1800 | } |
1790 | void MainWindow::configureToolBar( int item ) | 1801 | void MainWindow::configureToolBar( int item ) |
1791 | { | 1802 | { |
1792 | 1803 | ||
1793 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); | 1804 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); |
1794 | KOPrefs *p = KOPrefs::instance(); | 1805 | KOPrefs *p = KOPrefs::instance(); |
1795 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); | 1806 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); |
1796 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); | 1807 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); |
1797 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); | 1808 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); |
1798 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); | 1809 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); |
1799 | p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); | 1810 | p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); |
1800 | p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); | 1811 | p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); |
1801 | p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); | 1812 | p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); |
1813 | p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); | ||
1802 | p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); | 1814 | p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); |
1803 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); | 1815 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); |
1804 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); | 1816 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); |
1805 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); | 1817 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); |
1806 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); | 1818 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); |
1807 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); | 1819 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); |
1808 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); | 1820 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); |
1809 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); | 1821 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); |
1810 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); | 1822 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); |
1811 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); | 1823 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); |
1812 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); | 1824 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); |
1813 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); | 1825 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); |
1814 | // initActions(); | 1826 | // initActions(); |
1815 | } | 1827 | } |
1816 | 1828 | ||
1817 | void MainWindow::setCaptionToDates() | 1829 | void MainWindow::setCaptionToDates() |
1818 | { | 1830 | { |
1819 | QString selDates; | 1831 | QString selDates; |
1820 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); | 1832 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); |
1821 | if (mView->startDate() < mView->endDate() ) | 1833 | if (mView->startDate() < mView->endDate() ) |
1822 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); | 1834 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); |
1823 | else { | 1835 | else { |
1824 | QString addString; | 1836 | QString addString; |
1825 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) | 1837 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) |
1826 | addString = i18n("Today"); | 1838 | addString = i18n("Today"); |
1827 | else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) | 1839 | else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) |
1828 | addString = i18n("Tomorrow"); | 1840 | addString = i18n("Tomorrow"); |
1829 | if ( !addString.isEmpty() ) | 1841 | if ( !addString.isEmpty() ) |
1830 | selDates = addString+", "+selDates ; | 1842 | selDates = addString+", "+selDates ; |
1831 | } | 1843 | } |
1832 | setCaption( i18n("Dates: ") + selDates ); | 1844 | setCaption( i18n("Dates: ") + selDates ); |
1833 | 1845 | ||