many fixes

1 files changed, 12 insertions, 10 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 09a0880..d98915b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1440,4 +1440,6 @@ void MainWindow::keyBindings()
     QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
         i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
+        i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") +
+        i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") +
         i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
         i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
@@ -1445,5 +1447,5 @@ void MainWindow::keyBindings()
         i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
         i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
-        i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
+        i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+
         i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
         i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
@@ -1452,5 +1454,5 @@ void MainWindow::keyBindings()
         i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
         i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
-        i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
+        i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+
         i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
         i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
@@ -1901,10 +1903,5 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
         break;
     case Qt::Key_N:
-        if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
-            mView->viewManager()->showNextView();
-        else {
-            mView->viewManager()->showNextXView();
-            showSelectedDates = true;
-        }
+        mView->viewManager()->showNextView();
         break;
     case Qt::Key_V:
@@ -1923,6 +1920,11 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
             mView->toggleFilter();
         break;
-    case Qt::Key_X:
-        mView->toggleDateNavigatorWidget();
+    case Qt::Key_X: 
+        if ( e->state() == Qt::ControlButton )
+            mView->toggleDateNavigatorWidget();
+        else {
+            mView->viewManager()->showNextXView();
+            showSelectedDates = true;
+        }
         break;
     case Qt::Key_Space: