layout fixes

9 files changed, 184 insertions, 58 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3ce123c..ab59d00 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -251,151 +251,155 @@ void CalendarView::init()
     mSelectedIncidence = 0;
     mCalPrinter = 0;
     mFilters.setAutoDelete(true);
 
     mCalendar->registerObserver( this );
     // TODO: Make sure that view is updated, when calendar is changed.
 
     mStorage = new FileStorage( mCalendar );
     mNavigator = new DateNavigator( this, "datevav", mViewManager );
 
     QBoxLayout *topLayout = (QBoxLayout*)layout();
 #ifndef KORG_NOSPLITTER
     // create the main layout frames.
     mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner");
     topLayout->addWidget(mPanner);
 
     mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner,
                                   "CalendarView::LeftFrame");
     mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize);
 
     mDateNavigator = new DateNavigatorContainer( mLeftSplitter,
                                                "CalendarView::DateNavigator" );
 
     mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
     mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2");
     mTodoList->setNavigator( mNavigator );
     mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView");
 
 #ifdef KORG_NORESOURCEVIEW 
     mResourceView = 0;
 #else
     if ( mResourceManager ) {
         mResourceView = new ResourceView( mResourceManager, mLeftSplitter );
         mResourceView->updateView();
         connect( mResourceView, SIGNAL( resourcesChanged() ),
                  SLOT( updateView() ) );
     } else {
         mResourceView = 0;
     }
 #endif
     QWidget *rightBox = new QWidget( mPanner );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
 
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 1 );
 
     mLeftFrame = mLeftSplitter;
 #else
-    QWidget *mainBox = new QWidget( this );
+    //QWidget *mainBox = new QWidget( this );
     //QWidget *leftFrame = new QWidget( mainBox );
-    QBoxLayout * mainBoxLayout;
+    //QBoxLayout * mainBoxLayout;
     if ( KOPrefs::instance()->mVerticalScreen ) {
-        mainBoxLayout  = new QVBoxLayout(mainBox); 
+        //mainBoxLayout  = new QVBoxLayout(mainBox); 
         //leftFrameLayout = new QHBoxLayout(leftFrame ); 
-        mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mainBox);;
-        mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left );
+        mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this );
+        mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
+        mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);;
+        mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
     } else {
-        mainBoxLayout  = new QHBoxLayout(mainBox);
+        //mainBoxLayout  = new QHBoxLayout(mainBox);
         //leftFrameLayout = new  QVBoxLayout(leftFrame ); 
-        mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mainBox);;
+        mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
+        mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left);
+        mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame);
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     }
     //QBoxLayout * leftFrameLayout;
-    topLayout->addWidget( mainBox );
-    mainBoxLayout->addWidget (mLeftFrame);  
+    topLayout->addWidget( mMainFrame );
+    //mainBoxLayout->addWidget (mLeftFrame);  
     mDateNavigator = new DateNavigatorContainer( mLeftFrame,
                                                "CalendarView::DateNavigator" );
 #if 0
     // FIXME
     mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
 #endif
     // mDateNavigator->blockSignals( true );
     //leftFrameLayout->addWidget( mDateNavigator  );
     mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
     mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView");
     mTodoList->setNavigator( mNavigator );
 #if 0
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
       
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
 #endif
     mFilterView->hide();
-    QWidget *rightBox = new QWidget( mainBox );
-    mainBoxLayout->addWidget ( rightBox, 10 );
+    QWidget *rightBox = new QWidget( mMainFrame );
+    //mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
 
     //mLeftFrame = (QWidget *)leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
-        mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() );
+        //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() );
         //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() );
-        mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
+        //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
         //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
-        mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() );
-        mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
+        //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() );
+        //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
         //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
     }
     if ( !KOPrefs::instance()->mShowDateNavigator)
         mDateNavigator->hide();
     //qDebug("Calendarview Size %d %d ", width(), height());
 #endif
  
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( showDates( const KCal::DateList & ) ) );
    
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
   
     
     connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ),
              mNavigator, SLOT( selectWeek( const QDate & ) ) );
 
     connect( mDateNavigator, SIGNAL( goPrevYear() ),
              mNavigator, SLOT( selectPreviousYear() ) );
     connect( mDateNavigator, SIGNAL( goNextYear() ),
              mNavigator, SLOT( selectNextYear() ) );
     connect( mDateNavigator, SIGNAL( goPrevMonth() ),
              mNavigator, SLOT( selectPreviousMonth() ) );
     connect( mDateNavigator, SIGNAL( goNextMonth() ),
              mNavigator, SLOT( selectNextMonth() ) );
 
     connect( mDateNavigator, SIGNAL( goPrevious() ),
              mNavigator, SLOT( selectPrevious() ) );
     connect( mDateNavigator, SIGNAL( goNext() ),
              mNavigator, SLOT( selectNext() ) );
     connect( mDateNavigator, SIGNAL( monthSelected ( int ) ),
              mNavigator, SLOT( slotMonthSelect( int ) ) );
 
     connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
 #if 0
     connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ),
              SLOT( incidenceAdded(  Incidence *) ) );
 #endif
     // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView()));
 
     connect( this, SIGNAL( configChanged() ),
              mDateNavigator, SLOT( updateConfig() ) );
 
     connect( mTodoList, SIGNAL( newTodoSignal() ),
              SLOT( newTodo() ) );
     connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ),
              SLOT( newSubTodo( Todo * ) ) );
@@ -1790,190 +1794,222 @@ void CalendarView::archiveCalendar()
 
 void CalendarView::readSettings()
 {
  
   
     // mViewManager->showAgendaView();
     QString str;
     //qDebug("CalendarView::readSettings() ");
     // read settings from the KConfig, supplying reasonable
     // defaults where none are to be found
     KConfig *config = KOGlobals::config();
 #ifndef KORG_NOSPLITTER
     config->setGroup("KOrganizer Geometry");
 
     QValueList<int> sizes = config->readIntListEntry("Separator1");
     if (sizes.count() != 2) {
         sizes << mDateNavigator->minimumSizeHint().width();
         sizes << 300;
     }
     mPanner->setSizes(sizes);
 
     sizes = config->readIntListEntry("Separator2");
     if ( ( mResourceView && sizes.count() == 4 ) ||
          ( !mResourceView && sizes.count() == 3 ) ) {
         mLeftSplitter->setSizes(sizes);
     }
 #endif
     globalFlagBlockAgenda = 1;
     mViewManager->showAgendaView();
     //mViewManager->readSettings( config );
     mTodoList->restoreLayout(config,QString("Todo Layout"));
     readFilterSettings(config);
     config->setGroup( "Views" );
     int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
 
     QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
    
     int resetval = 0;
     int maxVal = 0;
     if (sizes.count() != 3) { 
         if ( KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( !resetval ){// i.e. sizes.count() == 3  
         if ( KOPrefs::instance()->mVerticalScreen ) {
-        if ( sizes[0] <  mDateNavigator->sizeHint().width()+1 )
-            resetval = mDateNavigator->sizeHint().width()+2;
+            if ( sizes[0] <  mDateNavigator->sizeHint().width()+1 )
+                resetval = mDateNavigator->sizeHint().width()+2;
         } else {
-        if ( sizes[0] <  mDateNavigator->sizeHint().height()+1 )
-            resetval = mDateNavigator->sizeHint().height()+2;
+            if ( sizes[0] <  mDateNavigator->sizeHint().height()+1 )
+                resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( resetval ) {
         sizes.clear();
         if ( KOPrefs::instance()->mVerticalScreen ) {
             maxVal = QApplication::desktop()->width() -10;
         } else {
             maxVal = QApplication::desktop()->height()-10;
         }
         sizes << resetval;
         if ( maxVal < resetval + resetval)
             resetval = maxVal - resetval;
         sizes << resetval;
         sizes << 100;
     }
     mLeftFrame->setSizes(sizes);
+    sizes = config->readIntListEntry("Main Splitter Frame");
+    if (sizes.count() != 3) { 
+        if ( !KOPrefs::instance()->mVerticalScreen ) {
+            resetval = mDateNavigator->sizeHint().width()+2;
+        } else {
+            resetval = mDateNavigator->sizeHint().height()+2;
+        }
+    }
+    if ( !resetval ){// i.e. sizes.count() == 3  
+        if ( !KOPrefs::instance()->mVerticalScreen ) {
+            if ( sizes[0] <  mDateNavigator->sizeHint().width()+1 )
+                resetval = mDateNavigator->sizeHint().width()+2;
+        } else {
+            if ( sizes[0] <  mDateNavigator->sizeHint().height()+1 )
+                resetval = mDateNavigator->sizeHint().height()+2;
+        }
+    }
+    if ( resetval ) {
+        sizes.clear();
+        if ( !KOPrefs::instance()->mVerticalScreen ) {
+            maxVal = QApplication::desktop()->width() -10;
+        } else {
+            maxVal = QApplication::desktop()->height()-10;
+        }
+        sizes << resetval;
+        if ( maxVal < resetval + resetval)
+            resetval = maxVal - resetval;
+        sizes << resetval;
+    }
+    mMainFrame->setSizes(sizes);
+   
     if ( dateCount == 5 ) mNavigator->selectWorkWeek();
     else if ( dateCount == 7 ) mNavigator->selectWeek();
     else mNavigator->selectDates( dateCount );
     // mViewManager->readSettings( config );
     updateConfig(); 
     globalFlagBlockAgenda = 2;
     mViewManager->readSettings( config );
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list;
     list = config->readListEntry("MainLayout");
     int x,y,w,h;
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         topLevelWidget()->setGeometry(x,y,w,h);
 
     } else {
         topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
     }
     list = config->readListEntry("EditEventLayout");
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         mEventEditor->setGeometry(x,y,w,h);
 
     }
     list = config->readListEntry("EditTodoLayout");
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         mTodoEditor->setGeometry(x,y,w,h);
 
     }
     list = config->readListEntry("ViewerLayout");
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         getEventViewerDialog()->setGeometry(x,y,w,h);
     }
 #endif
 
 }
 
 
 void CalendarView::writeSettings()
 {
     //  kdDebug() << "CalendarView::writeSettings" << endl;
 
     KConfig *config = KOGlobals::config();
 
     mViewManager->writeSettings( config );
     mTodoList->saveLayout(config,QString("Todo Layout"));
     mDialogManager->writeSettings( config );
     //KOPrefs::instance()->usrWriteConfig();
     KOPrefs::instance()->writeConfig();
 
     writeFilterSettings(config);
 
     config->setGroup( "Views" );
     config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() );
 
     QValueList<int> listINT = mLeftFrame->sizes();
     config->writeEntry("Left Splitter Frame",listINT);
