3 files changed, 98 insertions, 24 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index bb27bce..6de7c45 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -37,25 +37,24 @@
 
 DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
                                                 const char *name )
   : QWidget( parent, name ), mCalendar( 0 ),
     mHorizontalCount( 1 ), mVerticalCount( 1 )
 {
   mExtraViews.setAutoDelete( true );
 
   mNavigatorView = new KDateNavigator( this, name );
 
   connectNavigatorView( mNavigatorView );
   //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
-  mDisplayedEndDate = QDate::currentDate();
   mLastDisplayedDN = 0;
 }
 
 DateNavigatorContainer::~DateNavigatorContainer()
 {
 }
 
 void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 {
   connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ),
            SIGNAL( datesSelected( const KCal::DateList & ) ) );
 #if 0
@@ -66,36 +65,99 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 #endif
   connect( v, SIGNAL( weekClicked( const QDate & ) ),
            SIGNAL( weekClicked( const QDate & ) ) );
 
   connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) );
   connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) );
 
   connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) );
   connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) );
   connect( v, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) );
   connect( v, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) );
 
-  connect( v, SIGNAL( monthSelected( int ) ), SIGNAL( monthSelected( int ) ) );
+  connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
 }
 
+void DateNavigatorContainer::slotMonthSelected( int month )
+{
+    //qDebug("slotMonthSelected %d ", month);
+    QDate baseDate = mNavigatorView->baseDate();
+    if ( baseDate.month() == month )
+        return;
+    //qDebug("month %d %d  ",baseDate.month(),month);
+    QDate date = QDate (  baseDate.year(), baseDate.month() , 15 );
+    date = date.addDays( -(baseDate.month()-month ) *30 );
+    QDate newBase = QDate (  date.year(), date.month() , baseDate.day() ); 
+    
+#if 0
+    mFirstSelectedDate = dateList.first() ;
+    mSelectedDateCount = dateList.count() ;
+
+  KDateNavigator *view = mExtraViews.at( 0 );
+    QDate date = view->baseDate();
+    
+    QDate curEnd = date.addDays( (mLastDisplayedDN)*30 +7);
+    //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
+    if ( lDate < curEnd  && date.addDays( -30 ) <  fDate) {
+        mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
+        mNavigatorView->dayMatrix()->repaint( false );
+        for( uint i = 0; i < mLastDisplayedDN; ++i ) {
+            KDateNavigator *n = mExtraViews.at( i );
+            if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
+                n->dayMatrix()->repaint( false );
+            }
+        }
+        return;
+    }
+#endif
+    //qDebug("NEW BASE %s", newBase.toString().latin1());
+    mNavigatorView->setBaseDate( newBase );
+    QDate last = lastAvailableDate();
+    QDate first = firstAvailableDate();
+
+    QDate selFirst = mFirstSelectedDate;
+    QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
+    if ( selFirst >= first && selLast <= last ) {
+        setBaseDates();
+        updateDayMatrixDates();
+    }
+    else {
+        setBaseDates();
+        updateDayMatrixDates();
+        emit monthSelected( month );
+    }
+}
 void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
   mNavigatorView->setCalendar( cal );
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->setCalendar( cal );
   }
 }
+void DateNavigatorContainer::updateDayMatrixDates()
+{ 
+
+    QDate fDate =  mFirstSelectedDate;
+    QDate lDate =  fDate.addDays( mSelectedDateCount - 1 );
+    mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
+    mNavigatorView->dayMatrix()->repaint( false );
+    for( uint i = 0; i < mLastDisplayedDN; ++i ) {
+        KDateNavigator *n = mExtraViews.at( i );
+        if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
+            n->dayMatrix()->repaint( false );
+        }
+    }
+}
 
 void DateNavigatorContainer::updateDayMatrix()
 {
   mNavigatorView->updateDayMatrix();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->updateDayMatrix();
   }
 }
 
 void DateNavigatorContainer::updateToday()
 {
@@ -117,90 +179,96 @@ void DateNavigatorContainer::updateView()
       n->updateView();
   }
 }
 
 void DateNavigatorContainer::updateConfig()
 {
   mNavigatorView->updateConfig();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->updateConfig();
   }
 }
-
+QDate DateNavigatorContainer::lastAvailableDate() const 
+{
+    QDate date = mNavigatorView->baseDate();
+    QDate last = QDate ( date.year(), date.month(), date.daysInMonth() );
+    int iii = mLastDisplayedDN;
+    if ( mLastDisplayedDN )
+        last = last.addDays( 1);
+    while ( iii ) {
+        last = last.addDays( last.daysInMonth ());
+        //qDebug("DATE %s   ", last.toString().latin1() );
+        --iii;
+    }
+    if ( mLastDisplayedDN )
+        last = last.addDays( -1);
+    return last;
+}
+QDate DateNavigatorContainer::firstAvailableDate() const 
+{
+    return QDate ( mNavigatorView->baseDate().year(), mNavigatorView->baseDate().month(), 1 );
+}
 void DateNavigatorContainer::selectDates( const DateList &dateList )
 {
+    mFirstSelectedDate = dateList.first() ;
+    mSelectedDateCount = dateList.count() ;
     if ( !mLastDisplayedDN ) {
         mNavigatorView->selectDates( dateList );
         return;
     } 
     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;
     }
