fixesss

3 files changed, 44 insertions, 57 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index ffb2e1e..70cbf96 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -782,807 +782,795 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
     mMonthView->setSelectedCell( this );
 }
 
 
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
     ignoreResizeEvent = 0;
     mShortDayLabelsW = false;
     mShortDayLabelsM = false;
     clPending = true;
     mWidStack = new QWidgetStack( this );
     QHBoxLayout* hb = new QHBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
     mWidStack->addWidget(mWeekView  );
 #else
     mWidStack->addWidget( mMonthView, 1 );
     mWidStack->addWidget( mWeekView , 1 );
 #endif
     hb->addWidget( mWidStack );
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
     mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
     if ( mShowWeekView )
         mWeekStartsMonday = true;
     updatePossible = false;
     mCells.setAutoDelete( true );
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.resize( mDaysPerWeek );
     QFont bfont = font();
     if ( QApplication::desktop()->width() < 650 ) {
         bfont.setPointSize( bfont.pointSize() - 2 );
     }
     bfont.setBold( true );
     int i;
   
     for( i = 0; i < mDaysPerWeek; i++ ) {
         QLabel *label = new QLabel( mMonthView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabels.insert( i, label );
         label = new QLabel( mWeekView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabelsW.insert( i, label );
     }
 
     bfont.setBold( false );
     mWeekLabels.resize( mNumWeeks+1 );
     mWeekLabelsW.resize( 2 );
     for( i = 0; i < mNumWeeks+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mMonthView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
     QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
     }
     mWeekLabelsW[1]->setText( i18n("W"));
 
 
     int row, col;
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
             MonthViewCell *cell = new MonthViewCell( this, mMonthView );
             mCells.insert( row * mDaysPerWeek + col, cell );
 
             connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                      SLOT( defaultAction( Incidence * ) ) );
             connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                      SIGNAL( newEventSignal( QDateTime ) ) );
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
 
         connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                  SLOT( defaultAction( Incidence * ) ) );
         connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                  SIGNAL( newEventSignal( QDateTime ) ) );
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
-    updateConfig(); //useless here
+    //updateConfig(); //useless here ...
+    // ... but we need mWidthLongDayLabel computed
+    QFontMetrics fontmetric(mDayLabels[0]->font());
+    mWidthLongDayLabel = 0;
+    for (int i = 0; i < 7; i++) {
+        int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
+        if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
+    }
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 
     emit incidenceSelected( 0 );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();
     emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
         return mWeekLabelsW[0]->getWeekNum();
     return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
 
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     //emit showNavigator( !mShowWeekView );
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView ); 
     clPending = false;
 }
 
 int KOMonthView::maxDatesHint()
 {
     return mNumCells;
 }
 
 int KOMonthView::currentDateCount()
 {
     return mNumCells;
 }
 
 QPtrList<Incidence> KOMonthView::selectedIncidences()
 {
     QPtrList<Incidence> selected;
 
     if ( mSelectedCell ) {
         Incidence *incidence = mSelectedCell->selectedIncidence();
         if ( incidence ) selected.append( incidence );
     }
 
     return selected;
 }
 
 DateList KOMonthView::selectedDates()
 {
     DateList selected;
 
     if ( mSelectedCell ) {
         QDate qd = mSelectedCell->selectedIncidenceDate();
         if ( qd.isValid() ) selected.append( qd );
     }
 
     return selected;
 }
 
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 
 void KOMonthView::updateConfig()
 {
  
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView ) {
         mWeekStartsMonday = true;
     } 
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
-    qDebug("KOMonthView::updateConfig() ");
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     if ( !  mShowWeekView ) {
             computeLayout();
     }
     updateDayLabels();
     //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
     //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
     //resizeEvent( 0 );
     for (uint i = 0; i < mCells.count(); ++i) {
         mCells[i]->updateConfig();
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     QPtrVector<QLabel> *mDayLabelsT;
-#if 0
-    if (mShowWeekView  ) 
-        mDayLabelsT = &mDayLabelsW;
-    else
-        mDayLabelsT = &mDayLabels;
-#endif
-    qDebug("updateDayLabels W %d  M %d ",mShortDayLabelsW ,mShortDayLabelsM);
+
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
             bool show = mShortDayLabelsW;
             if ( i > 4  && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
 
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
             bool show = mShortDayLabelsM;
             if ( i > 4 && KOPrefs::instance()->mMonthViewSatSunTog && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
 
         }
     }
 
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
     QPtrVector<MonthViewCell> *cells;
     QPtrVector<QLabel> *dayLabels;
     QPtrVector<KOWeekButton> *weekLabels;
     int weekNum = 6;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
         weekLabels = &mWeekLabelsW;
     } else {
         cells = &mCells;
         dayLabels = &mDayLabels;
         weekLabels = &mWeekLabels;
     }
 
     mStartDate = start;
 
     int startWeekDay = mWeekStartsMonday ? 1 : 7;
 
     while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
         mStartDate = mStartDate.addDays( -1 );
     }
 
     bool primary = false;
     uint i;
     for( i = 0; i < (*cells).size(); ++i ) {
         QDate date = mStartDate.addDays( i );
         (*cells)[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
         // add holiday, if present
         QString hstring(KOCore::self()->holiday(date));
         (*cells)[i]->setHoliday( hstring );
 #endif
 
     }
     QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
     for( i = 0; i < weekNum; ++i ) {
         int wno;
         // remember, according to ISO 8601, the first week of the year is the
         // first week that contains a thursday.  Thus we must subtract off 4,
         // not just 1.
         int dayOfYear = date.dayOfYear();
         if (dayOfYear % 7 != 0)
             wno = dayOfYear / 7 + 1;
         else
             wno =dayOfYear / 7;
         (*weekLabels)[i]->setWeekNum( wno );
         date = date.addDays( 7 );
     }
     updateView();
 }
 
 void KOMonthView::showEvents(QPtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
     // this should be re-written to be much more efficient, but this
     // quick-and-dirty-hack gets the job done for right now.
     updateView();
 }
 
 void KOMonthView::updateView()
 { 
 
     if ( !updatePossible )
         return;
     //QTime ti;
     //ti.start();
     QPtrVector<MonthViewCell> *cells;
     if ( mShowWeekView ) {
         cells = &mCellsW;
     } else {
         cells = &mCells;
     }
 #if 1
     int i;
     int timeSpan = (*cells).size()-1;
     if ( KOPrefs::instance()->mMonthViewWeek )         
         timeSpan = 6;
     for( i = 0; i < timeSpan + 1; ++i ) {
         (*cells)[i]->startUpdateCell();
     }
  
     QPtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     bool ok;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
                                 //normalize
                                 st =  timeSpan - st;
                                 if ( st < 0 ) st = 0;
                                 if ( end > timeSpan ) end = timeSpan;
                                 int iii;
                                 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                 for ( iii = st;iii<= end;++iii) 
                                     (*cells)[iii]->insertEvent( event );
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                     if ( ! ok )
                         break;
                     if ( incidenceStart.date() > endDate )
                         break;
             }
         } else { // no recur 
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
                     if ( st < 0 ) st = 0;
                     if ( end > timeSpan ) end = timeSpan;
                     int iii;
                     for ( iii = st;iii<= end;++iii)
                         (*cells)[iii]->insertEvent( event );
                 }
             }
         }
     }
     // insert due todos
     QPtrList<Todo> todos = calendar()->todos( );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 (*cells)[day]->insertTodo( todo );
             }
         }
     }
 
     for( i = 0; i < timeSpan+1; ++i ) {
         (*cells)[i]->finishUpdateCell();
     }
     processSelectionChange();
     (*cells)[0]->setFocus();
 
 
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < (*cells).count(); ++i ) {
         (*cells)[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
-    qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+    //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( ignoreResizeEvent ) {
-        int diff =  e->size().height() - e->oldSize().height();
-        if ( diff < 0 )
-            diff = diff * (-1);
-        if (  diff == ignoreResizeEventHeight ) {
-            qDebug("KOMonthView::resizeEvent ignored ");
-            --ignoreResizeEvent;
-            return;
-        } 
-        ignoreResizeEvent = 0;
+        //qDebug("KOMonthView::resizeEvent ignored ");
+        --ignoreResizeEvent;
+        return;
     }
     if ( e->size().width()+ e->size().height() < 240 )
         return;
     computeLayout();
     clPending = true; 
     if ( mShowWeekView )
         mCellsW[0]->setFocus();
     else
         mCells[0]->setFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
-  
+    static int widd = 0;
+    static int heigg = 0;
+    if ( widd == width() && heigg == height () ) {
+        return;
+    }
+    widd = width() ;
+    heigg =  height ();
     int daysToShow;
-    int tWid = topLevelWidget()->size().width();
-    int tHei = topLevelWidget()->size().height();
-
     int wid = size().width();//e
     int hei = size().height()-1;
-
-    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
-        return;
-
     if ( wid < hei )
         daysToShow = 2;
     else
         daysToShow = 3;
     bool combinedSatSun  = true;
         
-    //qDebug("KOMonthView::computeLayout()------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i && !( i % daysToShow) && i < 6) {
             y += hei/(5-daysToShow);
             x = 0;
             w =  colWid;
         }
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i >=  5 ) {
             mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
             x -= (w/2 );
         }
         else
             mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei;
     for ( i = 0; i < mCellsW.count(); ++i) {
         if ( i > 6 ) {
             mCellsW[i]->hide();
             continue;
         }
         
         w = colWid;
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i  == (daysToShow-1-rowModulo)*7)
             ++h; 
       
         if ( i >= 5 ) {
             if ( i ==5 ) {
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                 x -= w ;y += h/2;
             } else {
                 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
                     ++w;
                 }
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                 y -= h/2;
             }
         } else
             mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                 
        
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h+dayLabelHei ;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
     mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
-    // 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());
+  
     mShortDayLabelsW = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
     if ( forceUpdate )
         updateView();
 }
 void KOMonthView::computeLayout()
 {
     // select the appropriate heading string size. E.g. "Wednesday" or "Wed".
     // note this only changes the text if the requested size crosses the
     // threshold between big enough to support the full name and not big
     // enough.
+
+    int tWid = topLevelWidget()->size().width();
+    int tHei = topLevelWidget()->size().height();
+
+    int wid = size().width();//e
+    int hei = size().height()-1;
+
+    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
+        return;
+
+    
     if ( mShowWeekView ){
             computeLayoutWeek();
             return;
     }
+    static int widd = 0;
+    static int heigg = 0;
+    if ( widd == width() && heigg == height () ) {
+        return;
+    }
+    widd = width() ;
+    heigg =  height ();
+
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
-    int tWid = topLevelWidget()->size().width();
-    int tHei = topLevelWidget()->size().height();
-
-    int wid = size().width();//e
-    int hei = size().height()-1;
-
-    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
-        return;
-    //qDebug("KOMonthView::computeLayout()------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- dayLabelHei) % 6;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i == daysToShow-colModulo )
             ++w;
         if ( combinedSatSun ) {
             if ( i >=  daysToShow-1 ) {
                 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
                 x -= w/2 ;
             }
             else
                 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         } else
             mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei ;
     for ( i = 0; i < mCells.count(); ++i) {
         w = colWid;
         if ( ((i) % 7) >= 7-colModulo ) {
             ++w;
         }
         if ( i  == (6-rowModulo)*7)
             ++h; 
         if ( combinedSatSun ) {
             if ( (i)%7 >=  daysToShow-1 ) {
                 if ( (i)%7 ==  daysToShow-1 ) {
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                     x -= w ;y += h/2;
                 } else {
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                     y -= h/2;
                 }
             } else
                 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                 
         }
         else
             mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
         y += h;                            
     }
     mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
-    // 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());
     mShortDayLabelsM = mDayLabels[0]->width() < mWidthLongDayLabel ;
     qDebug("dlwid %d %d ",mDayLabels[0]->width() , mWidthLongDayLabel);
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
-    //mWeekLabels[mNumWeeks]->setText( i18n("W"));
     if ( forceUpdate )
         updateView();
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
     mContextMenu->showIncidencePopup(incidence);
-    /*
-      if( incidence && incidence->type() == "Event" ) {
-      Event *event = static_cast<Event *>(incidence);
-      mContextMenu->showEventPopup(event);
-      } else {
-      kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
-      }
-    */
+ 
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    //qDebug("KOMonthView::setSelectedCell %x ", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
-    //  if ( mSelectedCell )
-    //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
     QPtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
         emit incidenceSelected( 0 );
     }
 }
 
 void KOMonthView::clearSelection()
 {
     if ( mSelectedCell ) {
         mSelectedCell->deselect();
         mSelectedCell = 0;
     }
 }
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
     //qDebug("KOMonthView::keyPressEvent ");
     switch(e->key()) {
     case Key_Up: 
         {
             emit prevMonth();
             if ( mShowWeekView )
                 mCellsW[0]->setFocus();
             else
                 mCells[0]->setFocus();
         }
         e->accept();
         break;
     case Key_Down:
         {
             emit nextMonth();
             if ( mShowWeekView )
                 mCellsW[0]->setFocus();
             else
                 mCells[0]->setFocus();
             
         }
         e->accept();
         break;
     case Key_Return:
     case Key_Enter:
         {
             selectInternalWeekNum ( currentWeek() );
         }
         e->accept();
         break;
     default:
         e->ignore();     
         break;
     }
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d70cda1..9dbe319 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -101,198 +101,197 @@ class MonthViewItem: public QListBoxItem
     void setPalette(const QPalette &p) { mPalette = p; }
     QPalette palette() const { return mPalette; }
 
     Incidence *incidence() const { return mIncidence; }
     QDate incidenceDate() { return mDate; }
 
   protected:
     virtual void paint(QPainter *);
     virtual int height(const QListBox *) const;
     virtual int width(const QListBox *) const;
 
   private:
     bool mRecur;
     bool mAlarm;
     bool mReply;
     bool mInfo;
 
     QPalette mPalette;
     QDate mDate;
 
     Incidence *mIncidence;
 };
 
 
 class KOMonthView;
 
 class MonthViewCell : public QWidget
 {
     Q_OBJECT
   public:
     MonthViewCell(KOMonthView *,QWidget* );
 
     void setDate( const QDate & );
     QDate date() const;
 
     void setPrimary( bool );
     bool isPrimary() const;
 
     void setHoliday( bool );
     void setHoliday( const QString & );
 
     void updateCell();
     void startUpdateCell();
     void finishUpdateCell();
     void insertEvent(Event *);
     void insertTodo(Todo *);
 
     void updateConfig( bool bigFont = false );
 
     void enableScrollBars( bool );
 
     Incidence *selectedIncidence();
     QDate selectedIncidenceDate();
 
     void deselect();
     void select();
     void clear();
 
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *toolTipGroup(); 
 #endif
   signals:
     void defaultAction( Incidence * );
     void newEventSignal( QDateTime );
     void showDaySignal( QDate );
     
   protected:
     QString mToolTip;
     void resizeEvent( QResizeEvent * );
 
   protected slots:
     void defaultAction( QListBoxItem * );
     void contextMenu( QListBoxItem * );
     void selection( QListBoxItem * );
     void cellClicked( QListBoxItem * );
     void newEvent();
     void showDay();
     
   private:
     KOMonthView *mMonthView;
   
     QDate mDate;
     bool mPrimary;
     bool mHoliday;
     QString mHolidayString;
     
     //QLabel *mLabel;
     QPushButton *mLabel;
     QListBox *mItemList;
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *mToolTipGroup; 
 #endif 
     QSize mLabelSize;
     QSize mLabelBigSize;
     QPalette mHolidayPalette;
     QPalette mStandardPalette;
     QPalette mPrimaryPalette;
     QPalette mNonPrimaryPalette;
     void setMyPalette();
     QPalette  getPalette ();
     void keyPressEvent ( QKeyEvent * ) ;
     
 };
 
 
 class KOMonthView: public KOEventView
 {
     Q_OBJECT
   public:
     KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 );
     ~KOMonthView();
 
     /** Returns maximum number of days supported by the komonthview */
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     bool isMonthView() { return true; }
     bool isUpdatePossible() { return updatePossible; }
