mochn fix

5 files changed, 22 insertions, 9 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 29c530b..9acbbb1 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1853,13 +1853,12 @@ void CalendarView::readSettings()
         if ( maxVal < resetval + resetval)
             resetval = maxVal - resetval;
         sizes << resetval;
         sizes << 100;
     }
     mLeftFrame->setSizes(sizes);
-    qDebug("sizes count %d ", sizes.count());
     if ( dateCount == 5 ) mNavigator->selectWorkWeek();
     else if ( dateCount == 7 ) mNavigator->selectWeek();
     else mNavigator->selectDates( dateCount );
     // mViewManager->readSettings( config );
     updateConfig(); 
     globalFlagBlockAgenda = 2;
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 3f6e29b..d09f484 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -124,49 +124,59 @@ void DateNavigatorContainer::updateConfig()
 }
 
 void DateNavigatorContainer::selectDates( const DateList &dateList )
 {
   mNavigatorView->selectDates( dateList );
   setBaseDates();
+  if ( mExtraViews.count() ) {
+      KDateNavigator *view = mExtraViews.at( 0 );
+      view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
+      view->dayMatrix()->repaint();
+  }
 }
 
 void DateNavigatorContainer::setBaseDates()
 {
   KCal::DateList dateList = mNavigatorView->selectedDates();
   if ( dateList.isEmpty() ) {
     kdError() << "DateNavigatorContainer::selectDates() empty list." << endl;
   }
   QDate baseDate = dateList.first();
   KDateNavigator *n;
+  bool doRepaint = false; // skip first repaint
   for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
       baseDate = baseDate.addDays( baseDate.daysInMonth () );
-    n->setBaseDate( baseDate );
+      n->setBaseDate( baseDate, doRepaint );
+      doRepaint = true;
   }
 }
 
-void DateNavigatorContainer::resizeEvent( QResizeEvent * )
+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->minimumSizeHint();
+  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 );
   if ( horizontalCount != mHorizontalCount ||
        verticalCount != mVerticalCount ) {
     uint count = horizontalCount * verticalCount;
-    if ( count == 0 ) return;
+    if ( count == 0 ) {
+        mNavigatorView->resize( minSize   );
+        return;
+    }
 
     while ( count > ( mExtraViews.count() + 1 ) ) {
       KDateNavigator *n = new KDateNavigator( this );
       n->setMonthSignalOffset ( mExtraViews.count()+1 );
       mExtraViews.append( n );
       n->setCalendar( mCalendar );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index ab9a40f..b097dc1 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -112,13 +112,13 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
 
   topLayout->addMultiCellWidget(daymatrix,2,7,1,7);
 
   // read settings from configuration file.
   updateConfig();
   enableRollover(FollowMonth);
-  //setFixedSize ( sizeHint() );
+  mySizeHint = sizeHint();
 }
 void KDateNavigator::slotMonthSelected( int m )
 {
     if ( m_MthYr.month() <= mMonthSignalOffset)
         m += 12;
     int mo = m - mMonthSignalOffset;
@@ -127,24 +127,25 @@ void KDateNavigator::slotMonthSelected( int m )
 }
 void KDateNavigator::setCalendar( Calendar *cal )
 {
   daymatrix->setCalendar( cal );
 }
 
-void KDateNavigator::setBaseDate( const QDate &date )
+void KDateNavigator::setBaseDate( const QDate &date , bool doRepaint ) // = true
 {
   m_MthYr  = date;
   
   updateDates();
   updateView();
 
   KCal::DateList dates;
   dates.append( date );
   mNavigatorBar->selectDates( dates );
 
   daymatrix->clearSelection();
+  if ( doRepaint )
   daymatrix->repaint();
 }
 
 void KDateNavigator::enableRollover(RolloverType r)
 {
   switch(r)
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 56822fa..292e71c 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -57,16 +57,18 @@ class KDateNavigator: public QFrame
     */
     enum RolloverType { None, FollowDay, FollowMonth } ;
     void enableRollover( RolloverType );
 
     void setShowWeekNums( bool enabled );
     void setCalendar( Calendar * );
-    void setBaseDate( const QDate & );
+    void setBaseDate( const QDate & , bool doRepaint = true );
     KCal::DateList selectedDates() const { return mSelectedDates; }
     NavigatorBar *navigatorBar() const { return mNavigatorBar; }
     void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off;}
+    QSize yourSizeHint() { return mySizeHint; }
+    KODayMatrix *dayMatrix() { return daymatrix  ;}
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
 
@@ -111,12 +113,13 @@ class KDateNavigator: public QFrame
 
     void wheelEvent (QWheelEvent *);
 
     bool eventFilter (QObject *,QEvent *);
 
   private:
+    QSize mySizeHint;
     int mMonthSignalOffset;
     NavigatorBar *mNavigatorBar;
 
     QFrame *headingSep;
     QFrame *weeknumSep;
     QLabel *headings[7];
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index a886f4a..17a8546 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp