| -rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 12 |
4 files changed, 17 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9c10ba6..12af655 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -341,3 +341,4 @@ void CalendarView::init() } - + if ( !KOPrefs::instance()->mShowDateNavigator) + mDateNavigator->hide(); //qDebug("Calendarview Size %d %d ", width(), height()); @@ -2170,6 +2171,6 @@ void CalendarView::updateView() - // We assume that the navigator only selects consecutive days. - updateView( tmpList.first(), tmpList.last() ); if ( KOPrefs::instance()->mHideNonStartedTodos ) mTodoList->updateView(); + // We assume that the navigator only selects consecutive days. + updateView( tmpList.first(), tmpList.last() ); } @@ -3611,3 +3612,4 @@ void CalendarView::toggleDateNavigatorWidget() { - if (mDateNavigator->isVisible()) + KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; + if (!KOPrefs::instance()->mShowDateNavigator ) mDateNavigator->hide(); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0a767b6..4b26058 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -216,2 +216,3 @@ KOPrefs::KOPrefs() : KPrefs::setCurrentGroup("Views"); + addItemBool("Show Date Navigator",&mShowDateNavigator,true); addItemInt("Hour Size",&mHourSize,8); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 69722a1..b3acda7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -247,2 +247,4 @@ class KOPrefs : public KPimPrefs + bool mShowDateNavigator; + QStringList mLocationDefaults; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1640,7 +1640,9 @@ void MainWindow::fillFilterMenu() bool disable = false; + selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); + selectFilterMenu->insertSeparator(); if ( mView->filterView()->filtersEnabled() ) { - selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 0 ); + selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 1 ); } else { - selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 0 ); + selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 1 ); disable = true; @@ -1651,3 +1653,3 @@ void MainWindow::fillFilterMenu() CalFilter *filter = fili.first(); - int iii = 1; + int iii = 2; while(filter) { @@ -1665,5 +1667,7 @@ void MainWindow::selectFilter( int fil ) if ( fil == 0 ) { + mView->editFilters( ); + } else if ( fil == 1 ){ mView->toggleFilerEnabled( ); } else { - mView->selectFilter( fil-1 ); + mView->selectFilter( fil-2 ); } |