-
+    listINT = mMainFrame->sizes();
+    config->writeEntry("Main Splitter Frame",listINT);
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list ;//= config->readListEntry("MainLayout");
     int x,y,w,h;
     QWidget* wid;
     wid = topLevelWidget();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("MainLayout",list );
     
     wid = mEventEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditEventLayout",list );
  
     wid = mTodoEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditTodoLayout",list ); 
     wid = getEventViewerDialog();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index fac9a9e..16e671f 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -486,97 +486,97 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
     void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete(const QString name);
     void showEventEditor();
     void showTodoEditor();
     void writeLocale();
     Todo *selectedTodo();
 
   private:
     bool mViewerCallerIsSearchDialog;
     bool mBlockShowDates;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;
     QString mSuspendAlarmNotification;
     QTimer* mSuspendTimer;
     QTimer* mAlarmTimer;
     QTimer* mRecheckAlarmTimer;
     void computeAlarm( QString );
     void startAlarm( QString, QString );
     void setSyncEventsReadOnly();
     
     QDateTime loadedFileVersion;
     void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
     QString  mCurrentSyncName;
     KOBeamPrefs* beamDialog;
     void init();
     int mDatePickerMode;
     bool mFlagEditDescription;
     QDateTime mLastCalendarSync;
     void createPrinter();
 
     void calendarModified( bool, Calendar * );
 
     CalPrinter *mCalPrinter;
 
     QSplitter    *mPanner;
     QSplitter    *mLeftSplitter;
-    KDGanttMinimizeSplitter  *mLeftFrame;
+    KDGanttMinimizeSplitter  *mLeftFrame, *mMainFrame;
     QWidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
     QVBox* mDateFrame;
 
     DateNavigatorContainer *mDateNavigator;       // widget showing small month view.
 
     KOFilterView *mFilterView;
 
     ResourceView *mResourceView;
 
     // calendar object for this viewing instance
     Calendar      *mCalendar;
 
     CalendarResourceManager *mResourceManager;
 
     FileStorage *mStorage;
 
     DateNavigator *mNavigator;
 
     KOViewManager *mViewManager;
     KODialogManager *mDialogManager;
 
     // Calendar filters
     QPtrList<CalFilter> mFilters;
 
     // various housekeeping variables.
             bool            mModified;   // flag indicating if calendar is modified
     bool            mReadOnly; // flag indicating if calendar is read-only
     QDate mSaveSingleDate;
 
     Incidence *mSelectedIncidence;
     Incidence *mMoveIncidence;
     QDate mMoveIncidenceOldDate;
     KOTodoView *mTodoList;
     KOEventEditor * mEventEditor;
     KOTodoEditor  * mTodoEditor;
     KOEventViewerDialog * mEventViewerDialog;
     void keyPressEvent ( QKeyEvent *e) ;
     //QMap<Incidence*,KOIncidenceEditor*> mDialogList;
 };
 
 
 class CalendarViewVisitor : public Incidence::Visitor
 {
   public:
     CalendarViewVisitor() : mView( 0 ) {}
 
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index b9bd1b9..3358ecf 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -1,83 +1,84 @@
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
 
     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 <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 );
 }
 
 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 ) ) );
 }
 
 void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
   mNavigatorView->setCalendar( cal );
   KDateNavigator *n;
   for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
     n->setCalendar( cal );
@@ -122,108 +123,135 @@ void DateNavigatorContainer::updateConfig()
     n->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 () - 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->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;  
+  QFont fo;
   if ( horizontalCount != mHorizontalCount ||
        verticalCount != mVerticalCount ) {
     uint count = horizontalCount * verticalCount;
     if ( count == 0 ) {
-        mNavigatorView->resize( minSize   );
-        return;
+        bool ok;
+        fo = mNavigatorView->yourFontHint( size() , &ok);
+        //mNavigatorView->resize( size() );
+        //if ( ! ok )
+        //  return;
+        minSize = mNavigatorView->sizeHint();  
+        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();
+        }
     }
 
     while ( count > ( mExtraViews.count() + 1 ) ) {
       KDateNavigator *n = new KDateNavigator( this );
       n->setMonthSignalOffset ( mExtraViews.count()+1 );
       mExtraViews.append( n );
       n->setCalendar( mCalendar );
       setBaseDates();
       connectNavigatorView( n );
       n->show();
     }
 
     while ( count < ( mExtraViews.count() + 1 ) ) {
       mExtraViews.removeLast();
     }
-
+    if ( fontchange ) {
+        //mNavigatorView->changeFont( fo );
+        uint i;
+        for( i = 0; i < mExtraViews.count(); ++i ) {
+            KDateNavigator *view = mExtraViews.at( i );
+            view->changeFont( fo );
+        }
+    }
     mHorizontalCount = horizontalCount;
     mVerticalCount = verticalCount;
   }
-
   int height = size().height() / verticalCount;
   int width = size().width() / horizontalCount;
 
   NavigatorBar *bar = mNavigatorView->navigatorBar();
   if ( horizontalCount > 1 ) bar->showButtons( true, false );
   else bar->showButtons( true, true );
 
   mNavigatorView->setGeometry(0,
       0, width, height );
   for( uint i = 0; i < mExtraViews.count(); ++i ) {
     int x = ( i + 1 ) % horizontalCount;
     int y = ( i + 1 ) / horizontalCount;
 
     KDateNavigator *view = mExtraViews.at( i );
     bar = view->navigatorBar();
     if ( y > 0 ) bar->showButtons( false, false );
     else {
         if ( x + 1 == horizontalCount ) bar->showButtons( false, true );
         else bar->showButtons( false, false );
     }
     view->setGeometry( x * width,
         y * height, width, height );
   }
 }
 
 QSize DateNavigatorContainer::minimumSizeHint() const
 {
   return mNavigatorView->minimumSizeHint();
 }
 
 QSize DateNavigatorContainer::sizeHint() const
 {
   return mNavigatorView->sizeHint();
 }
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index b097dc1..92a0ac2 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -71,96 +71,136 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
   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);
 
     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 = sizeHint();
+  mFontChanged = false;
+}
+void KDateNavigator::changeFont ( QFont fo ) 
+{
+        setFont( fo );
+        mNavigatorBar->resetFont( fo );
+}
+QFont KDateNavigator::yourFontHint( QSize si , bool *b)
+{
+    QFont fo =  KOPrefs::instance()->mDateNavigatorFont;
+    *b = false;
+    int fontPoint = fo.pointSize();
+    while ( fontPoint > 5 ) {
+        --fontPoint;
+        fo.setPointSize( fontPoint );
+        setFont( fo );
+        mFontChanged = true;
+        mNavigatorBar->resetFont( fo );
+        QSize sh = sizeHint();
+        //qDebug("fp %d %d %d %d %d", fontPoint,   si.width() , sh.width() ,   si.height() , sh.height()                 );
+        if ( si.width()  > sh.width() &&   si.height()  > sh.height()) {
+            *b = true;
+            //qDebug("fooooooooooooooooooooooouuuuund ");
+            break;
+        }
+    }
+    //qDebug("returnnnnnnnnnnnnnnnnnnn %d", fo.pointSize() );
+    return fo;
+}
+QSize KDateNavigator::sizeHint() const
+{
+    QFontMetrics fm ( font() );
+    QSize day =  daymatrix->sizeHint();
+    QSize nav =  mNavigatorBar->sizeHint();
+    int wid = fm.width( "30") + day.width()+3;
+    int hei = fm.height() +day.height()+nav.height()+2;
+    if ( wid <  nav.width() )
+        wid = nav.width() ;
+    //qDebug("KDateNavigator+++++++++++++ %d %d", wid , hei);
+  return   QSize ( wid, hei );
 }
 void KDateNavigator::slotMonthSelected( int m )
 {
     if ( m_MthYr.month() <= mMonthSignalOffset)
         m += 12;
     int mo = 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;
   
   updateDates();
   updateView();
 
   KCal::DateList dates;
   dates.append( date );
   mNavigatorBar->selectDates( dates );
 
   daymatrix->clearSelection();
   if ( doRepaint )
       daymatrix->repaint();
 }
 
 void KDateNavigator::enableRollover(RolloverType r)
 {
   switch(r)
   {
   case None :
     if (updateTimer)
     {
       updateTimer->stop();
       delete updateTimer;
       updateTimer=0L;
     }
     break;
   case FollowDay :
   case FollowMonth :
     if (!updateTimer)
     {
       updateTimer = new QTimer(this);
       QObject::connect(updateTimer,SIGNAL(timeout()),
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 292e71c..3177687 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -20,135 +20,141 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KDATENAVIGATOR_H
 #define KDATENAVIGATOR_H
 
 #include <qframe.h>
 #include <qdatetime.h>
 #include <qlabel.h>
 
 #include <libkcal/calendar.h>
 
 #include "kodaymatrix.h"
 
 class QPushButton;
 class QTimer;
 
 class KCalendarSystem;
 
 class NavigatorBar;
 
 class KDateNavigator: public QFrame
 {
     Q_OBJECT
   public:
     KDateNavigator( QWidget *parent = 0,const char *name = 0 );
     ~KDateNavigator();
 
     /** The DateNavigator automatically checks for
     * the passage of midnight. If rollover type is 
     * set to None, no signals are emitted and no
     * processing is done. With rollover set to 
     * FollowDay, the day highlighter changes at
     * midnight and dayPassed() is emitted.
     * With FollowMonth, it has the same effect
     * as FollowDay but also adjusts the month that is 
     * visible and emits monthPassed() when the month changes.
     */
     enum RolloverType { None, FollowDay, FollowMonth } ;
     void enableRollover( RolloverType );
 
     void setShowWeekNums( bool enabled );
     void setCalendar( Calendar * );
     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  ;}
+    QFont yourFontHint( QSize , bool * b);
+    bool fontChanged() {return mFontChanged; }
+    void unsetFontChanged() { mFontChanged = false; }
+    KODayMatrix *dayMatrix() { return daymatrix  ;} 
+    QSize sizeHint() const;
+    void changeFont ( QFont fo ); 
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
 
   signals:
     void datesSelected( const KCal::DateList & );
     void eventDropped( Event * );
     void weekClicked( const QDate &);
 
     void goPrevious();
     void goNext();
 
     void goNextMonth();
     void goPrevMonth();
     void goNextYear();
     void goPrevYear();
     void monthSelected( int );
 
     // Signals emitted at midnight carrying the new date.
     void dayPassed( QDate );
     void monthPassed( QDate );
 
   protected slots:
 
      /**
      * Called regularly to see if we need to update the view
      * wrt. the today box and the month box. Only important
      * if you leave KOrganizer idle for long periods of time.
      *
      * Until we have a reliable way of setting QTimers to go
      * off at a particular wall-clock time, we need this,
      * which calls passedMidnight() at the right moments.
      */
      void possiblyPastMidnight();
 
      /** handles updating the view when midnight has come by due to idle time.
      *
      */
      void passedMidnight();
      void slotMonthSelected( int m );
   protected:
     void updateDates();
 
     void wheelEvent (QWheelEvent *);
 
     bool eventFilter (QObject *,QEvent *);
 
   private:
     QSize mySizeHint;
+    bool mFontChanged;
     int mMonthSignalOffset;
     NavigatorBar *mNavigatorBar;
 
     QFrame *headingSep;
     QFrame *weeknumSep;
     QLabel *headings[7];
     QLabel *weeknos[7];
     KODayMatrix *daymatrix;
 
     KCal::DateList mSelectedDates;
     QDate m_MthYr;
     int m_fstDayOfWk;
     bool m_bShowWeekNums;
 
     int dayNum(int row, int col);
     int dayToIndex(int dayNum);
 
     Calendar *mCalendar;
     KCalendarSystem *mCalendarSystem;
 
     const QString *curHeaders;
 
     /** used to update the day view periodically, in particular every
     * midnight to move the "today" rectangle.
     */
     QTimer *updateTimer;
     QDate lastDayChecked;
     RolloverType updateRollover;
 
     // Disabling copy constructor and assignment operator
     KDateNavigator(const KDateNavigator & );
     KDateNavigator &operator=(const KDateNavigator &);
 };
 
 #endif
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 619ae39..9181936 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -751,48 +751,59 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
       }
 
       // if it is a holiday then use the default holiday color
       if (!mHolidays[i].isNull()) {
           if (  bDays.testBit(i) ) {
               p.setPen(Qt::green);
           } else {
               if (actcol == mDefaultTextColor) {
                   p.setPen(KOPrefs::instance()->mHolidayColor);
               } else {
                   p.setPen(mHolidayColorShaded);
               }
           }
       }
 
       // draw selected days with special color
       // DO NOT specially highlight holidays in selection !
       if (i >= mSelStartT && i <= mSelEndT) {
           ;//p.setPen(mSelectedDaysColor);
       }
 
       p.drawText(col*dwidth, row*dheight, dwidth, dheight,
                  Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
       // reset color to actual color
       if (!mHolidays[i].isNull()) {
           p.setPen(actcol);
       }
       // reset bold font to plain font
       if (events[i] > 0) {
           QFont myFont = font();
           myFont.setBold(false);
           p.setFont(myFont);
       }
   }
     bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent *)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
 }
+
+QSize KODayMatrix::sizeHint() const
+{
+
+  QFontMetrics fm ( font() );
+  int wid = fm.width( "30") *7+7;
+  int hei = fm.height() * 6+4;
+  //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);
+  return   QSize ( wid, hei );
+
+}
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index c049942..39946de 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -125,96 +125,97 @@ public:
     ~KODayMatrix();
 
     /** updates the day matrix to start with the given date. Does all the necessary
      *  checks for holidays or events on a day and stores them for display later on.
      *  Does NOT update the view visually. Call repaint() for this.
      *
      *  @param actdate recalculates the day matrix to show NUMDAYS starting from this
      *                 date.
      */
     void updateView(QDate actdate);
     void updateEvents();
 
     /** returns the QDate object associated with day indexed by the
      *  supplied offset.
      */
     const QDate& getDate(int offset);
     void setCalendar( Calendar * );
     /** returns the official name of this holy day or 0 if there is no label
      *  for this day.
      */
     QString getHolidayLabel(int offset);
 
     /** adds all actual selected days from mSelStart to mSelEnd to the supplied
      *  DateList.
      */
     void addSelectedDaysTo(DateList&);
 
     /** sets the actual to be displayed selection in the day matrix starting from
      *  start and ending with end. Theview must be manually updated by calling
      *  repaint. (?)
      */
     void setSelectedDaysFrom(const QDate& start, const QDate& end);
     void clearSelection();
 
     /** Is today visible in the view? Keep this in sync with
     * the values today (below) can take.
     */
     bool isTodayVisible() const { return today>=0; } ;
     
     /** If today is visible, then we can find out if today is 
     * near the beginning or the end of the month.
     * This is dependent on today remaining the index
     * in the array of visible dates and going from
     * top left (0) to bottom right (41).
     */
     bool isBeginningOfMonth() const { return today<=8; } ;
     bool isEndOfMonth() const { return today>=27; } ;
     QString getWhatsThisText( QPoint ) ;
+    QSize sizeHint() const;
         
 public slots:
     /** Recalculates all the flags of the days in the matrix like holidays or events
      *  on a day (Actually calls above method with the actual startdate).
      */
     void updateView();
     void updateViewTimed();
     void repaintViewTimed();
 
     /**
     * Calculate which square in the matrix should be 
     * hilighted to indicate it's today.
     */
     void recalculateToday();
     
 /*
     void setStartDate(QDate);
 */
 
 signals:
 
     /** emitted if the user selects a block of days with the mouse by dragging a rectangle
      *  inside the matrix
      *
      *  @param daylist list of days that have been selected by the user
      */
     void selected( const KCal::DateList &daylist );
 
     /** emitted if the user has dropped an event inside the matrix
      *
      *  @param event the dropped calendar event
      */
     void eventDropped(Event *event);
 
 protected:
 
     void paintEvent(QPaintEvent *ev);
 
     void mousePressEvent (QMouseEvent* e);
 
     void mouseReleaseEvent (QMouseEvent* e);
 
     void mouseMoveEvent (QMouseEvent* e);
 
     void dragEnterEvent(QDragEnterEvent *);
 
     void dragMoveEvent(QDragMoveEvent *);
 
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 27d4d17..4a51bba 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -17,228 +17,231 @@
     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 <qtooltip.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "libkdepim/kdatepicker.h"
 #include <knotifyclient.h>
 #include "kdatetbl.h"
 
 #include "koglobals.h"
 #include <kglobalsettings.h>
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 
 #include <kcalendarsystem.h>
 
 #include "navigatorbar.h"
 
 NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QBoxLayout *topLayout = new QHBoxLayout( this );
 
   // Set up the control buttons and date label
   mCtrlFrame = new QFrame( this );
   mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
   mCtrlFrame->setLineWidth(1);
 
   topLayout->addWidget( mCtrlFrame );
 
