fixes

2 files changed, 13 insertions, 16 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 27ba9e0..f6f62a4 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -144,162 +144,160 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
         setBaseDates();
         if ( forceEmit ) 
             updateDayMatrixDates();
         if ( forceEmit ) 
             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::checkUpdateDayMatrixDates()
 { 
     //qDebug("KODNC: wid %d  hei %d ", width(), height());
     mUpdateTimer->stop();
     //return;
     if ( width() < 3 || height() < 3 )
         return;
     static int lastWid = 0;
     static int lastHei = 0;
     if ( lastWid == width() && height() == lastHei ) {
         qDebug("KODNC: No layout computing needed. ");
     } else {
         lastWid = width();
         lastHei = height();
 
         QSize minSize = mNavigatorView->yourSizeHint();
 
         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() );
                 //if ( ! ok )
                 //  return;
                 int butt = 2;
                 horizontalCount =  size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
                 if (  horizontalCount <= 1 )
                     minSize = mNavigatorView->sizeHintTwoButtons( 4 ); 
                 else 
                     minSize = mNavigatorView->sizeHintTwoButtons(); 
                 verticalCount = size().height() / minSize.height();
                 horizontalCount = size().width() / minSize.width();
                 if ( horizontalCount == 0 )
                     horizontalCount = 1;
                 if ( verticalCount == 0 )
                     verticalCount = 1;
                 fontchange = true;
                 count = horizontalCount * verticalCount;
-            } else {
-                if ( mNavigatorView->fontChanged() ) {
-                    fontchange = true;
-                    fo = KOPrefs::instance()->mDateNavigatorFont;
-                    mNavigatorView->changeFont( fo );
-                    mNavigatorView->unsetFontChanged();
-                }
             }
 
             mLastDisplayedDN =  horizontalCount*verticalCount-1;
             while ( count > ( mExtraViews.count() + 1 ) ) {
                 KDateNavigator *n = new KDateNavigator( this );
                 n->setMonthSignalOffset ( mExtraViews.count()+1 );
                 mExtraViews.append( n );
                 n->setCalendar( mCalendar );
                 connectNavigatorView( n );
                 // n->show();
             }
             
-    
             setBaseDates();
+            mHorizontalCount = horizontalCount;
+            mVerticalCount = verticalCount;
+    
+        }
+        if ( !fontchange ) {
+            if ( mNavigatorView->fontChanged() ) {
+                fontchange = true;
+                fo = KOPrefs::instance()->mDateNavigatorFont;
+                mNavigatorView->changeFont( fo );
+                mNavigatorView->unsetFontChanged();
+            }
+        }
             if ( fontchange ) {
-                //mNavigatorView->changeFont( fo );
                 uint i;
-                for( i = 0; i < mExtraViews.count(); ++i ) {
+            for( i = 0; i < mLastDisplayedDN; ++i ) {
                     KDateNavigator *view = mExtraViews.at( i );
                     view->changeFont( fo );
                 }
             }
-            mHorizontalCount = horizontalCount;
-            mVerticalCount = verticalCount;
-    
-        }
-
         int theight = height() / mVerticalCount;
         int twidth = width() / mHorizontalCount;
 
         NavigatorBar *bar = mNavigatorView->navigatorBar();
         if ( mHorizontalCount > 1 ) bar->showButtons( true, false );
         else bar->showButtons( true, true );
 
         mNavigatorView->setGeometry(0,
                                     0, twidth, theight );
         for( uint i = 0; i < mLastDisplayedDN; ++i ) {
             int x = ( i + 1 ) % mHorizontalCount;
             int y = ( i + 1 ) / mHorizontalCount;
 
             KDateNavigator *view = mExtraViews.at( i );
             bar = view->navigatorBar();
             if ( y > 0 ) bar->showButtons( false, false );
             else {
                 if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true );
                 else bar->showButtons( false, false );
             }
             view->setGeometry( x * twidth,
                                y * theight, twidth, theight );
         }
         int iii = 0;
         int ccc = mHorizontalCount * mVerticalCount;
         mNavigatorView->show();
         while ( iii < ( mExtraViews.count()  ) ) {
             if ( iii < ccc-1 )
                 mExtraViews.at( iii )->show();
             else
                 mExtraViews.at( iii )->hide();
             ++iii;
         }
     }
 
     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()
 { 
     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()
 {
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 2fca49e..1d09f40 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -1,128 +1,127 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     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 <qstring.h>
 #include <qkeycode.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "koglobals.h"
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 
 #include <kcalendarsystem.h>
 
 #include "navigatorbar.h"
 
 #include "kdatenavigator.h"
 
 KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
   : QFrame(parent, name),
     updateTimer(0L)
 {
     setFrameStyle(QFrame::NoFrame);
     QDate startDate = QDate::currentDate();
   QGridLayout *topLayout = new QGridLayout(this,8,8);
 
   if (! startDate.isValid()) {
       qDebug("KDateNavigator::invalid startdate ");
     startDate = QDate::currentDate();
   }
   mMonthSignalOffset = 0;
   mSelectedDates.append(startDate);
   m_MthYr = startDate;
   m_bShowWeekNums = true;
-  
   setFont( KOPrefs::instance()->mDateNavigatorFont );
   mNavigatorBar = new NavigatorBar( startDate, this );
   topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 );
   //mNavigatorBar->resize( 1,1);
   connect( mNavigatorBar, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) );
   connect( mNavigatorBar, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) );
   connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) );
   connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) );
   connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
   
   // get the day of the week on the first day
   QDate dayone(m_MthYr.year(), m_MthYr.month(), 1);
   m_fstDayOfWk = dayone.dayOfWeek();
 
   int i;
 
   // Set up the heading fields.
   for( i = 0; i < 7; i++ ) {
     headings[i] = new QLabel("",this);
     //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
     headings[i]->setAlignment(AlignCenter);
     headings[i]->installEventFilter(this);
 
     topLayout->addWidget(headings[i],1,i+1);
   }
 
   // Create the weeknumber labels
   for( i = 0; i < 6; i++ ) {
     weeknos[i] = new QLabel(this);
     weeknos[i]->setAlignment(AlignCenter);
     //weeknos[i]->setFont(QFont("Arial", 10));
     if(!m_bShowWeekNums) {
       weeknos[i]->hide();
     }
     weeknos[i]->installEventFilter(this);
 
     topLayout->addWidget(weeknos[i],i+2,0);
   }
 
   daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix");
   daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken);
   daymatrix->setLineWidth(1);
 
   connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ),
            SIGNAL( datesSelected( const KCal::DateList & ) ) );
 
   connect( daymatrix, SIGNAL( eventDropped( Event * ) ),
            SIGNAL( eventDropped( Event * ) ) );
 
   topLayout->addMultiCellWidget(daymatrix,2,7,1,7);
 
   // read settings from configuration file.
   updateConfig();
   enableRollover(FollowMonth);
   mySizeHint = sizeHintTwoButtons();
   myFullSizeHint = sizeHintTwoButtons( 4 );
   mFontChanged = false;
   //resize ( 3,3 );
   
 }
 void KDateNavigator::changeFont ( QFont fo ) 
 {
         setFont( fo );
         mNavigatorBar->resetFont( fo );