2 files changed, 33 insertions, 4 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index f983ff9..4bf9dea 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -184,192 +184,208 @@ void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 
 void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
 {
     QListBox::mousePressEvent(e);
 
     if(e->button() == RightButton) {
         emit rightClick();
     }
 }
 
 MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     : QListBoxItem()
 {
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false;
 }
 
 void MonthViewItem::paint(QPainter *p)
 {
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
 #endif 
 
 
     if (KOPrefs::instance()->mMonthViewUsesCategoryColor)
         {
             p->setBackgroundColor( palette().color( QPalette::Normal,  \
                                                     sel ? QColorGroup::Highlight : QColorGroup::Background ) );
             p->eraseRect( 0, 0, listBox()->maxItemWidth(), height( listBox() ) );
         }
     int x = 1;
     //int y = 3;//(height() - mRecurPixmap.height()) /2; 
     int size = PIXMAP_SIZE;
     if ( QApplication::desktop()->width() < 300 )
         size = 3;
     int heihei = height( listBox () );
     int y = (heihei - size -1 ) /2; 
 
     if ( KOPrefs::instance()->mMonthShowIcons ) {
         if ( mInfo ) { 
             p->fillRect ( x, y,size,size, Qt::darkGreen );
             x += size + 1;
         }
         if ( mRecur ) {
             p->fillRect ( x, y,size,size, Qt::blue );
             x += size + 1;
         }
         if ( mAlarm ) {
             p->fillRect ( x, y,size,size, Qt::red );
             x += size + 1;
         }
         if ( mReply ) {
             p->fillRect ( x, y,size,size, Qt::yellow );
             x += size + 1;
         }
     }
     if ( mMultiday ) { 
         int yyy = y+(size/2);
         int sizeM = size+2;
         p->setBrush( QBrush::SolidPattern );
         p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ;
         if ( mMultiday == 2 || mMultiday == 3 ) { 
             QPointArray pa ( 3 );
             pa.setPoint (0,  x, yyy );
             pa.setPoint (1,  x+sizeM/2, yyy+sizeM/2 );
             pa.setPoint (2,  x+sizeM/2, yyy-sizeM/2 );
             p->drawPolygon( pa );
         }
         if ( mMultiday == 2 || mMultiday == 1 ) { 
             QPointArray pa ( 3 );
             pa.setPoint (0,  x+sizeM +sizeM/2, yyy );
             pa.setPoint (1,  x+sizeM, yyy+sizeM/2 );
             pa.setPoint (2,  x+sizeM, yyy-sizeM/2 );
             p->drawPolygon( pa );
         }
         if ( mMultiday == 1 ) {  
             // p->fillRect (  x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern   ) );
            
             p->drawLine (  x+1, yyy-sizeM/2,  x+1, yyy+sizeM/2 );
         }
         if (  mMultiday == 3 ) { 
             // p->fillRect (  x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern   ) );
             p->drawLine (  x+sizeM +sizeM/2-1, yyy-sizeM/2,  x+sizeM +sizeM/2-1, yyy+sizeM/2 );
            
         }
         x += sizeM/2 + 1;
         x += sizeM + 1;
     }
+
+    if ( mIncidence->type() == "Todo" ){
+        Todo* td = ( Todo* ) mIncidence;
+        if ( td->isCompleted() ) {
+            int half = size/2;
+            p->drawLine ( x, heihei/2, x +half , heihei/2 +half ) ;
+            p->drawLine (  x +half , heihei/2 +half ,  x +half+half +2 , heihei/2  -2 ) ;
+            x += half+half + 4;
+
+        } else {
+            int val = td->percentComplete()/20;
+            p->fillRect ( x+1, y-1, val ,size+2,Qt::black );
+            p->drawRect ( x, y-1,7,size+2);
+            x += size + 3;
+        }
+    }
     QFontMetrics fm = p->fontMetrics();
     int yPos;
     int pmheight = size;
     if( pmheight < fm.height() )
         yPos = fm.ascent() + fm.leading()/2;
     else
         yPos = pmheight/2 - fm.height()/2  + fm.ascent();
     p->setPen( palette().color( QPalette::Normal, sel ? \
                                 QColorGroup::HighlightedText : QColorGroup::Foreground ) );
     p->drawText( x, yPos, text() );
     if ( mIncidence->cancelled() ) {
         int wid = fm.width( text() );
         p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
     }
       
 }
 
 int MonthViewItem::height(const QListBox *lb) const
 {
     if ( lb )
         return  lb->fontMetrics().lineSpacing()+1;
     return 10;
 }
 
 int MonthViewItem::width(const QListBox *lb) const
 { 
     int size = PIXMAP_SIZE;
     if ( QApplication::desktop()->width() < 300 )
         size = 3;
     int x = 1; 
     if ( KOPrefs::instance()->mMonthShowIcons ) {
         if ( mInfo ) {
             x += size + 1;
         }
         if( mRecur ) {
             x += size+1;
         }
         if( mAlarm ) {
             x += size+1;
         }
         if( mReply ) {
             x += size+1;
         }
     }
     if( mMultiday ) {
         x += size+1+2+size/2;
     }
 
     return( x + lb->fontMetrics().width( text() ) + 1 );
 }
 
 
 MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     : QWidget( par ),
       mMonthView( parent )
 {
 
     QVBoxLayout *topLayout = new QVBoxLayout( this );
 
     // mLabel = new QLabel( this );QPushButton 
     mLabel = new QPushButton( this );
     //mLabel->setFrameStyle( QFrame::Panel | QFrame::Plain );
     //mLabel->setLineWidth( 1 );
     //mLabel->setAlignment( AlignCenter );
     mLabel->setFlat( true );
     mLabel->setFocusPolicy(NoFocus); 
     mItemList = new KNoScrollListBox( this );
     mItemList->setMinimumSize( 10, 10 );
     mItemList->setFrameStyle( QFrame::Panel | QFrame::Plain );
     mItemList->setLineWidth( 1 );
     topLayout->addWidget( mItemList );
     mLabel->raise();
     // QColor( 0,0,255 )    QColor( 160,1600,255 )
     mStandardPalette = palette();
     mStandardPalette.setColor(QColorGroup::Base, mStandardPalette.color( QPalette::Normal, QColorGroup::Background ) );
 
     enableScrollBars( false );
     updateConfig();
     //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
     connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
     connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ),
              SLOT( defaultAction( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( rightButtonPressed( QListBoxItem *,
                                                     const QPoint &) ),
              SLOT( contextMenu( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ),
              SLOT( selection( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( cellClicked( QListBoxItem * ) ) );  
     connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( selection( QListBoxItem * ) ) ); 
 }
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
     if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
@@ -509,252 +525,252 @@ void MonthViewCell::insertEvent(Event *event)
         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();
             mToolTip += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTip += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTip +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
 
         MonthViewItem *item = new MonthViewItem( event, mDate, text );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = event->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( event->recurrence()->doesRecur() );
         item->setAlarm( event->isAlarmEnabled() && multiday < 2 );
         item->setMoreInfo( event->description().length() > 0  );
 #ifdef DESKTOP_VERSION
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true && multiday < 2);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
 #endif
         item->setMultiDay( multiday );
         mItemList->insertItem( item );
         mToolTip += "\n";
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     mItemList->setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
-        text += i18n("T: %1").arg(todo->summary());
+        text += todo->summary();
 
         MonthViewItem *item = new MonthViewItem( todo, mDate, text );
         //item->setPalette( mStandardPalette );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = todo->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( todo->recurrence()->doesRecur() );
         item->setAlarm( todo->isAlarmEnabled() );
         item->setMoreInfo( todo->description().length() > 0  );
         mItemList->insertItem( item );
         mToolTip += text+"\n"; 
 }
 void MonthViewCell::finishUpdateCell()
 {
 #ifdef DESKTOP_VERSION
     if (mToolTip != "")
         QToolTip::add(this,mToolTip,toolTipGroup(),"");
 #endif
     mItemList->sort();
     //setMyPalette(); 
     setMyPalette();
     QString text;
     bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
     if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
         text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
         mLabel->resize( mLabelBigSize  );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     } else {
         mLabel->resize( mLabelSize );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     }
     
     mLabel->setText( text );
     resizeEvent( 0 );
 }
 void MonthViewCell::updateCell()
 {
-    qDebug("MonthViewCell::updateCell() ");
+    //qDebug("MonthViewCell::updateCell() ");
     if ( !mMonthView->isUpdatePossible() )
         return;
     startUpdateCell();
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) { // for event
         insertEvent(event);
     }
     // insert due todos
     QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         insertTodo( todo );
     }
     finishUpdateCell();
     // if ( isVisible())
     //qApp->processEvents();
 }
 
 void MonthViewCell::updateConfig( bool bigFont ) // = false
 {
 
     if ( bigFont ) {
         QFont fo = KOPrefs::instance()->mMonthViewFont;
         int ps = fo.pointSize() + 2;
         if ( ps < 18 )
             ps += 2;
         fo.setPointSize( ps ); 
         setFont( fo );
     } else
         setFont( KOPrefs::instance()->mMonthViewFont );
 
     QFontMetrics fm( font() );
     mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
     mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
     mHolidayPalette = mStandardPalette;
     mPrimaryPalette = mStandardPalette;
     mNonPrimaryPalette = mStandardPalette;
     if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
         mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Foreground,  KOPrefs::instance()->mMonthViewHolidayColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
         mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
         mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
         mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 
         mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 
     }
     //updateCell(); 
 }
 
 void MonthViewCell::enableScrollBars( bool enabled )
 {
     if ( enabled ) {
         mItemList->setVScrollBarMode(QScrollView::Auto);
         mItemList->setHScrollBarMode(QScrollView::Auto);
     } else {
         mItemList->setVScrollBarMode(QScrollView::AlwaysOff);
         mItemList->setHScrollBarMode(QScrollView::AlwaysOff);
     }
 }
 
 Incidence *MonthViewCell::selectedIncidence()
 {
     int index = mItemList->currentItem();
     if ( index < 0 ) return 0;
   
     MonthViewItem *item =
         static_cast<MonthViewItem *>( mItemList->item( index ) );
 
     if ( !item ) return 0;
   
     return item->incidence();
 }
 
 QDate MonthViewCell::selectedIncidenceDate()
 {
     QDate qd;
     int index = mItemList->currentItem();
     if ( index < 0 ) return qd;
   
     MonthViewItem *item =
         static_cast<MonthViewItem *>( mItemList->item( index ) );
 
     if ( !item ) return qd;
   
     return item->incidenceDate();
 }
 
 void MonthViewCell::deselect()
 {
     mItemList->clearSelection();
     enableScrollBars( false );
     // updateCell();
@@ -1125,192 +1141,193 @@ void KOMonthView::updateDayLabels()
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
 
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
             bool show = mShortDayLabelsM;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
 
         }
     }
 
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
     QPtrVector<MonthViewCell> *cells;
     QPtrVector<QLabel> *dayLabels;
     QPtrVector<KOWeekButton> *weekLabels;
     int weekNum = 6;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
         weekLabels = &mWeekLabelsW;
     } else {
         cells = &mCells;
         dayLabels = &mDayLabels;
         weekLabels = &mWeekLabels;
     }
 
     mStartDate = start;
 
     int startWeekDay = mWeekStartsMonday ? 1 : 7;
 
     while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
         mStartDate = mStartDate.addDays( -1 );
     }
 
     bool primary = false;
     uint i;
     for( i = 0; i < (*cells).size(); ++i ) {
         QDate date = mStartDate.addDays( i );
         (*cells)[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
         // add holiday, if present
         QString hstring(KOCore::self()->holiday(date));
         (*cells)[i]->setHoliday( hstring );
 #endif
 
     }
     QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
     for( i = 0; i < weekNum; ++i ) {
         int wno;
         // remember, according to ISO 8601, the first week of the year is the
         // first week that contains a thursday.  Thus we must subtract off 4,
         // not just 1.
         int dayOfYear = date.dayOfYear();
         if (dayOfYear % 7 != 0)
             wno = dayOfYear / 7 + 1;
         else
             wno =dayOfYear / 7;
         (*weekLabels)[i]->setWeekNum( wno );
         date = date.addDays( 7 );
     }
     updateView();
 }
 
 void KOMonthView::showEvents(QPtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
     // this should be re-written to be much more efficient, but this
     // quick-and-dirty-hack gets the job done for right now.
     updateView();
 }
 
 void KOMonthView::updateView()
 { 
 
     if ( !updatePossible )
         return;
     //QTime ti;
     //ti.start();
+    clearSelection();
     QPtrVector<MonthViewCell> *cells;
     if ( mShowWeekView ) {
         cells = &mCellsW;
     } else {
         cells = &mCells;
     }
 #if 1
     int i;
     int timeSpan = (*cells).size()-1;
     if ( KOPrefs::instance()->mMonthViewWeek )         
         timeSpan = 6;
     for( i = 0; i < timeSpan + 1; ++i ) {
         (*cells)[i]->startUpdateCell();
     }
  
     QPtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     bool ok;
     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) 
                                     (*cells)[iii]->insertEvent( event );
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     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)
                         (*cells)[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 < timeSpan + 1)  {
                 (*cells)[day]->insertTodo( todo );
             }
         }
     }
 
     for( i = 0; i < timeSpan+1; ++i ) {
         (*cells)[i]->finishUpdateCell();
     }
     processSelectionChange();
     (*cells)[0]->setFocus();
 
 
@@ -1500,171 +1517,180 @@ void KOMonthView::computeLayout()
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- dayLabelHei) % 6;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i == daysToShow-colModulo )
             ++w;
         if ( combinedSatSun ) {
             if ( i >=  daysToShow-1 ) {
                 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
                 x -= w/2 ;
             }
             else
                 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         } else
             mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei ;
     for ( i = 0; i < mCells.count(); ++i) {
         //qDebug("iii %d ", i);
         w = colWid;
         if ( ((i) % 7) >= 7-colModulo ) {
             ++w;
         }
         if ( i  == (6-rowModulo)*7)
             ++h; 
         if ( combinedSatSun ) {
             if ( (i)%7 >=  daysToShow-1 ) {
                 if ( (i)%7 ==  daysToShow-1 ) {
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                     x -= w ;y += h/2;
                 } else {
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                     y -= h/2;
                 }
             } else
                 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                 
         }
         else
             mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
         y += h;                            
     }
     mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
     mContextMenu->showIncidencePopup(incidence);
     /*
       if( incidence && incidence->type() == "Event" ) {
       Event *event = static_cast<Event *>(incidence);
       mContextMenu->showEventPopup(event);
       } else {
       kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
       }
     */
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    // qDebug("KOMonthView::setSelectedCell ");
+    //qDebug("KOMonthView::setSelectedCell ");
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
     //  if ( mSelectedCell )
     //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
     QPtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
         emit incidenceSelected( 0 );
+        clearSelection();
     }
 }
 
 void KOMonthView::clearSelection()
 {
     if ( mSelectedCell ) {
         mSelectedCell->deselect();
         mSelectedCell = 0;
     }
 }
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
     //qDebug("KOMonthView::keyPressEvent ");
     switch(e->key()) {
     case Key_Up: 
         {
             if ( mShowWeekView ) {
                 mCellsW[0]->setFocus();
                 emit selectWeekNum ( currentWeek() - 1 );
             }
             else {
                 mCells[0]->setFocus();
                 emit prevMonth();
             }
         }
         e->accept();
         break;
     case Key_Down:
         {
             if ( mShowWeekView ) {
                 mCellsW[0]->setFocus();
                 emit selectWeekNum ( currentWeek() +1);
             }
             else {
                 mCells[0]->setFocus();
                 emit nextMonth();
             }
            
         }
         e->accept();
         break;
     case Key_Return:
     case Key_Enter:
         {
             selectInternalWeekNum ( currentWeek() );
         }
         e->accept();
         break;
+    case Key_D:
+        if ( mSelectedCell ) {
+            mSelectedCell->showDay();
+            e->accept();
+        } else {
+            e->ignore();     
+        }
+        break;
     default:
         e->ignore();     
         break;
     }
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index f92a69a..fd8cbf2 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -77,199 +77,202 @@ class KNoScrollListBox: public QListBox
     void shiftUp();
     void rightClick();
 
    protected slots:
     void oneDown();
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *);
 
  private:
     KNOWhatsThis * mWT;
 };
 
 
 class MonthViewItem: public QListBoxItem
 {
   public:
     MonthViewItem( Incidence *, QDate qd, const QString & title );
 
     void setRecur(bool on) { mRecur = on; }
     void setAlarm(bool on) { mAlarm = on; }
     void setReply(bool on) { mReply = on; }
     void setMoreInfo(bool on) { mInfo = on; }
     void setMultiDay(int type) { mMultiday = type; }
 
 
     void setPalette(const QPalette &p) { mPalette = p; }
     QPalette palette() const { return mPalette; }
 
     Incidence *incidence() const { return mIncidence; }
     QDate incidenceDate() { return mDate; }
 
   protected:
     virtual void paint(QPainter *);
     virtual int height(const QListBox *) const;
     virtual int width(const QListBox *) const;
 
   private:
     int mMultiday;
     bool mRecur;
     bool mAlarm;
     bool mReply;
     bool mInfo;
 
     QPalette mPalette;
     QDate mDate;
 
     Incidence *mIncidence;
 };
 
 
 class KOMonthView;
 
 class MonthViewCell : public QWidget
 {
     Q_OBJECT
   public:
     MonthViewCell(KOMonthView *,QWidget* );
 
     void setDate( const QDate & );
     QDate date() const;
 
     void setPrimary( bool );
     bool isPrimary() const;
 
     void setHoliday( bool );
     void setHoliday( const QString & );
 
     void updateCell();
     void startUpdateCell();
     void finishUpdateCell();
     void insertEvent(Event *);
     void insertTodo(Todo *);
 
     void updateConfig( bool bigFont = false );
 
     void enableScrollBars( bool );
 
     Incidence *selectedIncidence();
     QDate selectedIncidenceDate();
 
     void deselect();
     void select();
 
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *toolTipGroup(); 
 #endif
   signals:
     void defaultAction( Incidence * );
     void newEventSignal( QDateTime );
     void showDaySignal( QDate );
     
   protected:
     QString mToolTip;
     void resizeEvent( QResizeEvent * );
 
+
+public slots:
+    void showDay();
+
   protected slots:
     void defaultAction( QListBoxItem * );
     void contextMenu( QListBoxItem * );
     void selection( QListBoxItem * );
     void cellClicked( QListBoxItem * );
     void newEvent();
-    void showDay();
     
   private:
     KOMonthView *mMonthView;
   
     QDate mDate;
     bool mPrimary;
     bool mHoliday;
     QString mHolidayString;
     
     //QLabel *mLabel;
     QPushButton *mLabel;
     QListBox *mItemList;
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *mToolTipGroup; 
 #endif 
     QSize mLabelSize;
     QSize mLabelBigSize;
     QPalette mHolidayPalette;
     QPalette mStandardPalette;
     QPalette mPrimaryPalette;
     QPalette mNonPrimaryPalette;
     void setMyPalette();
     QPalette  getPalette ();
     void keyPressEvent ( QKeyEvent * ) ;
     
 };
 
 
 class KOMonthView: public KOEventView
 {
     Q_OBJECT
   public:
     KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 );
     ~KOMonthView();
 
     /** Returns maximum number of days supported by the komonthview */
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     bool isMonthView() { return !mShowWeekView; }
     bool isUpdatePossible() { return updatePossible; }
 
     MonthViewCell * selectedCell();
     bool skipResize; 
     NavigatorBar* navigatorBar() { return mNavigatorBar ;}
   public slots:
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
     void switchView();
 
   protected slots:
     void selectInternalWeekNum ( int );
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void selectMonth ();
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;