3 files changed, 33 insertions, 25 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 9720146..ba97fa6 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -2,281 +2,285 @@
     This file is part of KOrganizer.
 
     Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <kdebug.h>
 #include <klocale.h>
 
 //#include "koglobals.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 
 #include <kcalendarsystem.h>
 
 #include "datenavigatorcontainer.h"
 #include "koprefs.h"
 
 DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
                                                 const char *name )
   : QWidget( parent, name ), mCalendar( 0 ),
     mHorizontalCount( 1 ), mVerticalCount( 1 )
 {
   mExtraViews.setAutoDelete( true );
 
   mNavigatorView = new KDateNavigator( this, name );
 
   connectNavigatorView( mNavigatorView );
   //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
   mLastDisplayedDN = 0;
+  mUpdateTimer; 
+  mUpdateTimer = new QTimer( this );
+  connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
 }
 
 DateNavigatorContainer::~DateNavigatorContainer()
 {
 }
 
 void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 {
   connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ),
            SIGNAL( datesSelected( const KCal::DateList & ) ) );
 #if 0
   connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ),
            SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) );
   connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ),
            SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) );
 #endif
   connect( v, SIGNAL( weekClicked( const QDate & ) ),
            SIGNAL( weekClicked( const QDate & ) ) );
 
   connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) );
   connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) );
 
   connect( v, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) );
   connect( v, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) );
   connect( v, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) );
   connect( v, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) );
 
   connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
 }
 
 void DateNavigatorContainer::slotMonthSelected( int month )
 {
     //qDebug("slotMonthSelected %d ", month);
     QDate baseDate = mNavigatorView->baseDate();
     if ( baseDate.month() == month )
         return;
     //qDebug("month %d %d  ",baseDate.month(),month);
     QDate date = QDate (  baseDate.year(), baseDate.month() , 15 );
     date = date.addDays( -(baseDate.month()-month ) *30 );
     QDate newBase = QDate (  date.year(), date.month() , baseDate.day() ); 
     
 #if 0
     mFirstSelectedDate = dateList.first() ;
     mSelectedDateCount = dateList.count() ;
 
   KDateNavigator *view = mExtraViews.at( 0 );
     QDate date = view->baseDate();
     
     QDate curEnd = date.addDays( (mLastDisplayedDN)*30 +7);
     //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
     if ( lDate < curEnd  && date.addDays( -30 ) <  fDate) {
         mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
         mNavigatorView->dayMatrix()->repaint( false );
         for( uint i = 0; i < mLastDisplayedDN; ++i ) {
             KDateNavigator *n = mExtraViews.at( i );
             if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
                 n->dayMatrix()->repaint( false );
             }
         }
         return;
     }
 #endif
     //qDebug("NEW BASE %s", newBase.toString().latin1());
     mNavigatorView->setBaseDate( newBase );
     QDate last = lastAvailableDate();
     QDate first = firstAvailableDate();
 
     QDate selFirst = mFirstSelectedDate;
     QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
     if ( selFirst >= first && selLast <= last ) {
         setBaseDates();
         updateDayMatrixDates();
     }
     else {
         setBaseDates();
         updateDayMatrixDates();
         emit monthSelected( month );
     }
 }
 void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
   mNavigatorView->setCalendar( cal );
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->setCalendar( cal );
   }
 }
