| -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 @@ -13,5 +13,7 @@ Made first datenavigator repainting faster. Changed the title of the event/todo edit dialogs. Timelabels in agenga changed from 22:00 to 22 oo. ( the oo higher, of course). -Please report, if there are layout problems with the new timelabels. +Many small usebility fixes in KO/Pi. +Pressing the "Calendar" button on the Z switches now to the next view in KO/Pi. +The set of possible "next views" are the views you have toolbar buttons for. diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 24055af..95b836c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -687,10 +687,27 @@ void MainWindow::initActions() action->addTo( iconToolBar ); viewMenu->insertSeparator(); - icon = loadPixmap( pathString + "list" ); - configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); - QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); - showlist_action->addTo( viewMenu ); - connect( showlist_action, SIGNAL( activated() ), - mView->viewManager(), SLOT( showListView() ) ); + + + icon = loadPixmap( pathString + "whatsnext" ); + configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); + QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); + whatsnext_action->addTo( viewMenu ); + connect( whatsnext_action, SIGNAL( activated() ), + mView->viewManager(), SLOT( showWhatsNextView() ) ); + + icon = loadPixmap( pathString + "xdays" ); + configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); + QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); + xdays_action->addTo( viewMenu ); + connect( xdays_action, SIGNAL( activated() ), + mView->viewManager(), SLOT( showNextXView() ) ); + + + icon = loadPixmap( pathString + "journal" ); + configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); + QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); + viewjournal_action->addTo( viewMenu ); + connect( viewjournal_action, SIGNAL( activated() ), + mView->viewManager(), SLOT( showJournalView() ) ); @@ -731,4 +748,11 @@ void MainWindow::initActions() mView->viewManager(), SLOT( showMonthView() ) ); + icon = loadPixmap( pathString + "list" ); + configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); + QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); + showlist_action->addTo( viewMenu ); + connect( showlist_action, SIGNAL( activated() ), + mView->viewManager(), SLOT( showListView() ) ); + icon = loadPixmap( pathString + "todo" ); configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); @@ -738,24 +762,5 @@ void MainWindow::initActions() mView->viewManager(), SLOT( showTodoView() ) ); - icon = loadPixmap( pathString + "journal" ); - configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); - QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); - viewjournal_action->addTo( viewMenu ); - connect( viewjournal_action, SIGNAL( activated() ), - mView->viewManager(), SLOT( showJournalView() ) ); - - icon = loadPixmap( pathString + "xdays" ); - configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 ); - QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); - xdays_action->addTo( viewMenu ); - connect( xdays_action, SIGNAL( activated() ), - mView->viewManager(), SLOT( showNextXView() ) ); - icon = loadPixmap( pathString + "whatsnext" ); - configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 ); - QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); - whatsnext_action->addTo( viewMenu ); - connect( whatsnext_action, SIGNAL( activated() ), - mView->viewManager(), SLOT( showWhatsNextView() ) ); #if 0 @@ -816,5 +821,5 @@ void MainWindow::initActions() icon = loadPixmap( pathString + "search" ); QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); - configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); + configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); search_action->addTo( actionMenu ); connect( search_action, SIGNAL( activated() ), @@ -1028,5 +1033,5 @@ void MainWindow::initActions() icon = loadPixmap( pathString + "2leftarrowB" ); - configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); + configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); if (p-> mShowIconBackFast) { action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); @@ -1036,5 +1041,5 @@ void MainWindow::initActions() } icon = loadPixmap( pathString + "1leftarrowB" ); - configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); + configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); if (p-> mShowIconBack) { action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); @@ -1065,5 +1070,5 @@ void MainWindow::initActions() - configureToolBarMenu->insertItem(i18n("What's This?"), 300); + configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); if (p-> mShowIconNewEvent) |