fix

2 files changed, 144 insertions, 26 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 770a42b..6646b98 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -303,387 +303,405 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
     connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ),
              SLOT( selection( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( cellClicked( QListBoxItem * ) ) );  
     connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( selection( QListBoxItem * ) ) ); 
 }
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
     if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
     return mToolTipGroup;
 }
 #endif
  
 void MonthViewCell::setDate( const QDate &date )
 {
     //  kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl;
     mDate = date;
 
  
 
     //resizeEvent( 0 );
 }
 
 QDate MonthViewCell::date() const
 {
     return mDate;
 }
 
 void MonthViewCell::setPrimary( bool primary )
 {
     mPrimary = primary;
     //setMyPalette();
 }
 void MonthViewCell::setMyPalette()
 {
     
     if ( mHoliday) {
         setPalette( mHolidayPalette );
     } else {
         if ( mPrimary ) {
             setPalette( mPrimaryPalette );
         } else {
             setPalette( mNonPrimaryPalette );
         }
     }
     QPalette pal = palette();
     
     mLabel->setPalette( QPalette ( pal.color( QPalette::Normal,QColorGroup::Base),pal.color(QPalette::Normal,QColorGroup::Base )  ));
 }
 QPalette  MonthViewCell::getPalette ()
 {
     if ( !KOPrefs::instance()->mMonthViewUsesDayColors )
         return mStandardPalette;
     if ( mHoliday) {
         return mHolidayPalette ;
     } else {
         if ( mPrimary ) {
             return mPrimaryPalette ;
         } 
     }
     return mNonPrimaryPalette; 
 }
 bool MonthViewCell::isPrimary() const
 {
     return mPrimary;
 }
 
 void MonthViewCell::setHoliday( bool holiday )
 {
     mHoliday = holiday; 
     //setMyPalette();
 }
 
 void MonthViewCell::setHoliday( const QString &holiday )
 {
     mHolidayString = holiday;
 
     if ( !holiday.isEmpty() ) {
         setHoliday( true );
     }
 }
 void MonthViewCell::keyPressEvent ( QKeyEvent * e )
 {
 
     e->ignore();
 
 }
 void MonthViewCell::clear()
 {
     mItemList->clear();
     QApplication::removePostedEvents ( mItemList ); 
     QApplication::removePostedEvents ( mLabel ); 
     QApplication::removePostedEvents ( this ); 
 }
-void MonthViewCell::updateCell()
+
+void MonthViewCell::startUpdateCell()
 {
+
     if ( !mMonthView->isUpdatePossible() )
         return;
     /*    
           if ( !isVisible() ){
           return;
           }
     */
     // qDebug("MonthViewCell::updateCell() ");
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         mItemList->setLineWidth( 3 );
     } else {
         mItemList->setLineWidth( 1 );
     }
     mItemList->clear();
 
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
 #endif
-    QString tipText(""); 
+    mToolTip = ""; 
     //qApp->processEvents();
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         mItemList->insertItem( item );
-        tipText += mHolidayString+"\n"; 
+        mToolTip += mHolidayString+"\n"; 
     }
-    //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
-    QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
-    Event *event;
-    for( event = events.first(); event; event = events.next() ) { // for event
+}
 
+void MonthViewCell::insertEvent(Event *event)
+{
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
-                continue;
+                return;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
-                    continue;
+                    return;
         }
         
         if ( event->categories().contains("Holiday") ||
              event->categories().contains(i18n("Holiday"))) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 mItemList->setLineWidth( 3 );
         }
         QString text;
         if (event->isMultiDay()) {
             QString prefix = "<->";
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) )
                     prefix ="->" ;
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) )
                         prefix ="<-" ;
                 } 
 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;
                 }
             }
             text = prefix + event->summary();
