summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--korganizer/mainwindow.cpp24
2 files changed, 20 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 21f5b2f..6c4cb7b 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,15 +1,18 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.0 ************ 3********** VERSION 2.0.0 ************
4 4
5Stable release 2.0.0!
6
5KO/Pi: 7KO/Pi:
6Fixed problem in edit dialog recreation at startup. 8Fixed problem in edit dialog recreation at startup.
7Made "toggle view*" menu items enabled context sensitive. 9Made "toggle view*" menu items enabled context sensitive.
8Changed agenda size menu to items 1-10. 10Changed agenda size menu to items 1-10.
9Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. 11Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
12Usebility enhancements in the KO/Pi menus.
10OM/Pi: 13OM/Pi:
11Added three info lines to display subject, from and to of selected mails. 14Added three info lines to display subject, from and to of selected mails.
12 15
13********** VERSION 1.9.20 ************ 16********** VERSION 1.9.20 ************
14 17
15KO/Pi: 18KO/Pi:
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 950d2ec..3feb4ab 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -520,14 +520,19 @@ void MainWindow::initActions()
520 if ( KOPrefs::instance()->mShowFullMenu ) { 520 if ( KOPrefs::instance()->mShowFullMenu ) {
521 QMenuBar *menuBar1; 521 QMenuBar *menuBar1;
522 menuBar1 = menuBar(); 522 menuBar1 = menuBar();
523 menuBar1->insertItem( i18n("File"), importMenu ); 523 menuBar1->insertItem( i18n("File"), importMenu );
524 menuBar1->insertItem( i18n("View"), viewMenu ); 524 menuBar1->insertItem( i18n("View"), viewMenu );
525 menuBar1->insertItem( i18n("Actions"), actionMenu ); 525 menuBar1->insertItem( i18n("Actions"), actionMenu );
526#ifdef DESKTOP_VERSION
526 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 527 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
527 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 528 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
529#else
530 menuBar1->insertItem( i18n("Sync"), syncMenu );
531 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu );
532#endif
528 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 533 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
529 menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); 534 menuBar1->insertItem( i18n("Filter"),selectFilterMenu );
530 menuBar1->insertItem( i18n("Help"), helpMenu ); 535 menuBar1->insertItem( i18n("Help"), helpMenu );
531 } else { 536 } else {
532 QPEMenuBar *menuBar1; 537 QPEMenuBar *menuBar1;
533 menuBar1 = new QPEMenuBar( iconToolBar ); 538 menuBar1 = new QPEMenuBar( iconToolBar );
@@ -593,12 +598,20 @@ void MainWindow::initActions()
593 icon = loadPixmap( pathString + "newtodo" ); 598 icon = loadPixmap( pathString + "newtodo" );
594 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 599 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
595 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 600 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
596 nt_action->addTo( actionMenu ); 601 nt_action->addTo( actionMenu );
597 connect( nt_action, SIGNAL( activated() ), 602 connect( nt_action, SIGNAL( activated() ),
598 mView, SLOT( newTodo() ) ); 603 mView, SLOT( newTodo() ) );
604
605 icon = loadPixmap( pathString + "today" );
606 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
607 today_action->addTo( viewMenu );
608 connect( today_action, SIGNAL( activated() ),
609 mView, SLOT( goToday() ) );
610 viewMenu->insertSeparator();
611
599 icon = loadPixmap( pathString + "navi" ); 612 icon = loadPixmap( pathString + "navi" );
600 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 613 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
601 action->addTo( viewMenu ); 614 action->addTo( viewMenu );
602 connect( action, SIGNAL( activated() ), 615 connect( action, SIGNAL( activated() ),
603 mView, SLOT( toggleDateNavigatorWidget() ) ); 616 mView, SLOT( toggleDateNavigatorWidget() ) );
604 mToggleNav = action ; 617 mToggleNav = action ;
@@ -755,18 +768,13 @@ void MainWindow::initActions()
755 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 768 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
756 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); 769 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4);
757 search_action->addTo( actionMenu ); 770 search_action->addTo( actionMenu );
758 connect( search_action, SIGNAL( activated() ), 771 connect( search_action, SIGNAL( activated() ),
759 mView->dialogManager(), SLOT( showSearchDialog() ) ); 772 mView->dialogManager(), SLOT( showSearchDialog() ) );
760 773
761 icon = loadPixmap( pathString + "today" ); 774
762 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
763 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
764 today_action->addTo( actionMenu );
765 connect( today_action, SIGNAL( activated() ),
766 mView, SLOT( goToday() ) );
767 775
768 if ( KOPrefs::instance()->mShowFullMenu ) { 776 if ( KOPrefs::instance()->mShowFullMenu ) {
769 actionMenu->insertSeparator(); 777 actionMenu->insertSeparator();
770 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 778 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
771 779
772 } 780 }
@@ -971,13 +979,15 @@ void MainWindow::initActions()
971 configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); 979 configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15);
972 if (p-> mShowIconBack) { 980 if (p-> mShowIconBack) {
973 action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); 981 action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
974 connect( action, SIGNAL( activated() ), 982 connect( action, SIGNAL( activated() ),
975 mView, SLOT( goPrevious() ) ); 983 mView, SLOT( goPrevious() ) );
976 action->addTo( iconToolBar ); 984 action->addTo( iconToolBar );
977 } 985 }
986 icon = loadPixmap( pathString + "today" );
987 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
978 if (p-> mShowIconToday) 988 if (p-> mShowIconToday)
979 today_action->addTo( iconToolBar ); 989 today_action->addTo( iconToolBar );
980 icon = loadPixmap( pathString + "1rightarrowB" ); 990 icon = loadPixmap( pathString + "1rightarrowB" );
981 configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); 991 configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
982 if (p-> mShowIconForward) { 992 if (p-> mShowIconForward) {
983 action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); 993 action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );