author | zautrix <zautrix> | 2005-02-16 22:08:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-16 22:08:18 (UTC) |
commit | 451b4de59893b5c0801a7bbb2f8cbe8e0266b324 (patch) (unidiff) | |
tree | ce3f535541583d37cfe951ddd8d7474770d9c374 /korganizer/mainwindow.cpp | |
parent | b2cf8e9a08082539e0a5578a98766e5990783f9a (diff) | |
download | kdepimpi-451b4de59893b5c0801a7bbb2f8cbe8e0266b324.zip kdepimpi-451b4de59893b5c0801a7bbb2f8cbe8e0266b324.tar.gz kdepimpi-451b4de59893b5c0801a7bbb2f8cbe8e0266b324.tar.bz2 |
month view fixes
-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 | |||
@@ -700,32 +700,39 @@ void MainWindow::initActions() | |||
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 ); |
@@ -982,32 +989,34 @@ void MainWindow::initActions() | |||
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 ); |
@@ -1038,32 +1047,34 @@ void MainWindow::initActions() | |||
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 ); |
@@ -1786,32 +1797,33 @@ void MainWindow::selectFilter( int fil ) | |||
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() |