-rw-r--r-- | korganizer/calendarview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3908dbb..47cd488 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1970,49 +1970,52 @@ void CalendarView::writeFilterSettings(KConfig *config) | |||
1970 | // kdDebug() << "CalendarView::writeFilterSettings()" << endl; | 1970 | // kdDebug() << "CalendarView::writeFilterSettings()" << endl; |
1971 | 1971 | ||
1972 | QStringList filterList; | 1972 | QStringList filterList; |
1973 | 1973 | ||
1974 | CalFilter *filter = mFilters.first(); | 1974 | CalFilter *filter = mFilters.first(); |
1975 | while(filter) { | 1975 | while(filter) { |
1976 | // kdDebug() << " fn: " << filter->name() << endl; | 1976 | // kdDebug() << " fn: " << filter->name() << endl; |
1977 | filterList << filter->name(); | 1977 | filterList << filter->name(); |
1978 | config->setGroup("Filter_" + filter->name()); | 1978 | config->setGroup("Filter_" + filter->name()); |
1979 | config->writeEntry("Criteria",filter->criteria()); | 1979 | config->writeEntry("Criteria",filter->criteria()); |
1980 | config->writeEntry("CategoryList",filter->categoryList()); | 1980 | config->writeEntry("CategoryList",filter->categoryList()); |
1981 | filter = mFilters.next(); | 1981 | filter = mFilters.next(); |
1982 | } | 1982 | } |
1983 | config->setGroup("General"); | 1983 | config->setGroup("General"); |
1984 | config->writeEntry("CalendarFilters",filterList); | 1984 | config->writeEntry("CalendarFilters",filterList); |
1985 | 1985 | ||
1986 | config->setGroup("FilterView"); | 1986 | config->setGroup("FilterView"); |
1987 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); | 1987 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); |
1988 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); | 1988 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); |
1989 | } | 1989 | } |
1990 | 1990 | ||
1991 | 1991 | ||
1992 | void CalendarView::goToday() | 1992 | void CalendarView::goToday() |
1993 | { | 1993 | { |
1994 | mNavigator->selectToday(); | 1994 | if ( mViewManager->currentView()->isMonthView() ) |
1995 | mNavigator->selectTodayMonth(); | ||
1996 | else | ||
1997 | mNavigator->selectToday(); | ||
1995 | } | 1998 | } |
1996 | 1999 | ||
1997 | void CalendarView::goNext() | 2000 | void CalendarView::goNext() |
1998 | { | 2001 | { |
1999 | mNavigator->selectNext(); | 2002 | mNavigator->selectNext(); |
2000 | } | 2003 | } |
2001 | 2004 | ||
2002 | void CalendarView::goPrevious() | 2005 | void CalendarView::goPrevious() |
2003 | { | 2006 | { |
2004 | mNavigator->selectPrevious(); | 2007 | mNavigator->selectPrevious(); |
2005 | } | 2008 | } |
2006 | void CalendarView::goNextMonth() | 2009 | void CalendarView::goNextMonth() |
2007 | { | 2010 | { |
2008 | mNavigator->selectNextMonth(); | 2011 | mNavigator->selectNextMonth(); |
2009 | } | 2012 | } |
2010 | 2013 | ||
2011 | void CalendarView::goPreviousMonth() | 2014 | void CalendarView::goPreviousMonth() |
2012 | { | 2015 | { |
2013 | mNavigator->selectPreviousMonth(); | 2016 | mNavigator->selectPreviousMonth(); |
2014 | } | 2017 | } |
2015 | void CalendarView::writeLocale() | 2018 | void CalendarView::writeLocale() |
2016 | { | 2019 | { |
2017 | //KPimGlobalPrefs::instance()->setGlobalConfig(); | 2020 | //KPimGlobalPrefs::instance()->setGlobalConfig(); |
2018 | #if 0 | 2021 | #if 0 |