+void DateNavigatorContainer::checkUpdateDayMatrixDates()
+{
+    QDate last = lastAvailableDate();
+    QDate first = firstAvailableDate();
+
+    QDate selFirst = mFirstSelectedDate;
+    QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
+    if ( selFirst >= first && selLast <= last ) {
+        updateDayMatrixDates();
+    }
+    else {
+        updateDayMatrixDates();
+        emit monthSelected( mFirstSelectedDate.month() );
+    }
+}
 void DateNavigatorContainer::updateDayMatrixDates()
 { 
-
+    mUpdateTimer->stop();
     QDate fDate =  mFirstSelectedDate;
     QDate lDate =  fDate.addDays( mSelectedDateCount - 1 );
     mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
     mNavigatorView->dayMatrix()->repaint( false );
     for( uint i = 0; i < mLastDisplayedDN; ++i ) {
         KDateNavigator *n = mExtraViews.at( i );
         if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
             n->dayMatrix()->repaint( false );
         }
     }
 }
 
 void DateNavigatorContainer::updateDayMatrix()
 {
   mNavigatorView->updateDayMatrix();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->updateDayMatrix();
   }
 }
 
 void DateNavigatorContainer::updateToday()
 {
     qDebug("DateNavigatorContainer::updateToday() NOT IMPL ");
 #if 0
   mNavigatorView->updateToday();
   KDateNavigator *n;
   for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
     n->updateToday();
   }
 #endif 
 }
 
 void DateNavigatorContainer::updateView()
 {
   mNavigatorView->updateView();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->updateView();
   }
 }
 
 void DateNavigatorContainer::updateConfig()
 {
   mNavigatorView->updateConfig();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->updateConfig();
   }
 }
 QDate DateNavigatorContainer::lastAvailableDate() const 
 {
     QDate date = mNavigatorView->baseDate();
     QDate last = QDate ( date.year(), date.month(), date.daysInMonth() );
     int iii = mLastDisplayedDN;
     if ( mLastDisplayedDN )
         last = last.addDays( 1);
     while ( iii ) {
         last = last.addDays( last.daysInMonth ());
         //qDebug("DATE %s   ", last.toString().latin1() );
         --iii;
     }
     if ( mLastDisplayedDN )
         last = last.addDays( -1);
     return last;
 }
 QDate DateNavigatorContainer::firstAvailableDate() const 
 {
     return QDate ( mNavigatorView->baseDate().year(), mNavigatorView->baseDate().month(), 1 );
 }
 void DateNavigatorContainer::selectDates( const DateList &dateList )
 {
     mFirstSelectedDate = dateList.first() ;
     mSelectedDateCount = dateList.count() ;
     if ( !mLastDisplayedDN ) {
         mNavigatorView->selectDates( dateList );
         return;
     } 
     QDate fDate =  dateList.first();
     QDate lDate =  dateList.last();
-    if ( mLastDisplayedDN <= 2  ) {
-        mNavigatorView->selectDates( dateList );
-        KDateNavigator *view = mExtraViews.at( 0 );
-        QDate bDate = fDate.addDays( fDate.daysInMonth () - fDate.day() +1 );
-        view->setBaseDate( bDate, false );
-        view->dayMatrix()->setSelectedDaysFrom(fDate , lDate);
-        if ( mLastDisplayedDN == 2  ) {
-            view = mExtraViews.at( 1 );
-            bDate = bDate.addDays( bDate.daysInMonth () - bDate.day() +1 );
-            view->setBaseDate( bDate, false );
-            view->dayMatrix()->setSelectedDaysFrom(fDate , lDate);
-        }
-        return;
-    }
     //qDebug("%s %s  ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1()  );
     //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
     if ( lDate <= lastAvailableDate() && firstAvailableDate() <=  fDate) {
         updateDayMatrixDates();
         return;
     }
     mNavigatorView->selectDates( dateList );
     setBaseDates();
   if ( mLastDisplayedDN ) {
       KDateNavigator *view = mExtraViews.at( 0 );
       view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
       view->dayMatrix()->repaint( false ); 
       if ( mLastDisplayedDN > 1 ) {
           KDateNavigator *view = mExtraViews.at( 1 );
           view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
           view->dayMatrix()->repaint( false );
       }
   }
 }
 
 void DateNavigatorContainer::setBaseDates()
 {
   QDate baseDate = mNavigatorView->baseDate();
   bool doRepaint = true;
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 );
       n->setBaseDate( baseDate, doRepaint );
   }
 }
 
 void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
 {
 #if 0
   kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
   kdDebug(5850) << "  CURRENT SIZE: " << size() << endl;
   kdDebug(5850) << "  MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
   kdDebug(5850) << "  SIZEHINT: " << sizeHint() << endl;
   kdDebug(5850) << "  MINIMUM SIZE: " << minimumSize() << endl;
 #endif
   //QSize minSize = mNavigatorView->sizeHintTwoButtons();
   QSize minSize = mNavigatorView->yourSizeHint();
 
 //  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
 
   int verticalCount = size().height() / minSize.height();
   int horizontalCount = size().width() / minSize.width();
   //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() );  
@@ -327,60 +331,61 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
       n->show();
     }
     int iii = 0;
     while ( iii < ( mExtraViews.count()  ) ) {
         if ( iii < count-1 )
             mExtraViews.at( iii )->show();
         else
             mExtraViews.at( iii )->hide();
         ++iii;
     }
     
     setBaseDates();
     if ( fontchange ) {
         //mNavigatorView->changeFont( fo );
         uint i;
         for( i = 0; i < mExtraViews.count(); ++i ) {
             KDateNavigator *view = mExtraViews.at( i );
             view->changeFont( fo );
         }
     }
     mHorizontalCount = horizontalCount;
     mVerticalCount = verticalCount;
     
   }
   //qDebug("COUNT %d ", mExtraViews.count());
   int height = size().height() / verticalCount;
   int width = size().width() / horizontalCount;
 
   NavigatorBar *bar = mNavigatorView->navigatorBar();
   if ( horizontalCount > 1 ) bar->showButtons( true, false );
   else bar->showButtons( true, true );
 
   mNavigatorView->setGeometry(0,
       0, width, height );
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
     int x = ( i + 1 ) % horizontalCount;
     int y = ( i + 1 ) / horizontalCount;
 
     KDateNavigator *view = mExtraViews.at( i );
     bar = view->navigatorBar();
     if ( y > 0 ) bar->showButtons( false, false );
     else {
         if ( x + 1 == horizontalCount ) bar->showButtons( false, true );
         else bar->showButtons( false, false );
     }
     view->setGeometry( x * width,
         y * height, width, height );
   }
