-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 63 |
2 files changed, 37 insertions, 30 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index d5d1f76..d4ec863 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -11,9 +11,11 @@ Fixed some layout problems of the date label size in the month view. | |||
11 | Made month view update faster. | 11 | Made month view update faster. |
12 | Made first datenavigator repainting faster. | 12 | Made first datenavigator repainting faster. |
13 | Changed the title of the event/todo edit dialogs. | 13 | Changed the title of the event/todo edit dialogs. |
14 | Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course). | 14 | Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course). |
15 | Please report, if there are layout problems with the new timelabels. | 15 | Many small usebility fixes in KO/Pi. |
16 | Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi. | ||
17 | The set of possible "next views" are the views you have toolbar buttons for. | ||
16 | 18 | ||
17 | 19 | ||
18 | ********** VERSION 2.0.20 ************ | 20 | ********** VERSION 2.0.20 ************ |
19 | 21 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 24055af..95b836c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -685,14 +685,31 @@ void MainWindow::initActions() | |||
685 | connect( action, SIGNAL( activated() ), | 685 | connect( action, SIGNAL( activated() ), |
686 | mView, SLOT( showDatePicker() ) ); | 686 | mView, SLOT( showDatePicker() ) ); |
687 | action->addTo( iconToolBar ); | 687 | action->addTo( iconToolBar ); |
688 | viewMenu->insertSeparator(); | 688 | viewMenu->insertSeparator(); |
689 | icon = loadPixmap( pathString + "list" ); | 689 | |
690 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); | 690 | |
691 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); | 691 | icon = loadPixmap( pathString + "whatsnext" ); |
692 | showlist_action->addTo( viewMenu ); | 692 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); |
693 | connect( showlist_action, SIGNAL( activated() ), | 693 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); |
694 | mView->viewManager(), SLOT( showListView() ) ); | 694 | whatsnext_action->addTo( viewMenu ); |
695 | connect( whatsnext_action, SIGNAL( activated() ), | ||
696 | mView->viewManager(), SLOT( showWhatsNextView() ) ); | ||
697 | |||
698 | icon = loadPixmap( pathString + "xdays" ); | ||
699 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); | ||
700 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | ||
701 | xdays_action->addTo( viewMenu ); | ||
702 | connect( xdays_action, SIGNAL( activated() ), | ||
703 | mView->viewManager(), SLOT( showNextXView() ) ); | ||
704 | |||
705 | |||
706 | icon = loadPixmap( pathString + "journal" ); | ||
707 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | ||
708 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | ||
709 | viewjournal_action->addTo( viewMenu ); | ||
710 | connect( viewjournal_action, SIGNAL( activated() ), | ||
711 | mView->viewManager(), SLOT( showJournalView() ) ); | ||
695 | 712 | ||
696 | 713 | ||
697 | icon = loadPixmap( pathString + "day" ); | 714 | icon = loadPixmap( pathString + "day" ); |
698 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); | 715 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); |
@@ -729,35 +746,23 @@ void MainWindow::initActions() | |||
729 | month_action->addTo( viewMenu ); | 746 | month_action->addTo( viewMenu ); |
730 | connect( month_action, SIGNAL( activated() ), | 747 | connect( month_action, SIGNAL( activated() ), |
731 | mView->viewManager(), SLOT( showMonthView() ) ); | 748 | mView->viewManager(), SLOT( showMonthView() ) ); |
732 | 749 | ||
750 | icon = loadPixmap( pathString + "list" ); | ||
751 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); | ||
752 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); | ||
753 | showlist_action->addTo( viewMenu ); | ||
754 | connect( showlist_action, SIGNAL( activated() ), | ||
755 | mView->viewManager(), SLOT( showListView() ) ); | ||
756 | |||
733 | icon = loadPixmap( pathString + "todo" ); | 757 | icon = loadPixmap( pathString + "todo" ); |
734 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); | 758 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); |
735 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); | 759 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); |
736 | todoview_action->addTo( viewMenu ); | 760 | todoview_action->addTo( viewMenu ); |
737 | connect( todoview_action, SIGNAL( activated() ), | 761 | connect( todoview_action, SIGNAL( activated() ), |
738 | mView->viewManager(), SLOT( showTodoView() ) ); | 762 | mView->viewManager(), SLOT( showTodoView() ) ); |
739 | 763 | ||
740 | icon = loadPixmap( pathString + "journal" ); | ||
741 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | ||
742 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | ||
743 | viewjournal_action->addTo( viewMenu ); | ||
744 | connect( viewjournal_action, SIGNAL( activated() ), | ||
745 | mView->viewManager(), SLOT( showJournalView() ) ); | ||
746 | |||
747 | icon = loadPixmap( pathString + "xdays" ); | ||
748 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 ); | ||
749 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | ||
750 | xdays_action->addTo( viewMenu ); | ||
751 | connect( xdays_action, SIGNAL( activated() ), | ||
752 | mView->viewManager(), SLOT( showNextXView() ) ); | ||
753 | 764 | ||
754 | icon = loadPixmap( pathString + "whatsnext" ); | ||
755 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 ); | ||
756 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); | ||
757 | whatsnext_action->addTo( viewMenu ); | ||
758 | connect( whatsnext_action, SIGNAL( activated() ), | ||
759 | mView->viewManager(), SLOT( showWhatsNextView() ) ); | ||
760 | 765 | ||
761 | #if 0 | 766 | #if 0 |
762 | action = new QAction( "view_timespan", "Time Span", 0, this ); | 767 | action = new QAction( "view_timespan", "Time Span", 0, this ); |
763 | action->addTo( viewMenu ); | 768 | action->addTo( viewMenu ); |
@@ -814,9 +819,9 @@ void MainWindow::initActions() | |||
814 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); | 819 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); |
815 | 820 | ||
816 | icon = loadPixmap( pathString + "search" ); | 821 | icon = loadPixmap( pathString + "search" ); |
817 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 822 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); |
818 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); | 823 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); |
819 | search_action->addTo( actionMenu ); | 824 | search_action->addTo( actionMenu ); |
820 | connect( search_action, SIGNAL( activated() ), | 825 | connect( search_action, SIGNAL( activated() ), |
821 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | 826 | mView->dialogManager(), SLOT( showSearchDialog() ) ); |
822 | 827 | ||
@@ -1026,17 +1031,17 @@ void MainWindow::initActions() | |||
1026 | if (p-> mShowIconTodoview) | 1031 | if (p-> mShowIconTodoview) |
1027 | todoview_action->addTo( iconToolBar ); | 1032 | todoview_action->addTo( iconToolBar ); |
1028 | 1033 | ||
1029 | icon = loadPixmap( pathString + "2leftarrowB" ); | 1034 | icon = loadPixmap( pathString + "2leftarrowB" ); |
1030 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); | 1035 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); |
1031 | if (p-> mShowIconBackFast) { | 1036 | if (p-> mShowIconBackFast) { |
1032 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1037 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1033 | connect( action, SIGNAL( activated() ), | 1038 | connect( action, SIGNAL( activated() ), |
1034 | mView, SLOT( goPreviousMonth() ) ); | 1039 | mView, SLOT( goPreviousMonth() ) ); |
1035 | action->addTo( iconToolBar ); | 1040 | action->addTo( iconToolBar ); |
1036 | } | 1041 | } |
1037 | icon = loadPixmap( pathString + "1leftarrowB" ); | 1042 | icon = loadPixmap( pathString + "1leftarrowB" ); |
1038 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); | 1043 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); |
1039 | if (p-> mShowIconBack) { | 1044 | if (p-> mShowIconBack) { |
1040 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1045 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1041 | connect( action, SIGNAL( activated() ), | 1046 | connect( action, SIGNAL( activated() ), |
1042 | mView, SLOT( goPrevious() ) ); | 1047 | mView, SLOT( goPrevious() ) ); |
@@ -1063,9 +1068,9 @@ void MainWindow::initActions() | |||
1063 | action->addTo( iconToolBar ); | 1068 | action->addTo( iconToolBar ); |
1064 | } | 1069 | } |
1065 | 1070 | ||
1066 | 1071 | ||
1067 | configureToolBarMenu->insertItem(i18n("What's This?"), 300); | 1072 | configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); |
1068 | 1073 | ||
1069 | if (p-> mShowIconNewEvent) | 1074 | if (p-> mShowIconNewEvent) |
1070 | configureToolBarMenu->setItemChecked( 10, true ); | 1075 | configureToolBarMenu->setItemChecked( 10, true ); |
1071 | if (p->mShowIconNewTodo ) | 1076 | if (p->mShowIconNewTodo ) |