-rw-r--r-- | korganizer/calendarview.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9c10ba6..12af655 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -336,13 +336,14 @@ void CalendarView::init() | |||
336 | mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); | 336 | mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() ); |
337 | leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); | 337 | leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() ); |
338 | } else { | 338 | } else { |
339 | mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); | 339 | mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() ); |
340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); | 340 | leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() ); |
341 | } | 341 | } |
342 | 342 | if ( !KOPrefs::instance()->mShowDateNavigator) | |
343 | mDateNavigator->hide(); | ||
343 | //qDebug("Calendarview Size %d %d ", width(), height()); | 344 | //qDebug("Calendarview Size %d %d ", width(), height()); |
344 | #endif | 345 | #endif |
345 | 346 | ||
346 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 347 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
347 | SLOT( showDates( const KCal::DateList & ) ) ); | 348 | SLOT( showDates( const KCal::DateList & ) ) ); |
348 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), | 349 | connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ), |
@@ -2165,16 +2166,16 @@ void CalendarView::updateView(const QDate &start, const QDate &end) | |||
2165 | } | 2166 | } |
2166 | 2167 | ||
2167 | void CalendarView::updateView() | 2168 | void CalendarView::updateView() |
2168 | { | 2169 | { |
2169 | DateList tmpList = mNavigator->selectedDates(); | 2170 | DateList tmpList = mNavigator->selectedDates(); |
2170 | 2171 | ||
2171 | // We assume that the navigator only selects consecutive days. | ||
2172 | updateView( tmpList.first(), tmpList.last() ); | ||
2173 | if ( KOPrefs::instance()->mHideNonStartedTodos ) | 2172 | if ( KOPrefs::instance()->mHideNonStartedTodos ) |
2174 | mTodoList->updateView(); | 2173 | mTodoList->updateView(); |
2174 | // We assume that the navigator only selects consecutive days. | ||
2175 | updateView( tmpList.first(), tmpList.last() ); | ||
2175 | } | 2176 | } |
2176 | 2177 | ||
2177 | void CalendarView::updateUnmanagedViews() | 2178 | void CalendarView::updateUnmanagedViews() |
2178 | { | 2179 | { |
2179 | mDateNavigator->updateDayMatrix(); | 2180 | mDateNavigator->updateDayMatrix(); |
2180 | } | 2181 | } |
@@ -3606,13 +3607,14 @@ DateNavigator *CalendarView::dateNavigator() | |||
3606 | KDateNavigator* CalendarView::dateNavigatorWidget() | 3607 | KDateNavigator* CalendarView::dateNavigatorWidget() |
3607 | { | 3608 | { |
3608 | return mDateNavigator; | 3609 | return mDateNavigator; |
3609 | } | 3610 | } |
3610 | void CalendarView::toggleDateNavigatorWidget() | 3611 | void CalendarView::toggleDateNavigatorWidget() |
3611 | { | 3612 | { |
3612 | if (mDateNavigator->isVisible()) | 3613 | KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ; |
3614 | if (!KOPrefs::instance()->mShowDateNavigator ) | ||
3613 | mDateNavigator->hide(); | 3615 | mDateNavigator->hide(); |
3614 | else | 3616 | else |
3615 | mDateNavigator->show(); | 3617 | mDateNavigator->show(); |
3616 | } | 3618 | } |
3617 | void CalendarView::addView(KOrg::BaseView *view) | 3619 | void CalendarView::addView(KOrg::BaseView *view) |
3618 | { | 3620 | { |