fix

2 files changed, 141 insertions, 23 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 770a42b..6646b98 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -398,4 +398,6 @@ void MonthViewCell::clear()
 }
-void MonthViewCell::updateCell()
+
+void MonthViewCell::startUpdateCell()
 {
+
     if ( !mMonthView->isUpdatePossible() )
@@ -420,3 +422,3 @@ void MonthViewCell::updateCell()
 #endif
-    QString tipText(""); 
+    mToolTip = ""; 
     //qApp->processEvents();
@@ -426,15 +428,14 @@ void MonthViewCell::updateCell()
         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;
         }
@@ -467,3 +468,3 @@ void MonthViewCell::updateCell()
             text = prefix + event->summary();
-            tipText += text;
+            mToolTip += text;
         } else {
@@ -471,3 +472,3 @@ void MonthViewCell::updateCell()
                 text = event->summary();
-                tipText += text;
+                mToolTip += text;
             }
@@ -476,3 +477,3 @@ void MonthViewCell::updateCell()
                 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();
             }
@@ -520,10 +521,6 @@ void MonthViewCell::updateCell()
         mItemList->insertItem( item );
-        tipText += "\n";
-       
+        mToolTip += "\n";
     }
-
-    // insert due todos
-    QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
-    Todo *todo;
-    for(todo = todos.first(); todo; todo = todos.next()) {
+void MonthViewCell::insertTodo(Todo *todo)
+{
         QString text;
@@ -564,7 +561,9 @@ void MonthViewCell::updateCell()
         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
@@ -586,2 +585,21 @@ void MonthViewCell::updateCell()
     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())
@@ -592,3 +610,3 @@ void MonthViewCell::updateConfig()
 {
-
+    qDebug("MonthViewCell::updateConfig() ");
     setFont( KOPrefs::instance()->mMonthViewFont );
@@ -960,2 +978,94 @@ void KOMonthView::updateView()
         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("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
@@ -970,2 +1080,5 @@ void KOMonthView::updateView()
     mCells[0]->setFocus();
+#endif
+
+    qDebug("update time %d ", ti.elapsed());
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 50903b3..b84065e 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -139,2 +139,6 @@ class MonthViewCell : public QWidget
     void updateCell();
+    void startUpdateCell();
+    void finishUpdateCell();
+    void insertEvent(Event *);
+    void insertTodo(Todo *);
 
@@ -160,2 +164,3 @@ class MonthViewCell : public QWidget
   protected:
+    QString mToolTip;
     void resizeEvent( QResizeEvent * );