more layout fixes

5 files changed, 82 insertions, 24 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 18756f0..bb27bce 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -1,276 +1,319 @@
 /*
     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)   ); 
+  mDisplayedEndDate = QDate::currentDate();
+  mLastDisplayedDN = 0;
 }
 
 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 ) ), SIGNAL( monthSelected( int ) ) );
 }
 
 void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
   mNavigatorView->setCalendar( cal );
-  KDateNavigator *n;
-  for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
-    n->setCalendar( cal );
+  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
+      KDateNavigator *n = mExtraViews.at( i );
+      n->setCalendar( cal );
   }
 }
 
 void DateNavigatorContainer::updateDayMatrix()
 {
   mNavigatorView->updateDayMatrix();
-  KDateNavigator *n;
-  for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
-    n->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();
-  KDateNavigator *n;
-  for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
-    n->updateView();
+  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
+      KDateNavigator *n = mExtraViews.at( i );
+      n->updateView();
   }
 }
 
 void DateNavigatorContainer::updateConfig()
 {
   mNavigatorView->updateConfig();
-  KDateNavigator *n;
-  for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
-    n->updateConfig();
+  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
+      KDateNavigator *n = mExtraViews.at( i );
+      n->updateConfig();
   }
 }
 
 void DateNavigatorContainer::selectDates( const DateList &dateList )
 {
-  mNavigatorView->selectDates( dateList );
-  setBaseDates();
-  if ( mExtraViews.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;
+    }
+    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;
+    }
+    mNavigatorView->selectDates( dateList );
+    setBaseDates();
+  if ( mLastDisplayedDN ) {
       KDateNavigator *view = mExtraViews.at( 0 );
       view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
       view->dayMatrix()->repaint( false ); 
-      if ( mExtraViews.count() > 1 ) {
+      if ( mLastDisplayedDN > 1 ) {
           KDateNavigator *view = mExtraViews.at( 1 );
           view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
           view->dayMatrix()->repaint( false );
       }
   }
 }
 
 void DateNavigatorContainer::setBaseDates()
 {
   KCal::DateList dateList = mNavigatorView->selectedDates();
   if ( dateList.isEmpty() ) {
     kdError() << "DateNavigatorContainer::selectDates() empty list." << endl;
   }
   QDate baseDate = dateList.first();
-  KDateNavigator *n;
   bool doRepaint = false; // skip first repaint
-  for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
+  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
+      KDateNavigator *n = mExtraViews.at( i );
       baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 );
       n->setBaseDate( baseDate, doRepaint );
       doRepaint = true;
   }
 }
 
 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() );  
   //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount );
   bool fontchange = false;  
   if ( horizontalCount == 1)
       horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width();  
   QFont fo;
   if ( horizontalCount != mHorizontalCount ||
        verticalCount != mVerticalCount ) {
     uint count = horizontalCount * verticalCount;
     if ( count == 0 ) {
         bool ok;
         fo = mNavigatorView->yourFontHint( size() , &ok );
         //mNavigatorView->resize( size() );
         //if ( ! ok )
         //  return;
         int butt = 2;
         horizontalCount =  size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
         if (  horizontalCount <= 1 )
             minSize = mNavigatorView->sizeHintTwoButtons( 4 ); 
         else 
             minSize = mNavigatorView->sizeHintTwoButtons(); 
         verticalCount = size().height() / minSize.height();
         horizontalCount = size().width() / minSize.width();
         if ( horizontalCount == 0 )
             horizontalCount = 1;
         if ( verticalCount == 0 )
             verticalCount = 1;
         fontchange = true;
         count = horizontalCount * verticalCount;
     } else {
         if ( mNavigatorView->fontChanged() ) {
             fontchange = true;
             fo = KOPrefs::instance()->mDateNavigatorFont;
             mNavigatorView->changeFont( fo );
             mNavigatorView->unsetFontChanged();
         }
     }
 
+    mLastDisplayedDN =  horizontalCount*verticalCount-1;
+    bool setBaseD = false;
     while ( count > ( mExtraViews.count() + 1 ) ) {
       KDateNavigator *n = new KDateNavigator( this );
       n->setMonthSignalOffset ( mExtraViews.count()+1 );
       mExtraViews.append( n );
       n->setCalendar( mCalendar );
-      setBaseDates();
+      setBaseD = true;
       connectNavigatorView( n );
       n->show();
     }
     int iii = 0;
     while ( iii < ( mExtraViews.count()  ) ) {
         if ( iii < count-1 )
             mExtraViews.at( iii )->show();
         else
             mExtraViews.at( iii )->hide();
         ++iii;
     }
+    if ( setBaseD )
+        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 < mExtraViews.count(); ++i ) {
+  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 );
   }
 }
 
 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 affa8e1..f45af20 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -1,90 +1,92 @@
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
     Copyright (C) 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.
 */
 #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;}
 
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
     void updateToday();
 
   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:
+    int mLastDisplayedDN;
+    QDate mDisplayedEndDate;
     KDateNavigator *mNavigatorView;
 
     KCal::Calendar *mCalendar;
 
     QPtrList<KDateNavigator> mExtraViews;
 
     int mHorizontalCount;
     int mVerticalCount;
 };
 
 #endif
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 10bc1be..93bbceb 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -1,163 +1,166 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     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.
 */
 #ifndef KDATENAVIGATOR_H
 #define KDATENAVIGATOR_H
 
 #include <qframe.h>
 #include <qdatetime.h>
 #include <qlabel.h>
 
 #include <libkcal/calendar.h>
 
 #include "kodaymatrix.h"
 
 class QPushButton;
 class QTimer;
 
 class KCalendarSystem;
 
 class NavigatorBar;
 
 class KDateNavigator: public QFrame
 {
     Q_OBJECT
   public:
     KDateNavigator( QWidget *parent = 0,const char *name = 0 );
     ~KDateNavigator();
 
     /** The DateNavigator automatically checks for
     * the passage of midnight. If rollover type is 
     * set to None, no signals are emitted and no
     * processing is done. With rollover set to 
     * FollowDay, the day highlighter changes at
     * midnight and dayPassed() is emitted.
     * With FollowMonth, it has the same effect
     * as FollowDay but also adjusts the month that is 
     * visible and emits monthPassed() when the month changes.
     */
     enum RolloverType { None, FollowDay, FollowMonth } ;
     void enableRollover( RolloverType );
 
     void setShowWeekNums( bool enabled );
     void setCalendar( Calendar * );
     void setBaseDate( const QDate & , bool doRepaint = true );
+
+    QDate baseDate() const { return m_MthYr;}
+
     KCal::DateList selectedDates() const { return mSelectedDates; }
     NavigatorBar *navigatorBar() const { return mNavigatorBar; }
     void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off%12;}
     QSize yourSizeHint()const { return mySizeHint; };
     QSize yourFullSizeHint() const { return myFullSizeHint;};
     QFont yourFontHint( QSize , bool * b);
     bool fontChanged() {return mFontChanged; }
     void unsetFontChanged() { mFontChanged = false; }
     KODayMatrix *dayMatrix() { return daymatrix  ;} 
     QSize sizeHint() const;
     QSize sizeHintTwoButtons( int butnum = 2 ) const;
     void changeFont ( QFont fo ); 
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
 
   signals:
     void datesSelected( const KCal::DateList & );
     void eventDropped( Event * );
     void weekClicked( const QDate &);
 
     void goPrevious();
     void goNext();
 
     void goNextMonth();
     void goPrevMonth();
     void goNextYear();
     void goPrevYear();
     void monthSelected( int );
 
     // Signals emitted at midnight carrying the new date.
     void dayPassed( QDate );
     void monthPassed( QDate );
 
   protected slots:
 
      /**
      * Called regularly to see if we need to update the view
      * wrt. the today box and the month box. Only important
      * if you leave KOrganizer idle for long periods of time.
      *
      * Until we have a reliable way of setting QTimers to go
      * off at a particular wall-clock time, we need this,
      * which calls passedMidnight() at the right moments.
      */
      void possiblyPastMidnight();
 
      /** handles updating the view when midnight has come by due to idle time.
      *
      */
      void passedMidnight();
      void slotMonthSelected( int m );
   protected:
     void updateDates();
 
     void wheelEvent (QWheelEvent *);
 
     bool eventFilter (QObject *,QEvent *);
 
   private:
     QSize mySizeHint;
     QSize myFullSizeHint;
     bool mFontChanged;
     int mMonthSignalOffset;
     NavigatorBar *mNavigatorBar;
 
     QFrame *headingSep;
     QFrame *weeknumSep;
     QLabel *headings[7];
     QLabel *weeknos[7];
     KODayMatrix *daymatrix;
 
     KCal::DateList mSelectedDates;
     QDate m_MthYr;
     int m_fstDayOfWk;
     bool m_bShowWeekNums;
 
     int dayNum(int row, int col);
     int dayToIndex(int dayNum);
 
     Calendar *mCalendar;
     KCalendarSystem *mCalendarSystem;
 
     const QString *curHeaders;
 
     /** used to update the day view periodically, in particular every
     * midnight to move the "today" rectangle.
     */
     QTimer *updateTimer;
     QDate lastDayChecked;
     RolloverType updateRollover;
 
     // Disabling copy constructor and assignment operator
     KDateNavigator(const KDateNavigator & );
     KDateNavigator &operator=(const KDateNavigator &);
 };
 
 #endif
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index a2e0ae0..3ee1fa7 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -95,393 +95,400 @@ void DynamicTip::maybeTip( const QPoint &pos )
 }
 
 
 // ============================================================================
 //  K O D A Y M A T R I X
 // ============================================================================
 
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
   : QFrame( parent, name ), mCalendar( 0 )
 
 #if 0
 KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) :
   QFrame(parent, name)
 #endif
 {
   mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
   bDays.resize ( NUMDAYS );
   days = new QDate[NUMDAYS];
   daylbls = new QString[NUMDAYS];
   events = new int[NUMDAYS];
   mToolTip = new DynamicTip(this);
 
   // set default values used for drawing the matrix
   mDefaultBackColor = palette().active().base();
   mDefaultTextColor = palette().active().foreground();
   mDefaultTextColorShaded = getShadedColor(mDefaultTextColor);
   mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor);
   mSelectedDaysColor = QColor("white");
   mTodayMarginWidth = 2;
   mSelEnd = mSelStart = NOSELECTION;
 
   setAcceptDrops(true);
   //setFont( QFont("Arial", 10) );
 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() ));
   mRepaintTimer = new QTimer( this );
   connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() ));
   mDayChanged = false;
   updateView();
 }
 QString KODayMatrix::getWhatsThisText( QPoint p )
 {
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
     QPtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
 #if QT_VERSION >= 0x030000
         mToolTipText.replace( '<' , "&lt;" );
         mToolTipText.replace( '>' , "&gt;" );
 #else
         if ( mToolTipText.find ('<') >= 0 ) {
             mToolTipText.replace( QRegExp("<") , "&lt;" );
         }
         if ( mToolTipText.find ('>') >= 0 ) {
             mToolTipText.replace( QRegExp(">") , "&gt;" );
         }
 #endif
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( mToolTipText );
     }
     mToolTip.sort();
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
 
   setAcceptDrops( mCalendar );
 
   updateEvents();
 }
 
 QColor KODayMatrix::getShadedColor(QColor color)
 {
   QColor shaded;
   int h=0;
   int s=0;
   int v=0;
   color.hsv(&h,&s,&v);
   s = s/4;
   v = 192+v/4;
   shaded.setHsv(h,s,v);
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   delete [] events;
   delete mToolTip;
 }
 
 /*
 void KODayMatrix::setStartDate(QDate start)
 {
   updateView(start);
 }
 */
 
 void KODayMatrix::addSelectedDaysTo(DateList& selDays)
 {
  
   if (mSelStart == NOSELECTION) {
     return;
   }
 
   //cope with selection being out of matrix limits at top (< 0)
   int i0 = mSelStart;
   if (i0 < 0) {
     for (int i = i0; i < 0; i++) {
       selDays.append(days[0].addDays(i));
     }
     i0 = 0;
   }
 
   //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
   if (mSelEnd > NUMDAYS-1) {
     for (int i = i0; i <= NUMDAYS-1; i++) {
       selDays.append(days[i]);
     }
     for (int i = NUMDAYS; i < mSelEnd; i++) {
       selDays.append(days[0].addDays(i));
     }
 
   // apply normal routine to selection being entirely within matrix limits
   } else {
     for (int i = i0; i <= mSelEnd; i++) {
       selDays.append(days[i]);
     }
   }
 }
 
