-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1638,18 +1638,20 @@ void MainWindow::fillFilterMenu() | |||
1638 | { | 1638 | { |
1639 | selectFilterMenu->clear(); | 1639 | selectFilterMenu->clear(); |
1640 | bool disable = false; | 1640 | bool disable = false; |
1641 | selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); | ||
1642 | selectFilterMenu->insertSeparator(); | ||
1641 | if ( mView->filterView()->filtersEnabled() ) { | 1643 | if ( mView->filterView()->filtersEnabled() ) { |
1642 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 ); | 1644 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 1 ); |
1643 | } | 1645 | } |
1644 | else { | 1646 | else { |
1645 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 ); | 1647 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 1 ); |
1646 | disable = true; | 1648 | disable = true; |
1647 | } | 1649 | } |
1648 | selectFilterMenu->insertSeparator(); | 1650 | selectFilterMenu->insertSeparator(); |
1649 | QPtrList<CalFilter> fili = mView->filters(); | 1651 | QPtrList<CalFilter> fili = mView->filters(); |
1650 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 1652 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
1651 | CalFilter *filter = fili.first(); | 1653 | CalFilter *filter = fili.first(); |
1652 | int iii = 1; | 1654 | int iii = 2; |
1653 | while(filter) { | 1655 | while(filter) { |
1654 | selectFilterMenu->insertItem( filter->name(), iii ); | 1656 | selectFilterMenu->insertItem( filter->name(), iii ); |
1655 | if ( filter == curfilter) | 1657 | if ( filter == curfilter) |
@@ -1663,9 +1665,11 @@ void MainWindow::fillFilterMenu() | |||
1663 | void MainWindow::selectFilter( int fil ) | 1665 | void MainWindow::selectFilter( int fil ) |
1664 | { | 1666 | { |
1665 | if ( fil == 0 ) { | 1667 | if ( fil == 0 ) { |
1668 | mView->editFilters( ); | ||
1669 | } else if ( fil == 1 ){ | ||
1666 | mView->toggleFilerEnabled( ); | 1670 | mView->toggleFilerEnabled( ); |
1667 | } else { | 1671 | } else { |
1668 | mView->selectFilter( fil-1 ); | 1672 | mView->selectFilter( fil-2 ); |
1669 | } | 1673 | } |
1670 | } | 1674 | } |
1671 | void MainWindow::configureToolBar( int item ) | 1675 | void MainWindow::configureToolBar( int item ) |