-  QFont tfont = font();
-  if ( QApplication::desktop()->width() >= 480 )
-      tfont.setPointSize(tfont.pointSize()+2);
-  tfont.setBold(true);
+ 
 
   bool isRTL = KOGlobals::self()->reverseLayout();
 #ifndef DESKTOP_VERSION
   bool isDesktop = false;
 #else
   bool isDesktop = true;
 #endif
   if ( QString ( name ) == QString("useBigPixmaps") && QApplication::desktop()->width() > 320 )
       isDesktop = true;
   // Create backward navigation buttons
   mPrevYear = new QPushButton( mCtrlFrame );
   mPrevYear->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow" ) );
   QToolTip::add( mPrevYear, i18n("Previous Year") );
 
   mPrevMonth = new QPushButton( mCtrlFrame );
   mPrevMonth->setPixmap( SmallIcon( isDesktop ? "1leftarrowB" : "1leftarrow") );
   QToolTip::add( mPrevMonth, i18n("Previous Month") );
 
   // Create forward navigation buttons
   mNextMonth = new QPushButton( mCtrlFrame );
   mNextMonth->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") );
   QToolTip::add( mNextMonth, i18n("Next Month") );
 
   mPrevWeek = new QPushButton( mCtrlFrame );
   mPrevWeek->setPixmap( SmallIcon( isDesktop ? "1leftarrowB" : "1leftarrow") );
   QToolTip::add( mPrevWeek, i18n("Previous Week") );
 
   // Create forward navigation buttons
   mNextWeek = new QPushButton( mCtrlFrame );
   mNextWeek->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") );
   QToolTip::add( mNextWeek, i18n("Next Week") );
 
   mNextYear = new QPushButton( mCtrlFrame );
   mNextYear->setPixmap( SmallIcon( isDesktop ? "2rightarrowB": "2rightarrow") );
   QToolTip::add( mNextYear, i18n("Next Year") );
   mSelectMonth = new QPushButton( mCtrlFrame );
   // Create month name label
   //selectMonth->setFont( tfont );
   // selectMonth->setAlignment( AlignCenter );
   //mDateLabel = new QLabel( selectMonth );
   //mDateLabel->setFont( tfont );
   //mDateLabel->setAlignment( AlignCenter );
   if ( QString ( name ) == QString("useBigPixmaps") ) {
       mNextMonth->setFlat( true);
       mNextWeek->setFlat( true);
       mNextYear->setFlat( true);
       mSelectMonth->setFlat( true);
       mPrevYear->setFlat( true);
       mPrevMonth->setFlat( true);
       mPrevWeek->setFlat( true);
   } else {
       mPrevWeek->hide();
       mNextWeek->hide();
   }
-  mSelectMonth->setFont( tfont );
-  // Set minimum width to width of widest month name label
-  int i;
-  int maxwidth = 0;
-  QFontMetrics fm ( mSelectMonth->font() );
-  int width = fm.width("September '00" );
-//   for( i = 1; i <= KOGlobals::self()->calendarSystem()->monthsInYear(date);
-//       ++i ) {
-//       //int width = fm.width( KOGlobals::self()->calendarSystem()->monthName(i,
-//       //   KOGlobals::self()->calendarSystem()->year(date) ) + " 2000" );
-//       int width = fm.width("September 2000" );
-//     if ( width > maxwidth ) maxwidth = width;
-//   }
-  maxwidth = width+2;
-  int size = fm.height()+2;
-  if ( QApplication::desktop()->width() >= 480 ) { 
-      size += 6;
-      maxwidth+= 6;
-  }
 
-  mSelectMonth->setFixedWidth( maxwidth );
-  mSelectMonth->setFixedHeight( size );
-  mPrevYear->setFixedHeight(  size );
-  mPrevMonth->setFixedHeight( size );
-  mPrevWeek->setFixedHeight( size );
-  mNextMonth->setFixedHeight( size );
-  mNextWeek->setFixedHeight( size );
-  mNextYear->setFixedHeight ( size );
+  resetFont( font() );
+
+  
   // set up control frame layout
   QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
   ctrlLayout->addWidget( mPrevYear, 3 );
   ctrlLayout->addWidget( mPrevMonth, 3 );
   ctrlLayout->addWidget( mPrevWeek, 3 );
   //ctrlLayout->addStretch( 1 );
   // ctrlLayout->addSpacing( 1 );
   // ctrlLayout->addWidget( mDateLabel );
   ctrlLayout->addWidget( mSelectMonth );
   //  ctrlLayout->addSpacing( 1 );
   // ctrlLayout->addStretch( 1 );
   ctrlLayout->addWidget( mNextWeek, 3 );
   ctrlLayout->addWidget( mNextMonth, 3 );
   ctrlLayout->addWidget( mNextYear, 3 );
 
   connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) );
   connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) );
   connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) );
   connect( mPrevWeek, SIGNAL( clicked() ), SIGNAL( goPrevWeek() ) );
   connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) );
   connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
   connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
   mPrevYear->setFocusPolicy(NoFocus);
   mPrevMonth->setFocusPolicy(NoFocus);
   mNextMonth->setFocusPolicy(NoFocus);
   mPrevWeek->setFocusPolicy(NoFocus);
   mNextWeek->setFocusPolicy(NoFocus);
   mNextYear->setFocusPolicy(NoFocus);
   mSelectMonth->setFocusPolicy(NoFocus);
   setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
 
 }
 
 NavigatorBar::~NavigatorBar()
 {
 }
