1 files changed, 20 insertions, 15 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 9720146..ba97fa6 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -48,4 +48,7 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
   //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
   mLastDisplayedDN = 0;
+  mUpdateTimer; 
+  mUpdateTimer = new QTimer( this );
+  connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
 }
 
@@ -136,7 +139,22 @@ void DateNavigatorContainer::setCalendar( Calendar *cal )
   }
 }
-void DateNavigatorContainer::updateDayMatrixDates()
+void DateNavigatorContainer::checkUpdateDayMatrixDates()
 { 
+    QDate last = lastAvailableDate();
+    QDate first = firstAvailableDate();
 
+    QDate selFirst = mFirstSelectedDate;
+    QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
+    if ( selFirst >= first && selLast <= last ) {
+        updateDayMatrixDates();
+    }
+    else {
+        updateDayMatrixDates();
+        emit monthSelected( mFirstSelectedDate.month() );
+    }
+}
+void DateNavigatorContainer::updateDayMatrixDates()
+{ 
+    mUpdateTimer->stop();
     QDate fDate =  mFirstSelectedDate;
     QDate lDate =  fDate.addDays( mSelectedDateCount - 1 );
@@ -219,18 +237,4 @@ void DateNavigatorContainer::selectDates( const DateList &dateList )
     QDate fDate =  dateList.first();
     QDate lDate =  dateList.last();
-    if ( mLastDisplayedDN <= 2  ) {
-        mNavigatorView->selectDates( dateList );
-        KDateNavigator *view = mExtraViews.at( 0 );
-        QDate bDate = fDate.addDays( fDate.daysInMonth () - fDate.day() +1 );
-        view->setBaseDate( bDate, false );
-        view->dayMatrix()->setSelectedDaysFrom(fDate , lDate);
-        if ( mLastDisplayedDN == 2  ) {
-            view = mExtraViews.at( 1 );
-            bDate = bDate.addDays( bDate.daysInMonth () - bDate.day() +1 );
-            view->setBaseDate( bDate, false );
-            view->dayMatrix()->setSelectedDaysFrom(fDate , lDate);
-        }
-        return;
-    }
     //qDebug("%s %s  ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1()  );
     //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
@@ -373,4 +377,5 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
         y * height, width, height );
   }
+  mUpdateTimer->start( 250 );
   //updateDayMatrixDates();
 }