-void KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
+bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 {
+    bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
   mSelStart = startdate.daysTo(start);
   if ( mSelStart < 0 )
       mSelStart = 0;
   mSelEnd = startdate.daysTo(end);
-  //qDebug("SELECTION %d %d ", mSelStart ,mSelEnd );
-  if ( mSelEnd < 0 )
+  if ( mSelEnd  > NUMDAYS-1 )
+      mSelEnd = NUMDAYS-1;
+  if ( mSelEnd < 0 || mSelStart >  NUMDAYS-1 ) {
       clearSelection();
+      if ( noSel )
+          return false;
+  }
+ 
+  return true;
 }
 void KODayMatrix::clearSelection()
 {
     mSelEnd = mSelStart = NOSELECTION;
 }
 
 
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 {
     mRepaintTimer->stop(); 
     repaint(false);
 }
 void KODayMatrix::updateViewTimed()
 {
     mUpdateTimer->stop(); 
     if ( !mCalendar ) {
         qDebug("NOT CAL ");
         return;
     }
     //qDebug("KODayMatrix::updateViewTimed ");
     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 = "";
         bDays.clearBit(i);
         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->isHoliday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
             }
             if ( event->isBirthday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += i18n("Birthday") + ": "+event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
                 bDays.setBit(i);
             }
         }
         events[i] = numEvents;
         //if it is a holy day then draw it red. Sundays are consider holidays, too
         if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) ||
              !holiStr.isEmpty()) {
             mHolidays[i] = holiStr;
         } else {
             mHolidays[i] = QString::null;
         }
     }
     if ( ! mPendingUpdateBeforeRepaint )
         repaint(false);
 }
 void KODayMatrix::updateView(QDate actdate)
 {
    
     if ( ! actdate.isValid() ) {
         //qDebug("date not valid ");
         return;
     }
     mDayChanged = false;
     //flag to indicate if the starting day of the matrix has changed by this call
     //mDayChanged = false;
     // if a new startdate is to be set then apply Cornelius's calculation
     // of the first day to be shown
     if (actdate != startdate) {
         // reset index of selection according to shift of starting date from startdate to actdate
         if (mSelStart != NOSELECTION) {
             int tmp = actdate.daysTo(startdate);
             //kdDebug() <<  "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl;
             // shift selection if new one would be visible at least partly !
 
             if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) {
                 // nested if is required for next X display pushed from a different month - correction required
                 // otherwise, for month forward and backward, it must be avoided
                 if( mSelStart > NUMDAYS || mSelStart < 0 )
                     mSelStart = mSelStart + tmp;
                 if( mSelEnd > NUMDAYS || mSelEnd < 0 )
                     mSelEnd = mSelEnd + tmp;
                     }
         }
         startdate = actdate;
         mDayChanged = true;
         recalculateToday();
     }
     //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
     } else {
 #ifdef DESKTOP_VERSION
         //mRepaintTimer->start( 100 );
         //updateViewTimed();
      mUpdateTimer->start( 20 );
 #else
         mRepaintTimer->start( 350 ); 
         mUpdateTimer->start( 1200 );
 #endif
     }
 }
 void KODayMatrix::updateEvents()
 {
   if ( !mCalendar ) return;
 
   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 ] );
     int numEvents = eventlist.count();
     Event *event;
     for( event = eventlist.first(); event != 0;event=eventlist.next()) {
       ushort recurType = event->doesRecur();
 
       if ( ( recurType == Recurrence::rDaily &&
              !KOPrefs::instance()->mDailyRecur ) ||
            ( recurType == Recurrence::rWeekly &&
              !KOPrefs::instance()->mWeeklyRecur ) ) {
         numEvents--;
       }
     }
     events[ i ] = numEvents;
   }
 }
 
 const QDate& KODayMatrix::getDate(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset2 %d", offset);
     return days[0];
   }
   return days[offset];
 }
 
 QString KODayMatrix::getHolidayLabel(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset1 %d", offset);
       return QString();
   }
   return mHolidays[offset];
 }
 
 int KODayMatrix::getDayIndexFrom(int x, int y)
 { 
   int colModulo = (width()-2)  % 7;
   int rowModulo = (height()-2)  % 6;
 #if 0
   return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ? 
             6 - x/daysize.width() : x/daysize.width());
 #endif
   int xVal = (x-colModulo/2-2)/daysize.width();
   int yVal = (y-rowModulo/2-2)/daysize.height();
   
   
   return 7*(yVal) + xVal;
 
 }
 
 // ----------------------------------------------------------------------------
 //  M O U S E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::mousePressEvent (QMouseEvent* e)
 {
@@ -510,397 +517,400 @@ void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
       repaint(false);
     }
   } else {
     mSelStart = mSelInit;
 
     //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
       repaint(false);
     }
   }
 
   DateList daylist;
     if ( mSelStart < 0 )
         mSelStart = 0;
   for (int i = mSelStart; i <= mSelEnd; i++) {
     daylist.append(days[i]);
   }
   emit selected((const DateList)daylist);
 
 }
 
 void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
 { 
     if ( ! mouseDown ) {
         return;
     }
   int tmp = getDayIndexFrom(e->x(), e->y());
   if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
 
   if (mSelInit > tmp) {
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
       repaint(false);
     }
   } else {
     mSelStart = mSelInit;
 
     //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
       repaint(false);
     }
   }
 }
 
 // ----------------------------------------------------------------------------
 //  D R A G ' N   D R O P   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   // some visual feedback
 //  oldPalette = palette();
 //  setPalette(my_HilitePalette);
 //  update();
 #endif
 }
 
 void KODayMatrix::dragMoveEvent(QDragMoveEvent *e)
 {
 #ifndef KORG_NODND
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   e->accept();
 #endif
 }
 
 void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/)
 {
 #ifndef KORG_NODND
 //  setPalette(oldPalette);
 //  update();
 #endif
 }
 
 void KODayMatrix::dropEvent(QDropEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl;
 
   if (!mCalendar || !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   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 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
     if ( myPix.width() != sz.width() || myPix.height()!=sz.height() ) {
         myPix.resize(sz.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;
   //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
   bool isRTL = KOGlobals::self()->reverseLayout();
 
   // draw background and topleft frame
   p.fillRect(pevent->rect(), mDefaultBackColor);
   p.setPen(mDefaultTextColor);
   p.drawRect(0, 0, sz.width()+1, sz.height()+1);
   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,
                          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 ) {
           continue;
           }
       }
       //Reset pen color after selected days block
       if (i == mSelEndT+1) {
           p.setPen(actcol);
       }
 
       // if today then draw rectangle around day
       if (today == i) {
           tmppen = p.pen();
           QPen mTodayPen(p.pen());
           if ( daysize.width() < 20 )
               mTodayPen.setWidth(1);
           else
               mTodayPen.setWidth(mTodayMarginWidth);
           //draw red rectangle for holidays
           if (!mHolidays[i].isNull()) {
               if (actcol == mDefaultTextColor) {
                   mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
               } else {
                   mTodayPen.setColor(mHolidayColorShaded);
               }
           }
           //draw gray rectangle for today if in selection
           if (i >= mSelStartT && i <= mSelEndT) {
               QColor grey("grey");
               mTodayPen.setColor(grey);
           }
           p.setPen(mTodayPen);
 
 
           int addCol = 0;
           int addRow = 0;
           if (rowModulo) { 
               if ( row >= 6 - rowModulo )
                   addRow = row - 5 + rowModulo;
           }  
           if ( colModulo ) {
               if ( col >= 7 - colModulo )
                   addCol = col - 6 + colModulo-1;
           }
          
           addCol += 1;
           p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1);
           p.setPen(tmppen);
       }
 
       // if any events are on that day then draw it using a bold font
       if (events[i] > 0) {
           QFont myFont = font();
           myFont.setBold(true);
           p.setFont(myFont);
       }
 
       // 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);
       }
   }
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 10f4b05..2a1959c 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -1,324 +1,324 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at>
 
     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.
 */
 #ifndef _KODAYMAT_H
 #define _KODAYMAT_H
 
 #include <libkcal/calendar.h>
 
 #include <qstring.h>
 #include <qframe.h>
 #include <qcolor.h>
 #include <qpen.h>
 #include <qdatetime.h>
 #include <qtooltip.h>
 #include <qpixmap.h>
 #include <qbitarray.h>
 #include <qmap.h>
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class KODayMatrix;
 class KODaymatrixWhatsThis;
 
 using namespace KCal;
 
 
 /**
  *  small helper class to dynamically show tooltips inside the day matrix.
  *  This class asks the day matrix object for a appropriate label which
  *  is in our special case the name of the holiday or null if this day is no holiday.
  */
 class DynamicTip : public QToolTip
 {
 public:
 
     /**
      * Constructor that expects a KODayMatrix object as parent.
      *
      * @param parent the parent KODayMatrix control.
      */
     DynamicTip(QWidget* parent );
 
 protected:
 
     /**
      * Qt's callback to ask the object to provide an approrpiate text for the
      * tooltip to be shown.
      *
      * @param pos coordinates of the mouse.
      */
     void maybeTip( const QPoint & pos);
 
 private:
 
     /** the parent control this tooltip is designed for. */
     KODayMatrix* matrix;
 };
 
 /**
  *  replacement for kdpdatebuton.cpp that used 42 widgets for the day matrix to be displayed.
  *  Cornelius thought this was a waste of memory and a lot of overhead.
  *  In addition the selection was not very intuitive so I decided to rewrite it using a QFrame
  *  that draws the labels and allows for dragging selection while maintaining nearly full
  *  compatibility in behaviour with its predecessor.
  *
  *  The following functionality has been changed:
  *
  *  o when shifting events in the agenda view from one day to another the day matrix is updated now
  *  o TODO ET dragging an event to the matrix will MOVE not COPY the event to the new date.
  *  o no support for Ctrl+click to create groups of dates
  *    (This has not really been supported in the predecessor. It was not very intuitive nor was it
  *     user friendly.)
  *    This feature has been replaced with dragging a selection on the matrix. The matrix will
  *    automatically choose the appropriate selection (e.g. you are not any longer able to select
  *    two distinct groups of date selections as in the old class)
  *  o now that you can select more then a week it can happen that not all selected days are
  *    displayed in the matrix. However this is preferred to the alternative which would mean to
  *    adjust the selection and leave some days undisplayed while scrolling through the months
  *
  *  @short day matrix widget of the KDateNavigator
  *
  *  @author Eitzenberger Thomas
  */
 class KODayMatrix: public QFrame {
 
     Q_OBJECT
 
 public:
 
     /** constructor to create a day matrix widget.
      *
      *  @param parent widget that is the parent of the day matrix. Normally this should
      *                be a KDateNavigator
      *  @param calendar instance of a calendar on which all calculations are based
      *  @param date start date of the matrix (is expected to be already fixed). It is
      *              assumed that this date is the first week day to be shown in the matrix.
      *  @param name name of the widget
      */
     KODayMatrix( QWidget *parent, const char *name );
     //KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name );
 
     /** destructor that deallocates all dynamically allocated private members.
      */
     ~KODayMatrix();
 
     /** updates the day matrix to start with the given date. Does all the necessary
      *  checks for holidays or events on a day and stores them for display later on.
      *  Does NOT update the view visually. Call repaint() for this.
      *
      *  @param actdate recalculates the day matrix to show NUMDAYS starting from this
      *                 date.
      */
     void updateView(QDate actdate);
     void updateEvents();
 
     /** returns the QDate object associated with day indexed by the
      *  supplied offset.
      */
     const QDate& getDate(int offset);
     void setCalendar( Calendar * );
     /** returns the official name of this holy day or 0 if there is no label
      *  for this day.
      */
     QString getHolidayLabel(int offset);
 
     /** adds all actual selected days from mSelStart to mSelEnd to the supplied
      *  DateList.
      */
     void addSelectedDaysTo(DateList&);
 
     /** sets the actual to be displayed selection in the day matrix starting from
      *  start and ending with end. Theview must be manually updated by calling
      *  repaint. (?)
      */
-    void setSelectedDaysFrom(const QDate& start, const QDate& end);
+    bool setSelectedDaysFrom(const QDate& start, const QDate& end);
     void clearSelection();
 
     /** Is today visible in the view? Keep this in sync with
     * the values today (below) can take.
     */
     bool isTodayVisible() const { return today>=0; } ;
     
     /** If today is visible, then we can find out if today is 
     * near the beginning or the end of the month.
     * This is dependent on today remaining the index
     * in the array of visible dates and going from
     * top left (0) to bottom right (41).
     */
     bool isBeginningOfMonth() const { return today<=8; } ;
     bool isEndOfMonth() const { return today>=27; } ;
     QString getWhatsThisText( QPoint ) ;
     QSize sizeHint() const;
     QRect frameRect () const { int wid = frameWidth(); return  QRect(0+wid,0+wid,width()-wid-wid,height()-wid-wid);}
 public slots:
     /** Recalculates all the flags of the days in the matrix like holidays or events
      *  on a day (Actually calls above method with the actual startdate).
      */
     void updateView();
     void updateViewTimed();
     void repaintViewTimed();
 
     /**
     * Calculate which square in the matrix should be 
     * hilighted to indicate it's today.
     */
     void recalculateToday();
     
 /*
     void setStartDate(QDate);
 */
 
 signals:
 
     /** emitted if the user selects a block of days with the mouse by dragging a rectangle
      *  inside the matrix
      *
      *  @param daylist list of days that have been selected by the user
      */
     void selected( const KCal::DateList &daylist );
 
     /** emitted if the user has dropped an event inside the matrix
      *
      *  @param event the dropped calendar event
      */
     void eventDropped(Event *event);
 
 protected:
 
     void paintEvent(QPaintEvent *ev);
 
     void mousePressEvent (QMouseEvent* e);
 
     void mouseReleaseEvent (QMouseEvent* e);
 
     void mouseMoveEvent (QMouseEvent* e);
 
     void dragEnterEvent(QDragEnterEvent *);
 
     void dragMoveEvent(QDragMoveEvent *);
 
     void dragLeaveEvent(QDragLeaveEvent *);
 
     void dropEvent(QDropEvent *);
 
     void resizeEvent(QResizeEvent *);
 
 private:
     KODaymatrixWhatsThis* mKODaymatrixWhatsThis;
     bool mouseDown;
     QBitArray bDays;
     QPixmap myPix;
     QTimer* mUpdateTimer;
     QTimer* mRepaintTimer;
     bool mDayChanged;
     bool mPendingUpdateBeforeRepaint;
 
     /** returns the index of the day located at the matrix's widget (x,y) position.
      *
      *  @param x horizontal coordinate
      *  @param y vertical coordinate
      */
     int getDayIndexFrom(int x, int y);
 
     /** calculates a "shaded" color from the supplied color object.
      *  (Copied from Cornelius's kdpdatebutton.cpp)
      *
      *  @param color source based on which a shaded color should be calculated.
      */
     QColor getShadedColor(QColor color);
 
     /** number of days to be displayed. For now there is no support for any other number then 42.
         so change it at your own risk :o) */
     static const int NUMDAYS;
 
     /** calendar instance to be queried for holidays, events, ... */
     Calendar  *mCalendar;
 
     /** starting date of the matrix */
     QDate     startdate;
 
     /** array of day labels to optimeize drawing performance. */
     QString   *daylbls;
 
     /** array of days displayed to reduce memory consumption by
         subsequently calling QDate::addDays(). */
     QDate     *days;
 
     /** array of storing the number of events on a given day.
       *  used for drawing a bold font if there is at least one event on that day.
       */
     int      *events;
 
     /** stores holiday names of the days shown in the matrix. */
     QMap<int,QString>  mHolidays;
 
     /** indey of today or -1 if today is not visible in the matrix. */
     int       today;
 
     /** index of day where dragged selection was initiated.
         used to detect "negative" timely selections */
     int       mSelInit;
 
     /** if mSelStart has this value it indicates that there is no
         actual selection in the matrix. */
     static const int NOSELECTION;
 
     /** index of first selected day. */
     int       mSelStart;
 
     /** index of last selected day. */
     int       mSelEnd;
 
     /** dynamic tooltip to handle mouse dependent tips for each day in the matrix. */
     DynamicTip* mToolTip;
 
 
     /** default background colour of the matrix. */
     QColor    mDefaultBackColor;
 
     /** default text color of the matrix. */
     QColor    mDefaultTextColor;
 
     /** default text color for days not in the actual month. */
     QColor    mDefaultTextColorShaded;
 
     /** default text color for holidays not in the actual month. */
     QColor    mHolidayColorShaded;
 
     /** text color for selected days. */
     QColor    mSelectedDaysColor;
 
     /** default width of the frame drawn around today if it is visible in the matrix. */
     int       mTodayMarginWidth;
 
     /** stores actual size of each day in the widget so that I dont need to ask this data
      *  on every repaint.
      */
     QRect     daysize;
 
 };
 
 #endif