1 files changed, 28 insertions, 27 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 234375b..7ba0b2f 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -792,10 +792,11 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
       mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
     skipResize = false;
     clPending = true;
+    mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
     mWidStack = new QWidgetStack( this );
-    QHBoxLayout* hb = new QHBoxLayout( this );
+    QVBoxLayout* hb = new QVBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
@@ -803,14 +804,16 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
 #else
     mWidStack->addWidget( mMonthView, 1 );
     mWidStack->addWidget( mWeekView , 1 );
 #endif
+    hb->addWidget( mNavigatorBar );
     hb->addWidget( mWidStack );
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
     mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
     if ( mShowWeekView )
         mWeekStartsMonday = true;
     updatePossible = false;
+    //updatePossible = true;
     mCells.setAutoDelete( true );
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.resize( mDaysPerWeek );
@@ -916,8 +919,12 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     else
         mWidStack->raiseWidget( mMonthView );
 
     emit incidenceSelected( 0 );
+#ifndef DESKTOP_VERSION
+    resize( QApplication::desktop()->size() );
+    computeLayout();
+#endif
 }
 
 KOMonthView::~KOMonthView()
 {
@@ -942,9 +949,8 @@ void KOMonthView::switchView()
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
-    //emit showNavigator( !mShowWeekView );
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
@@ -1259,14 +1265,9 @@ void KOMonthView::updateView()
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
-    qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
-    if ( skipResize ) {
-        skipResize = false;
-        qDebug("skipResize ");
-        return;
-    }
+    //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     computeLayout();
     clPending = true; 
     if ( mShowWeekView )
         mCellsW[0]->setFocus();
@@ -1285,18 +1286,17 @@ void KOMonthView::computeLayoutWeek()
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
-    int wid = size().width();//e
-    int hei = size().height()-1;
+    int wid = width();//e
+    int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
      
-
-    if ( lastWid == width() && lastHei ==height() )
+    if ( lastWid == width() && lastHei == height() )
         return;
-    lastWid =width();
+    lastWid = width();
     lastHei = height();
 
 
     if ( wid < hei )
@@ -1305,9 +1305,9 @@ void KOMonthView::computeLayoutWeek()
         daysToShow = 3;
     mShowSatSunComp = true;
     combinedSatSun  = true;
         
-    qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
+    //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
@@ -1386,13 +1386,13 @@ void KOMonthView::computeLayoutWeek()
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
-    bool forceUpdate = !updatePossible;
+    //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
-    if ( forceUpdate )
-        updateView();
+    //if ( forceUpdate )
+    //  updateView();
 }
 void KOMonthView::computeLayout()
 {
   
@@ -1412,18 +1412,21 @@ void KOMonthView::computeLayout()
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
-    int wid = size().width();//e
-    int hei = size().height()-1;
+    int wid = width();//e
+    int hei = height()-1-mNavigatorBar->height();
 
-    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
+    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) {
         return;  
-    if ( lastWid == width() && lastHei ==height() )
+    }
+    if ( lastWid == width() && lastHei == height() ){
         return;
-    lastWid =width();
-    lastHei = height();
-    qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
+    }
+
+    lastWid = width();
+    lastHei =  height();
+    //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
@@ -1499,13 +1502,11 @@ void KOMonthView::computeLayout()
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
-    bool forceUpdate = !updatePossible;
+    //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
-    if ( forceUpdate )
-        updateView();
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {