| -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 @@ -338,9 +338,10 @@ void CalendarView::init() } else { mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); } - + if ( !KOPrefs::instance()->mShowDateNavigator) + mDateNavigator->hide(); //qDebug("Calendarview Size %d %d ", width(), height()); #endif connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), @@ -2167,12 +2168,12 @@ void CalendarView::updateView(const QDate &start, const QDate &end) void CalendarView::updateView() { DateList tmpList = mNavigator->selectedDates(); - // 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() ); } void CalendarView::updateUnmanagedViews() { @@ -3608,9 +3609,10 @@ KDateNavigator* CalendarView::dateNavigatorWidget() return mDateNavigator; } void CalendarView::toggleDateNavigatorWidget() { - if (mDateNavigator->isVisible()) + KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; + if (!KOPrefs::instance()->mShowDateNavigator ) mDateNavigator->hide(); else mDateNavigator->show(); } diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 0a767b6..4b26058 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -213,8 +213,9 @@ KOPrefs::KOPrefs() : KPrefs::setCurrentGroup("Views"); + addItemBool("Show Date Navigator",&mShowDateNavigator,true); addItemInt("Hour Size",&mHourSize,8); addItemBool("Show Daily Recurrences",&mDailyRecur,true); addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 69722a1..b3acda7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -244,8 +244,10 @@ class KOPrefs : public KPimPrefs bool mHightlightDateTimeEdit; bool mShortDateInViewer; + bool mShowDateNavigator; + QStringList mLocationDefaults; QStringList mEventSummaryUser; QStringList mTodoSummaryUser; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5ec7ddd..151b55b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1637,20 +1637,22 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) void MainWindow::fillFilterMenu() { selectFilterMenu->clear(); 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; } selectFilterMenu->insertSeparator(); QPtrList<CalFilter> fili = mView->filters(); CalFilter *curfilter = mView->filterView()->selectedFilter(); CalFilter *filter = fili.first(); - int iii = 1; + int iii = 2; while(filter) { selectFilterMenu->insertItem( filter->name(), iii ); if ( filter == curfilter) selectFilterMenu->setItemChecked( iii, true ); @@ -1662,11 +1664,13 @@ void MainWindow::fillFilterMenu() } 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 ); } } void MainWindow::configureToolBar( int item ) { |