-            tipText += text;
+            mToolTip += text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
-                tipText += text;
+                mToolTip += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
-                tipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
+                mToolTip +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
 
         MonthViewItem *item = new MonthViewItem( event, mDate, text );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = event->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( event->recurrence()->doesRecur() );
         item->setAlarm( event->isAlarmEnabled() );
         item->setMoreInfo( event->description().length() > 0  );
 #ifdef DESKTOP_VERSION
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
 #endif
         mItemList->insertItem( item );
-        tipText += "\n";
-       
-    }
-
-    // insert due todos
-    QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
-    Todo *todo;
-    for(todo = todos.first(); todo; todo = todos.next()) {
-        QString text;
+        mToolTip += "\n";
+}
+void MonthViewCell::insertTodo(Todo *todo)
+{
+      QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
         text += i18n("To-Do: %1").arg(todo->summary());
 
         MonthViewItem *item = new MonthViewItem( todo, mDate, text );
         //item->setPalette( mStandardPalette );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = todo->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         mItemList->insertItem( item );
-        tipText += text+"\n"; 
-    }
+        mToolTip += text+"\n"; 
+}
+void MonthViewCell::finishUpdateCell()
+{
 #ifdef DESKTOP_VERSION
-    if (tipText != "")
-        QToolTip::add(this,tipText,toolTipGroup(),"");
+    if (mToolTip != "")
+        QToolTip::add(this,mToolTip,toolTipGroup(),"");
 #endif
  
     //setMyPalette(); 
     setMyPalette();
     QString text;
     bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
     if ( KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
         text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
         mLabel->resize( mLabelBigSize  );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     } else {
         mLabel->resize( mLabelSize );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     }
     
     mLabel->setText( text );
     resizeEvent( 0 );
+}
+void MonthViewCell::updateCell()
+{
+    if ( !mMonthView->isUpdatePossible() )
+        return;
+    startUpdateCell();
+    //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
+    QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
+    Event *event;
+    for( event = events.first(); event; event = events.next() ) { // for event
+        insertEvent(event);
+    }
+    // insert due todos
+    QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
+    Todo *todo;
+    for(todo = todos.first(); todo; todo = todos.next()) {
+        insertTodo( todo );
+    }
+    finishUpdateCell();
     // if ( isVisible())
     //qApp->processEvents();
 }
 
 void MonthViewCell::updateConfig()
 {
-
+    qDebug("MonthViewCell::updateConfig() ");
     setFont( KOPrefs::instance()->mMonthViewFont );
 
     QFontMetrics fm( font() );
     mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
     mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
     mHolidayPalette = mStandardPalette;
     mPrimaryPalette = mStandardPalette;
     mNonPrimaryPalette = mStandardPalette;
     if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
         mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Foreground,  KOPrefs::instance()->mMonthViewHolidayColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
         mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
         mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
         mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 
         mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 
     }
     updateCell(); 
 }
 
 void MonthViewCell::enableScrollBars( bool enabled )
 {
     if ( enabled ) {
         mItemList->setVScrollBarMode(QScrollView::Auto);
         mItemList->setHScrollBarMode(QScrollView::Auto);
     } else {
         mItemList->setVScrollBarMode(QScrollView::AlwaysOff);
         mItemList->setHScrollBarMode(QScrollView::AlwaysOff);
     }
 }
 
 Incidence *MonthViewCell::selectedIncidence()
 {
     int index = mItemList->currentItem();
     if ( index < 0 ) return 0;
   
     MonthViewItem *item =
         static_cast<MonthViewItem *>( mItemList->item( index ) );
 
     if ( !item ) return 0;
   
     return item->incidence();
 }
 
 QDate MonthViewCell::selectedIncidenceDate()
 {
     QDate qd;
     int index = mItemList->currentItem();
     if ( index < 0 ) return qd;
   
     MonthViewItem *item =
         static_cast<MonthViewItem *>( mItemList->item( index ) );
 
     if ( !item ) return qd;
   
     return item->incidenceDate();
 }
 
 void MonthViewCell::deselect()
 {
     mItemList->clearSelection();
     enableScrollBars( false );
     // updateCell();
 }
 void MonthViewCell::select()
 {
     ;// updateCell();
 }
 
 void MonthViewCell::resizeEvent ( QResizeEvent * )
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
 #ifndef DESKTOP_VERSION
     if ( !isVisible() ){
         return;
     }
 #endif
     int size = height() - mLabel->height();
     if ( size > 0 )
         mItemList->verticalScrollBar()->setMaximumHeight( size );
     size = width() - mLabel->width();
     if ( size > 0 )
         mItemList->horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() );
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
 }
 
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
     if ( !item ) return;
 
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
@@ -865,202 +883,297 @@ void KOMonthView::updateConfig()
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     bool temp = mShowSatSunComp ;
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
         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();
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
             bool show = mShortDayLabels;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > mDayLabels[i]->width()  )
                 show = true;
             mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
             else mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
 
         }
     }
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
 
     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 < mCells.size(); ++i ) {
         QDate date = mStartDate.addDays( i );
         mCells[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
         // add holiday, if present
         QString hstring(KOCore::self()->holiday(date));
         mCells[i]->setHoliday( hstring );
 #endif
 
     }
     QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
     for( i = 0; i < 6; ++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;
         mWeekLabels[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();
+#if 1
+    int i;
+    for( i = 0; i < mCells.count(); ++i ) {
+        mCells[i]->startUpdateCell();
+    }
+ 
+    QPtrList<Event> events = calendar()->events();
+    Event *event;
+    QDateTime dt;
+    bool ok;
+    int timeSpan = mCells.size()-1;
+    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) 
+                                    mCells[iii]->insertEvent( event );
+                            }
+                        }
+                    } else {
+                        if ( invalid )
+                            break;
+                        invalid = true;
+                        //qDebug("invalid %s", event->summary().latin1());
+                        incidenceStart = QDateTime( mStartDate );
+                    }
+                    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)
+                        mCells[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 < mCells.size() ) {
+                mCells[day]->insertTodo( todo );
+            }
+        }
+    }
+
+    for( i = 0; i < mCells.count(); ++i ) {
+        mCells[i]->finishUpdateCell();
+    }
+    processSelectionChange();
+    mCells[0]->setFocus();
+
+
+#else
+    // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < mCells.count(); ++i ) {
         mCells[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     mCells[0]->setFocus();
+#endif
+
+    qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     computeLayout();
     mCells[0]->setFocus();
 }
 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 daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = 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++) {
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 50903b3..b84065e 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -44,213 +44,218 @@ class KNOWhatsThis;
 class KOWeekButton : public QPushButton
 {
     Q_OBJECT
   public:
     KOWeekButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
     {
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
     }
     void setWeekNum ( int num ) {mNumber = num; setText( QString::number ( num ));}
     signals:
     void selectWeekNum ( int );
 private:
     int mNumber;
 private slots :
     void bottonClicked() { if ( mNumber > 0 ) emit selectWeekNum ( mNumber ); }
 };
 
 class KNoScrollListBox: public QListBox
 {
     Q_OBJECT
   public:
     KNoScrollListBox(QWidget *parent=0, const char *name=0);
     ~KNoScrollListBox();
     QString getWhatsThisText(QPoint p) ;
 
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
 
    protected slots:
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *);
 
  private:
     KNOWhatsThis * mWT;
 };
 
 
 class MonthViewItem: public QListBoxItem
 {
   public:
     MonthViewItem( Incidence *, QDate qd, const QString & title );
 
     void setRecur(bool on) { mRecur = on; }
     void setAlarm(bool on) { mAlarm = on; }
     void setReply(bool on) { mReply = on; }
     void setMoreInfo(bool on) { mInfo = on; }
 
 
     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 * );
 
     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();
 
     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; }
 
     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 processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
   void selectWeekNum ( int );
   void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();