1 files changed, 14 insertions, 16 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ca896b5..549ef2a 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -213,5 +213,4 @@ void KODayMatrix::updateView()
 void KODayMatrix::repaintViewTimed()
 {
-    qDebug("KODayMatrix::repaintViewTimed ");
     mRepaintTimer->stop(); 
     repaint(false);
@@ -221,33 +220,27 @@ void KODayMatrix::updateViewTimed()
 
     mUpdateTimer->stop(); 
-    qDebug("KODayMatrix::updateView(QDate actdate)");
     for(int i = 0; i < NUMDAYS; i++) {
-
         // if events are set for the day then remember to draw it bold
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
-
+        QString holiStr = "";
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
             ushort recurType = event->recurrence()->doesRecur();
-
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
+            if ( event->categories().contains( i18n("Holiday") ) || event->categories().contains( "Holiday" )) {
+                if ( !holiStr.isEmpty() )
+                    holiStr += "\n";
+                holiStr += event->summary();
+            }
         }
         events[i] = numEvents;
-
         //if it is a holy day then draw it red. Sundays are consider holidays, too
-#ifndef KORG_NOPLUGINS
-        QString holiStr = KOCore::self()->holiday(days[i]);
-#else
-        QString holiStr = QString::null;
-#endif
         if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) ||
              !holiStr.isEmpty()) {
-            if (holiStr.isNull()) holiStr = "";
             mHolidays[i] = holiStr;
-
         } else {
             mHolidays[i] = QString::null;
@@ -289,5 +282,5 @@ void KODayMatrix::updateView(QDate actdate)
         recalculateToday();
     }
-    qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
+    //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
@@ -488,10 +481,14 @@ void KODayMatrix::dropEvent(QDropEvent *e)
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
-//kdDebug() << "KODayMatrix::paintEvent() BEGIN" << endl;
+    if ( width() <= 0  || height() <= 0 )
+        return;
    if ( mPendingUpdateBeforeRepaint ) {
        updateViewTimed();
        mPendingUpdateBeforeRepaint = false;
     }
-  QPainter p(this);
+    if ( myPix.width() != width() || myPix.height()!=height() ) {
+        myPix.resize(size() );
+    }
+  QPainter p(&myPix);
 
   QRect sz = frameRect();
@@ -617,4 +614,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
     }
   }
+    bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 
 }