+  mUpdateTimer->start( 250 );
   //updateDayMatrixDates();
 }
 
 QSize DateNavigatorContainer::minimumSizeHint() const
 {
   return mNavigatorView->minimumSizeHint();
 }
 
 QSize DateNavigatorContainer::sizeHint() const
 {
     return mNavigatorView->yourSizeHint();
 }
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index d5e5adf..df8efae 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -10,88 +10,90 @@
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef DATENAVIGATORCONTAINER_H
 #define DATENAVIGATORCONTAINER_H
 
 class KDateNavigator;
 
 #include <qwidget.h>
 #include <libkcal/calendar.h>
 using namespace KCal;
 
 class DateNavigatorContainer: public QWidget
 {
     Q_OBJECT
   public:
     DateNavigatorContainer( QWidget *parent = 0, const char *name = 0 );
     ~DateNavigatorContainer();
 
     /**
       Associate date navigator with a calendar. It is used by KODayMatrix.
     */
     void setCalendar( Calendar * );
 
     QSize minimumSizeHint() const;
     QSize sizeHint() const;
     KDateNavigator *  navigatorView() { return mNavigatorView;}
     QDate lastAvailableDate() const ;
     QDate firstAvailableDate() const ;
 
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
     void updateDayMatrixDates();
+    void checkUpdateDayMatrixDates();
     void updateToday();
     void slotMonthSelected( int month );
 
   signals:
     void datesSelected( const KCal::DateList & );
     void incidenceDropped( Incidence *, const QDate & );
     void incidenceDroppedMove( Incidence *, const QDate & );
     void weekClicked( const QDate &);
 
     void goPrevious();
     void goNext();
 
     void goNextMonth();
     void goPrevMonth();
     void goNextYear();
     void goPrevYear();
 
     void monthSelected( int month );
 
   protected:
     void resizeEvent( QResizeEvent * );
 
     void setBaseDates();
     void connectNavigatorView( KDateNavigator *v );
 
   private:
+    QTimer* mUpdateTimer;
     int mLastDisplayedDN;
     QDate mFirstSelectedDate;
     int mSelectedDateCount;
     KDateNavigator *mNavigatorView;
 
     KCal::Calendar *mCalendar;
 
     QPtrList<KDateNavigator> mExtraViews;
 
     int mHorizontalCount;
     int mVerticalCount;
 };
 
 #endif
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 366e8b8..59618bf 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -615,200 +615,201 @@ void KODayMatrix::dropEvent(QDropEvent *e)
 
   DndFactory factory( mCalendar );
   Event *event = factory.createDrop(e);
 
   if (event) {
     e->acceptAction();
 
     Event *existingEvent = mCalendar->event(event->uid());
 
     if(existingEvent) {
       // uniquify event
       event->recreate();
 /*
       KMessageBox::sorry(this,
               i18n("Event already exists in this calendar."),
               i18n("Drop Event"));
       delete event;
       return;
 */
     }
 //      kdDebug() << "Drop new Event" << endl;
     // Adjust date
     QDateTime start = event->dtStart();
     QDateTime end = event->dtEnd();
     int duration = start.daysTo(end);
     int idx = getDayIndexFrom(e->pos().x(), e->pos().y());
 
     start.setDate(days[idx]);
     end.setDate(days[idx].addDays(duration));
 
     event->setDtStart(start);
     event->setDtEnd(end);
     mCalendar->addEvent(event);
 
     emit eventDropped(event);
   } else {
 //    kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl;
     e->ignore();
   }
 #endif
 }
 
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
-  QRect sz = frameRect();
-    if ( sz.width() <= 0  || sz.height() <= 0 )
+  
+    if ( width() <= 0  || height() <= 0 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
-    if ( myPix.width() != sz.width() || myPix.height()!=sz.height() ) {
-        myPix.resize(sz.size() );
+    if ( myPix.width() != width() || myPix.height()!=height() ) {
+        myPix.resize(size() );
     }
   QPainter p(&myPix);
   p.setFont(font());
 
 
   int dheight = daysize.height();
   int dwidth = daysize.width();
   int row,col;
   int selw, selh;
   int xyOff = frameWidth();
-  int colModulo = sz.width()  % 7;
-  int rowModulo = sz.height()  % 6;
+  int colModulo = (width()-2)  % 7;
+  int rowModulo = (height()-2)  % 6;
   //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
   bool isRTL = KOGlobals::self()->reverseLayout();
 
   // draw background and topleft frame
-  p.fillRect(pevent->rect(), mDefaultBackColor);
+  p.fillRect(0,0,width(),height(), mDefaultBackColor);
   p.setPen(mDefaultTextColor);
-  p.drawRect(0, 0, sz.width()+1, sz.height()+1);
+  p.drawRect(0, 0, width(), height());
   int mSelStartT = mSelStart;
   int mSelEndT = mSelEnd;
   if ( mSelEndT >=  NUMDAYS )
       mSelEndT = NUMDAYS-1;
   // draw selected days with highlighted background color
   if (mSelStart != NOSELECTION) {
       bool skip = false;
       if ( ! mouseDown ) {
           int mo = days[20].month();
           //qDebug("--  %d %d ", mSelStartT, mSelEndT);
           //qDebug("%d %d %d - d %d", mo,  days[mSelStartT].month() , days[mSelEndT].month(),  days[mSelEndT].day() );
           int startMo = days[mSelStartT].month();
           int endMo = days[mSelEndT].month();
           if ( startMo == 12 && mo == 1 && endMo <= 2 )
               startMo = 1;
           if ( endMo == 1 && mo == 12 )
               endMo = 12;
           if ( mo == 12 && startMo == 1 )
               startMo = 13;
           if ( (startMo > mo || endMo < mo) ) {
               skip = true;
           } else {
               if ( days[mSelStartT].month() != mo ) {
                   int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day();
                   mSelStartT += add +1;
               }
               if ( days[mSelEndT].month() != mo ) {
                   int sub = days[mSelEndT].day();
                   mSelEndT -= sub ;
               }
           }
       }
       //qDebug("SKIP %d ", skip);
       if ( ! skip ) {
           row = mSelStartT/7;
           col = mSelStartT -row*7;
           QColor selcol = KOPrefs::instance()->mHighlightColor;
           int addCol = 0;
           int addRow = 0; 
           int addRow2 = 0; 
           int addCol2 = 0;
           if (row == mSelEndT/7) { 
               if ( rowModulo ) {
                   if ( row >= 6 - rowModulo )
                       addRow = row - 5 + rowModulo;
               }  
               if ( colModulo ) {
                   int colt1 = mSelEndT%7;
                   //qDebug("colt1 %d ", colt1 );
                   if ( colt1 >= 7 - colModulo )
                       addCol =  colt1 - 7 + colModulo+1; 
                   int colt = mSelStartT%7;
                   if ( colt >= 7 - colModulo )
                       addCol2 =  colt - 7 + colModulo;
                   addCol -= addCol2;
                   //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
               }
               // Single row selection
               if ( row == 0)
                   addRow = 1;
               p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
                          row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
           } else {
               // draw first row to the right
               if ( colModulo ) {
                   if ( col >= 7 - colModulo )
                       addCol2 =  col - 7 + colModulo;
               }
               if ( rowModulo ) {
                   if ( row >= 6 - rowModulo )
                       addRow = row - 5 + rowModulo;
               }  
               if ( row == 0)
                   addRow = 1; 
-              p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, (7-col)*dwidth+colModulo,
+              int drawWid = width()-(col*dwidth+1+addCol2)-1;
+              p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid,
                          dheight+1, selcol);
               // draw full block till last line
               selh = mSelEndT/7-row; 
               addRow = 0;
               if ( rowModulo ) {
                   if ( mSelEndT/7 >= 6 - rowModulo )
                       addRow = mSelEndT/7 - 5 + rowModulo;
               }  
               if (selh > 1) {
                   p.fillRect(1, (row+1)*dheight, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
               }
               // draw last block from left to mSelEndT
               selw = mSelEndT-7*(mSelEndT/7)+1;
               //qDebug("esl %d ",selw );
               int add = 0;
               if ( colModulo ) {
                   add = 7 - colModulo;
                   if ( selw > add )
                       add = selw - add;
                   else
                       add = 0;
               }
               //qDebug("add %d ", add);
               p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight+addRow,
                          selw*dwidth+add, dheight+1, selcol);
           }
       }
   }
 
   // iterate over all days in the matrix and draw the day label in appropriate colors
   QColor actcol = mDefaultTextColorShaded;
   p.setPen(actcol);
   QPen tmppen;
   for(int i = 0; i < NUMDAYS; i++) {
       row = i/7;
       col = isRTL ? 6-(i-row*7) : i-row*7;
 
       // if it is the first day of a month switch color from normal to shaded and vice versa
       if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) {
           if (actcol == mDefaultTextColorShaded) {
               actcol = mDefaultTextColor;
           } else {
               actcol = mDefaultTextColorShaded;
           }
           p.setPen(actcol);
       }
       if (actcol == mDefaultTextColorShaded) { 
           if ( ! mouseDown ) {
@@ -869,74 +870,74 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
 
       // if it is a holiday then use the default holiday color
       if (!mHolidays[i].isNull()) {
           if (  bDays.testBit(i) ) {
               p.setPen(Qt::green);
           } else {
               if (actcol == mDefaultTextColor) {
                   p.setPen(KOPrefs::instance()->mHolidayColor);
               } else {
                   p.setPen(mHolidayColorShaded);
               }
           }
       }
 
       // draw selected days with special color
       // DO NOT specially highlight holidays in selection !
       if (i >= mSelStartT && i <= mSelEndT) {
           ;//p.setPen(mSelectedDaysColor);
       }
 
       int addCol = 0;
       int addRow = 0;
       if ( colModulo ) {
           if ( col >= 7 - colModulo )
               addCol = col - 7 + colModulo;
       }
       if ( rowModulo ) {
           if ( row >= 6 - rowModulo )
               addRow = row - 5 + rowModulo;
       }
       //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
       ++addCol;//++addCol;
       if ( row == 0)
           addRow = 1;
       p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
                  Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
       // reset color to actual color
       if (!mHolidays[i].isNull()) {
           p.setPen(actcol);
       }
       // reset bold font to plain font
       if (events[i] > 0) {
           QFont myFont = font();
           myFont.setBold(false);
           p.setFont(myFont);
       }
   }
-  int off = xyOff;
+  int off = 0;//xyOff;
     bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); 
     //qDebug("ffffffffff %d ", off);
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent *)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
 }
 
 QSize KODayMatrix::sizeHint() const
 {
 
   QFontMetrics fm ( font() );
   int wid = fm.width( "30") *7+3;
   int hei = fm.height() * 6+3;
   //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);
   return   QSize ( wid, hei );
 
 }