-    void setIgnoreResizeEvent( int c, int h ) {  ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
+    void setIgnoreResizeEvent( int c ) {  ignoreResizeEvent = c ;}
 
     MonthViewCell * selectedCell();
   public slots:
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
 
   protected slots:
     void selectInternalWeekNum ( int );
     void switchView();
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void showNavigator( bool );
     void selectWeekNum ( int );
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     int ignoreResizeEvent;
-    int ignoreResizeEventHeight;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     bool mWeekStartsMonday;
     void computeLayout();
     void computeLayoutWeek();
 
     QPtrVector<MonthViewCell> mCells;
     QPtrVector<QLabel> mDayLabels;
     QPtrVector<KOWeekButton> mWeekLabels;
     QPtrVector<MonthViewCell> mCellsW;
     QPtrVector<QLabel> mDayLabelsW;
     QPtrVector<KOWeekButton> mWeekLabelsW;
 
     bool mShortDayLabelsM;
     bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
     QDate mStartDate;
 
     MonthViewCell *mSelectedCell;
 
     KOEventPopupMenu *mContextMenu;
     void keyPressEvent ( QKeyEvent * ) ;
 
 };
 
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index c35de0a..62d3e7f 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -75,281 +75,281 @@ KOViewManager::KOViewManager( CalendarView *mainView ) :
 
 KOViewManager::~KOViewManager()
 {
 }
 
 
 KOrg::BaseView *KOViewManager::currentView()
 {
     return mCurrentView;
 }
 
 void KOViewManager::readSettings(KConfig *config)
 {
     config->setGroup("General");
     QString view = config->readEntry("Current View");
     if (view == "WhatsNext") showWhatsNextView();
     else if (view == "Month") showMonthView();
     else if (view == "List") showListView();
     else if (view == "Journal") showJournalView();
     else if (view == "TimeSpan") showTimeSpanView();
     else if (view == "Todo") showTodoView();
     else {
         showAgendaView();
     }
 }
 
 void KOViewManager::showDateView( int view, QDate date)
 {
     static int lastMode = 0;
     static int lastCount = 0;
     static bool lastNDMode = false;
     static QDate lastDate;
     //qDebug("date %d %s", view, date.toString().latin1());
 
     //qDebug("%d %d  ", lastNDMode, mFlagShowNextxDays );
     bool savemFlagShowNextxDays = mFlagShowNextxDays;
     mFlagShowNextxDays = false;
     if ( view == 3 ) {
         //mCurrentAgendaView = 1 ;
         lastDate = mMainView->dateNavigator()->selectedDates().first();
         lastCount = mMainView->dateNavigator()->selectedDates().count();
         lastNDMode = savemFlagShowNextxDays;
         mMainView->showDay( date );
     } else if (view == 4 ) {
         mCurrentAgendaView = 7 ;
         mMainView->dateNavigator()->selectDates( date, 7 );
     } else if (view == 5 ) {
         mCurrentAgendaView = 14 ;
         mMainView->dateNavigator()->selectDates( date, 14);
     } else if (view == 6 ) {
         //mMainView->dateNavigator()->selectDates( date, 7 );
         showMonthView();
     } else if (view == 7 ) {
         mMainView->dateNavigator()->selectDate( date );
         showJournalView();
     } else if (view == 8 ) {
         globalFlagBlockAgenda = 1;
         if ( mCurrentAgendaView != 3 )
             mCurrentAgendaView = -1;
         showAgendaView(KOPrefs::instance()->mFullViewMonth);
         globalFlagBlockAgenda = 2;
         mMainView->dateNavigator()->selectDates( date ,
                                                  KOPrefs::instance()->mNextXDays );
         mFlagShowNextxDays = true;
         mCurrentAgendaView = 3 ;
     } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode )
         if ( lastMode ) {
             mCurrentAgendaView = lastCount ;
             mMainView->dateNavigator()->selectDates( lastDate, lastCount);
             mFlagShowNextxDays = lastNDMode;
             if ( mFlagShowNextxDays  ) {
                 mCurrentAgendaView = 3 ;
             }
         } else
             showWeekView();
     } else if (view == 10) {
         mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() );
     } 
     lastMode = view;
 }
 
    
 
 void KOViewManager::writeSettings(KConfig *config)
 {
      config->setGroup("General");
 
     QString view;
     if (mCurrentView == mWhatsNextView) view = "WhatsNext";
     else if (mCurrentView == mMonthView) view = "Month";
     else if (mCurrentView == mListView) view = "List";
     else if (mCurrentView == mJournalView) view = "Journal";
     else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
     else if (mCurrentView == mTodoView) view = "Todo";
     else view = "Agenda";
 
     config->writeEntry("Current View",view);
 
     if (mAgendaView) {
         mAgendaView->writeSettings(config);
     }
     if (mTimeSpanView) {
         mTimeSpanView->writeSettings(config);
     }
     if (mListView) {
         mListView->writeSettings(config);
     }
     if (mTodoView) {
         mTodoView->saveLayout(config,"Todo View");
     }
 }
 
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
  
     //mFlagShowNextxDays = false;
     //if(view == mCurrentView) return;  
     if ( view == 0 ) {
         view = mCurrentView;
         if ( view == 0 )
             return;
     }
     bool full = fullScreen;
     if(view == mCurrentView && view != mWhatsNextView ) {
         if ( mCurrentAgendaView < 0 )
             return;
         full = mMainView->leftFrame()->isVisible();
     } else {
+        if ( view == mMonthView && mMonthView)
+            mMonthView->setIgnoreResizeEvent( 1 ); 
         mCurrentView = view;
         // bool full = fullScreen;
         bool isFull = !mMainView->leftFrame()->isVisible();
         if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
             full = true;
         if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen )
             full = false;
     }
     if ( mAgendaView ) mAgendaView->deleteSelectedDateTime();
     //raiseCurrentView( full );
     mMainView->processIncidenceSelection( 0 );
     //mMainView->updateView();
     raiseCurrentView( full, true );
     mMainView->adaptNavigationUnits();
 }
 
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
     mCurrentAgendaView = 0;
     int wid =  mMainView->width() ;
     int hei  = mMainView->height();
     if ( mCurrentView == mMonthView   ) { 
         if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
-            
-            mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); 
             mMainView->navigatorBar()->show();
             hei -= mMainView->navigatorBar()->sizeHint().height();
         }
         //mMainView->navigatorBar()->hide();
     } else {
         mMainView->navigatorBar()->hide();
     }
     if ( fullScreen ) {
         mMainView->leftFrame()->hide();
     } else {
         mMainView->leftFrame()->show();
         if ( KOPrefs::instance()->mVerticalScreen )  
             hei -= mMainView->leftFrame()->height();
         else
             wid -= mMainView->leftFrame()->width();
     }
     emit signalFullScreen( !fullScreen );
     if ( callUpdateView )
         mMainView->updateView();
         
     if ( globalFlagBlockAgenda ==  5 ) {
         globalFlagBlockAgenda =  4;
         globalFlagBlockAgendaItemPaint = 1;
     }
     mMainView->viewStack()->raiseWidget(mCurrentView);
     if ( globalFlagBlockAgenda ==  4 ) {
         if ( mCurrentView == mAgendaView ) {
             //globalFlagBlockAgenda =1 ;
             if ( KOPrefs::instance()->mSetTimeToDayStartAt )
                 mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins  );
             else if ( KOPrefs::instance()->mCenterOnCurrentTime )
                 mAgendaView->setStartHour( QTime::currentTime ().hour() );
             qApp->processEvents();  
             //qDebug("qApp->processEvents() ");
             globalFlagBlockAgenda = 0;
             mAgendaView->repaintAgenda();
 
         } 
         globalFlagBlockAgenda = 0;
     }
     emit signalAgendaView( mCurrentView == mAgendaView );
     //qDebug("raiseCurrentView ende ");
 
 }
 
 void KOViewManager::updateView()
 {
     // qDebug("KOViewManager::updateView() ");
     // if we are updating mTodoView, we get endless recursion
     if ( mTodoView == mCurrentView )
         return;
     if ( mCurrentView ) mCurrentView->updateView();
 
 }
 
 void KOViewManager::updateView(const QDate &start, const QDate &end)
 {
     //  kdDebug() << "KOViewManager::updateView()" << endl;
 
     if (mCurrentView) mCurrentView->showDates(start, end);
 
     if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView();
 }
 
 
 void KOViewManager::updateWNview()
 {
     if ( mCurrentView == mWhatsNextView && mWhatsNextView )
         mWhatsNextView->updateView();
         
 }
 void KOViewManager::showWhatsNextView()
 {
     if (!mWhatsNextView) {
         mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(),
                                              "KOViewManager::WhatsNextView");
         mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog());
         connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig()));
         addView(mWhatsNextView);
          connect(this, SIGNAL( printWNV() ),
              mWhatsNextView, SLOT( printMe() ) );
     }
     globalFlagBlockAgenda = 1;
     showView(mWhatsNextView, true );
     //mWhatsNextView->updateView();
  
 }
 
 void KOViewManager::showListView()
 {
     if (!mListView) {
         mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
         addView(mListView);
 
         connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
         connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
         connect( mListView, SIGNAL( signalNewEvent() ),
                  mMainView, SLOT( newEvent() ) );
         connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); 
         connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
     }
     // bool temp = mFlagShowNextxDays;
     //globalFlagBlockPainting = true;
     globalFlagBlockAgenda = 1;
     if ( KOPrefs::instance()->mListViewMonthTimespan ) {
         mMainView->setBlockShowDates( true );
         mMainView->dateNavigator()->selectMonth();
         mMainView->setBlockShowDates( false );
     }
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
     //mFlagShowNextxDays = temp;
 }
 
 void KOViewManager::showAgendaView( bool fullScreen )
 {