+void NavigatorBar::resetFont ( QFont fo )
+{
+
+ QFont tfont = fo;
+ if ( QApplication::desktop()->width() >= 480 )
+     tfont.setPointSize(tfont.pointSize()+2);
+ tfont.setBold(true);
+
+ mSelectMonth->setFont( tfont );
+  // Set minimum width to width of widest month name label
+  int i;
+  int maxwidth = 0;
+  QFontMetrics fm ( mSelectMonth->font() );
+  int width = fm.width("September '00" );
+  maxwidth = width+2;
+  int size = fm.height()+2;
+  if ( QApplication::desktop()->width() >= 480 ) { 
+      size += 6;
+      maxwidth+= 6;
+  }
+  mSelectMonth->setMinimumWidth( maxwidth );
+  mSelectMonth->setFixedHeight( size );
+  mPrevYear->setFixedHeight(  size );
+  mPrevMonth->setFixedHeight( size );
+  mPrevWeek->setFixedHeight( size );
+  mNextMonth->setFixedHeight( size );
+  mNextWeek->setFixedHeight( size );
+  mNextYear->setFixedHeight ( size );
+}
+  
 void NavigatorBar::showButtons( bool left, bool right )
 {
   if ( left ) {
     mPrevYear->show();
     mPrevMonth->show();
   } else {
     mPrevYear->hide();
     mPrevMonth->hide();
   }
 
   if ( right ) {
     mNextYear->show();
     mNextMonth->show();
   } else {
     mNextYear->hide();
     mNextMonth->hide();
   }
   if ( !left && !right ) {
-      mSelectMonth->setMaximumWidth( 1024 );
+      //mSelectMonth->setMaximumWidth( 1024 );
       mSelectMonth->setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
   }
 }
 
 void NavigatorBar::selectMonth()
 {
 
     int month;
   KPopupFrame* popup = new KPopupFrame(this);
   KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup);
   // -----
   picker->resize(picker->sizeHint());
   popup->setMainWidget(picker);
   picker->setFocus();
   connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
   if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height()))))
     {
         month = picker->getResult();
         emit monthSelected ( month );
     } else {
       KNotifyClient::beep();
     }
   delete popup;
 }
 void NavigatorBar::selectDates( const KCal::DateList &dateList )
 {
   if (dateList.count() > 0) {
     QDate date = dateList.first();
 
     const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
 
     // compute the label at the top of the navigator
     QString dtstr = i18n(calSys->monthName( date )) + " '" +
                     QString::number( calSys->year( date ) ).right(2);
 
     mSelectMonth->setText( dtstr );
   }
 }
 
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 4442caa..0b2f60b 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -1,70 +1,71 @@
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 2003 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.
 */
 #ifndef NAVIGATORBAR_H
 #define NAVIGATORBAR_H
 
 #include <libkcal/incidencebase.h>
 
 #include <qwidget.h>
 
 class QPushButton;
 class QFrame;
 class QLabel;
 
 class NavigatorBar: public QWidget
 {
     Q_OBJECT
   public:
     NavigatorBar( const QDate & date, QWidget *parent = 0, const char *name = 0 );
     ~NavigatorBar();
     void showButtons( bool left, bool right );
+    void resetFont ( QFont fo );
 
   public slots:
     void selectDates( const KCal::DateList & );
     void selectMonth();
 
   signals:
     void goNextMonth();
     void goPrevMonth();
     void goNextWeek();
     void goPrevWeek();
     void goNextYear();
     void goPrevYear();
     void monthSelected( int );
 
   private:
     QFrame *mCtrlFrame;
 
     QPushButton *mPrevYear;
     QPushButton *mPrevMonth;
     QPushButton *mNextMonth;
     QPushButton *mPrevWeek;
     QPushButton *mNextWeek;
     QPushButton *mNextYear;
     QPushButton *mSelectMonth;
 
     //QLabel *mDateLabel;
 };
 
 #endif