more layout fixes

1 files changed, 91 insertions, 23 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index bb27bce..6de7c45 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -17,210 +17,278 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <kdebug.h>
 #include <klocale.h>
 
 //#include "koglobals.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 
 #include <kcalendarsystem.h>
 
 #include "datenavigatorcontainer.h"
 #include "koprefs.h"
 
 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
   connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ),
            SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) );
   connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ),
            SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) );
 #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()
 {
     qDebug("DateNavigatorContainer::updateToday() NOT IMPL ");
 #if 0
   mNavigatorView->updateToday();
   KDateNavigator *n;
   for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
     n->updateToday();
   }
 #endif 
 }
 
 void DateNavigatorContainer::updateView()
 {
   mNavigatorView->updateView();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       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
   //QSize minSize = mNavigatorView->sizeHintTwoButtons();
   QSize minSize = mNavigatorView->yourSizeHint();
 
 //  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
 
   int verticalCount = size().height() / minSize.height();
   int horizontalCount = size().width() / minSize.width();
   //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() );  
   //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount );
   bool fontchange = false;  
   if ( horizontalCount == 1)
       horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width();  
   QFont fo;
   if ( horizontalCount != mHorizontalCount ||
        verticalCount != mVerticalCount ) {
     uint count = horizontalCount * verticalCount;
     if ( count == 0 ) {
         bool ok;
         fo = mNavigatorView->yourFontHint( size() , &ok );
         //mNavigatorView->resize( size() );