-rw-r--r-- | korganizer/mainwindow.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 0cb0bce..95e1607 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -787,7 +787,8 @@ void MainWindow::initActions() | |||
787 | mToggleNav = action ; | 787 | mToggleNav = action ; |
788 | icon = loadPixmap( pathString + "filter" ); | 788 | icon = loadPixmap( pathString + "filter" ); |
789 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); | 789 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); |
790 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); | 790 | icon = loadPixmap( pathString + "configure" ); |
791 | action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); | ||
791 | action->addTo( viewMenu ); | 792 | action->addTo( viewMenu ); |
792 | connect( action, SIGNAL( activated() ), | 793 | connect( action, SIGNAL( activated() ), |
793 | mView, SLOT( toggleFilter() ) ); | 794 | mView, SLOT( toggleFilter() ) ); |
@@ -1488,7 +1489,7 @@ void MainWindow::keyBindings() | |||
1488 | i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + | 1489 | i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + |
1489 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + | 1490 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + |
1490 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ | 1491 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ |
1491 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ | 1492 | i18n("<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n")+ |
1492 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ | 1493 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ |
1493 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ | 1494 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ |
1494 | i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ | 1495 | i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ |
@@ -1987,10 +1988,10 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1987 | mView->showDatePicker( ); | 1988 | mView->showDatePicker( ); |
1988 | break; | 1989 | break; |
1989 | case Qt::Key_F: | 1990 | case Qt::Key_F: |
1990 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1991 | mView->editFilters(); |
1991 | mView->editFilters(); | 1992 | break; |
1992 | else | 1993 | case Qt::Key_R: |
1993 | mView->toggleFilter(); | 1994 | mView->toggleFilter(); |
1994 | break; | 1995 | break; |
1995 | case Qt::Key_X: | 1996 | case Qt::Key_X: |
1996 | if ( e->state() == Qt::ControlButton ) | 1997 | if ( e->state() == Qt::ControlButton ) |