-    KDateNavigator *view = mExtraViews.at( 0 );
-    QDate date = view->baseDate();
-    
-    QDate curEnd = date.addDays( (mLastDisplayedDN)*30 +7);
+    //qDebug("%s %s  ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1()  );
     //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
-    if ( lDate < curEnd  && date.addDays( -30 ) <  fDate) {
-        mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
-        mNavigatorView->dayMatrix()->repaint( false );
-        for( uint i = 0; i < mLastDisplayedDN; ++i ) {
-            KDateNavigator *n = mExtraViews.at( i );
-            if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
-                n->dayMatrix()->repaint( false );
-            }
-        }
+    if ( lDate <= lastAvailableDate() && firstAvailableDate() <=  fDate) {
+        updateDayMatrixDates();
         return;
     }
     mNavigatorView->selectDates( dateList );
     setBaseDates();
   if ( mLastDisplayedDN ) {
       KDateNavigator *view = mExtraViews.at( 0 );
       view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
       view->dayMatrix()->repaint( false ); 
       if ( mLastDisplayedDN > 1 ) {
           KDateNavigator *view = mExtraViews.at( 1 );
           view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
           view->dayMatrix()->repaint( false );
       }
   }
 }
 
 void DateNavigatorContainer::setBaseDates()
 {
-  KCal::DateList dateList = mNavigatorView->selectedDates();
-  if ( dateList.isEmpty() ) {
-    kdError() << "DateNavigatorContainer::selectDates() empty list." << endl;
-  }
-  QDate baseDate = dateList.first();
-  bool doRepaint = false; // skip first repaint
+  QDate baseDate = mNavigatorView->baseDate();
+  bool doRepaint = true;
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 );
       n->setBaseDate( baseDate, doRepaint );
-      doRepaint = true;
   }
 }
 
 void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
 {
 #if 0
   kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
   kdDebug(5850) << "  CURRENT SIZE: " << size() << endl;
   kdDebug(5850) << "  MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
   kdDebug(5850) << "  SIZEHINT: " << sizeHint() << endl;
   kdDebug(5850) << "  MINIMUM SIZE: " << minimumSize() << endl;
 #endif
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index f45af20..d5e5adf 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -37,31 +37,35 @@ class DateNavigatorContainer: public QWidget
   public:
     DateNavigatorContainer( QWidget *parent = 0, const char *name = 0 );
     ~DateNavigatorContainer();
 
     /**
       Associate date navigator with a calendar. It is used by KODayMatrix.
     */
     void setCalendar( Calendar * );
 
     QSize minimumSizeHint() const;
     QSize sizeHint() const;
     KDateNavigator *  navigatorView() { return mNavigatorView;}
+    QDate lastAvailableDate() const ;
+    QDate firstAvailableDate() const ;
 
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
+    void updateDayMatrixDates();
     void updateToday();
+    void slotMonthSelected( int month );
 
   signals:
     void datesSelected( const KCal::DateList & );
     void incidenceDropped( Incidence *, const QDate & );
     void incidenceDroppedMove( Incidence *, const QDate & );
     void weekClicked( const QDate &);
 
     void goPrevious();
     void goNext();
 
     void goNextMonth();
     void goPrevMonth();
@@ -69,24 +73,25 @@ class DateNavigatorContainer: public QWidget
     void goPrevYear();
 
     void monthSelected( int month );
 
   protected:
     void resizeEvent( QResizeEvent * );
 
     void setBaseDates();
     void connectNavigatorView( KDateNavigator *v );
 
   private:
     int mLastDisplayedDN;
-    QDate mDisplayedEndDate;
+    QDate mFirstSelectedDate;
+    int mSelectedDateCount;
     KDateNavigator *mNavigatorView;
 
     KCal::Calendar *mCalendar;
 
     QPtrList<KDateNavigator> mExtraViews;
 
     int mHorizontalCount;
     int mVerticalCount;
 };
 
 #endif
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 231095f..83a57ca 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -181,24 +181,25 @@ void KDateNavigator::slotMonthSelected( int m )
     //qDebug("%d mMonthSignalOffset %d emit %d", m, mMonthSignalOffset, m - mMonthSignalOffset);
     emit monthSelected( m - mMonthSignalOffset );
 
 }
 void KDateNavigator::setCalendar( Calendar *cal )
 {
   daymatrix->setCalendar( cal );
 }
 
 void KDateNavigator::setBaseDate( const QDate &date , bool doRepaint ) // = true
 {
   m_MthYr  = date;
+  //qDebug("KDateNavigator::setBaseDate %s ", date.toString().latin1());
   
   updateDates();
   updateView();
 
   KCal::DateList dates;
   dates.append( date );
   mNavigatorBar->selectDates( dates );
 
   daymatrix->clearSelection();
   if ( doRepaint )
       daymatrix->repaint( false );
 }