monthview exclude sat fix

2 files changed, 17 insertions, 4 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 749204b..c5acafd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -289,1155 +289,1168 @@ void EventIndicator::setXOffset( int x )
 void  EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w )
 {
     mPaintWidget = w;
 }
 void EventIndicator::changeColumns(int columns)
 {
     mColumns = columns;
     mEnabled.resize(mColumns);
 
     update();
 }
 
 void EventIndicator::enableColumn(int column, bool enable)
 {
     mEnabled[column] = enable;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
 
 KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     KOEventView (cal,parent,name)
 {
     mBlockUpdating = true;
     mStartHour = 8;
     mSelectedDates.append(QDate::currentDate());
 
     mLayoutDayLabels = 0;
     mDayLabelsFrame = 0;
     mDayLabels = 0;
     bool isRTL = KOGlobals::self()->reverseLayout();
 
     if ( KOPrefs::instance()->mVerticalScreen ) {
         mExpandedPixmap = SmallIcon( "1downarrow" );
         mNotExpandedPixmap = SmallIcon( "1uparrow" );
     } else {
         mExpandedPixmap = SmallIcon( isRTL ? "1leftarrow" : "1rightarrow" );
         mNotExpandedPixmap = SmallIcon( isRTL ? "1rightarrow" : "1leftarrow" );
     }
 
     QBoxLayout *topLayout = new QVBoxLayout(this);
 
     // Create day name labels for agenda columns
     mDayLabelsFrame = new QHBox(this);
     topLayout->addWidget(mDayLabelsFrame);
     mDayLabels = new QFrame (mDayLabelsFrame);
     mLayoutDayLabels = new QHBoxLayout(mDayLabels);
     // Create agenda splitter
 #ifndef KORG_NOSPLITTER
     mSplitterAgenda = new QSplitter(Vertical,this);
     topLayout->addWidget(mSplitterAgenda);
     mSplitterAgenda->setOpaqueResize();
   
     mAllDayFrame = new QHBox(mSplitterAgenda);
 
     QWidget *agendaFrame = new QWidget(mSplitterAgenda);
 #else
 #if 0
     QWidget *mainBox = new QWidget( this );
     topLayout->addWidget( mainBox );
     QBoxLayout *mainLayout = new QVBoxLayout(mainBox);
     mAllDayFrame = new QHBox(mainBox);
     mainLayout->addWidget(mAllDayFrame);
     mainLayout->setStretchFactor( mAllDayFrame, 0 );
     mAllDayFrame->setFocusPolicy(NoFocus);
     QWidget *agendaFrame = new QWidget(mainBox);
     mainLayout->addWidget(agendaFrame);
     mainLayout->setStretchFactor( agendaFrame, 10 );
 
     agendaFrame->setFocusPolicy(NoFocus);
 #endif
     mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this);
     mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     topLayout->addWidget( mSplitterAgenda );
     mAllDayFrame = new QHBox(mSplitterAgenda);
     mAllDayFrame->setFocusPolicy(NoFocus);
     QWidget *agendaFrame = new QWidget(mSplitterAgenda);
     agendaFrame->setFocusPolicy(NoFocus);
     
 #endif
 
     // Create all-day agenda widget
     mDummyAllDayLeft = new QVBox( mAllDayFrame );
 
     mExpandButton = new QPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( mNotExpandedPixmap );
     int widebut = mExpandButton->sizeHint().width();
     if (   QApplication::desktop()->width() < 480  )
         widebut = widebut*2;
     else
         widebut = (widebut*3) / 2;
     //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
     //                                         QSizePolicy::Fixed ) );
     mExpandButton->setFixedSize( widebut, widebut);
     connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
     mExpandButton->setFocusPolicy(NoFocus);
     mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
     mAllDayAgenda->setFocusPolicy(NoFocus);
     QWidget *dummyAllDayRight = new QWidget(mAllDayFrame);
 
     // Create event context menu for all day agenda
     mAllDayAgendaPopup = eventPopup();
     connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
 
     // Create agenda frame
     QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3);
     //  QHBox *agendaFrame = new QHBox(splitterAgenda);
 
     // create event indicator bars
     mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
     agendaLayout->addWidget(mEventIndicatorTop,0,1);
     mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
     mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
                                                agendaFrame);
     agendaLayout->addWidget(mEventIndicatorBottom,2,1);
     QWidget *dummyAgendaRight = new QWidget(agendaFrame);
     agendaLayout->addWidget(dummyAgendaRight,0,2);
 
     // Create time labels
     mTimeLabels = new TimeLabels(24,agendaFrame);
     agendaLayout->addWidget(mTimeLabels,1,0);
 
     // Create agenda
     mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
     agendaLayout->addMultiCellWidget(mAgenda,1,1,1,2);
     agendaLayout->setColStretch(1,1);
     mAgenda->setFocusPolicy(NoFocus);
     // Create event context menu for agenda
     mAgendaPopup = eventPopup();
   
     mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
                                     SLOT(popupAlarm()),true);
 
 
     connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
   
     // make connections between dependent widgets
     mTimeLabels->setAgenda(mAgenda);
 
     // Update widgets to reflect user preferences
     //  updateConfig();
 
     // createDayLabels();
 
     // these blank widgets make the All Day Event box line up with the agenda
     dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
     dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // Scrolling
     connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)),
             mTimeLabels, SLOT(positionChanged()));
     connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)),
             SLOT(setContentsPos(int)));
 
     // Create/Show/Edit/Delete Event
     connect(mAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEvent(int,int)));
     connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEvent(int,int,int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEventAllDay(int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEventAllDay(int,int)));
     connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
             SLOT(newTimeSpanSelected(int,int,int,int)));
     connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
             SLOT(newTimeSpanSelectedAllDay(int,int,int,int)));
     connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
     connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
   
     connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
             SIGNAL(editIncidenceSignal(Incidence *)));
     connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
             SIGNAL(editIncidenceSignal(Incidence *)));
     connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
             SIGNAL(showIncidenceSignal(Incidence *)));
     connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
             SIGNAL(showIncidenceSignal(Incidence *)));
     connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
             SIGNAL(deleteIncidenceSignal(Incidence *)));
     connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
             SIGNAL(deleteIncidenceSignal(Incidence *)));
 
     connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
             SLOT(updateEventDates(KOAgendaItem *, int )));
     connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
             SLOT(updateEventDates(KOAgendaItem *, int)));
 
     // event indicator update
     connect(mAgenda,SIGNAL(lowerYChanged(int)),
             SLOT(updateEventIndicatorTop(int)));
     connect(mAgenda,SIGNAL(upperYChanged(int)),
             SLOT(updateEventIndicatorBottom(int)));
     // drag signals
     /*
       connect(mAgenda,SIGNAL(startDragSignal(Event *)),
       SLOT(startDrag(Event *)));
       connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)),
       SLOT(startDrag(Event *)));
     */
     // synchronize selections
     connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              mAllDayAgenda, SLOT( deselectItem() ) );
     connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              mAgenda, SLOT( deselectItem() ) );
     connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              SIGNAL( incidenceSelected( Incidence * ) ) );
     connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              SIGNAL( incidenceSelected( Incidence * ) ) );
     connect( mAgenda, SIGNAL( resizedSignal() ),
              SLOT( updateConfig( ) ) );  
     connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ),
              SLOT( addToCalSlot(Incidence *, Incidence * ) ) );  
     connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ),
              SLOT( addToCalSlot(Incidence * , Incidence *) ) );  
     // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
     //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
 
 
 }
 
 void KOAgendaView::toggleAllDay()
 {
     if ( mSplitterAgenda->firstHandle() ) 
         mSplitterAgenda->firstHandle()->toggle();
 }
 void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
 {
     calendar()->addIncidence( inc ); 
     
     if ( incOld ) {
         if ( incOld->type() == "Todo" )
             emit  todoMoved((Todo*)incOld,  KOGlobals::EVENTEDITED );
         else
             emit incidenceChanged(incOld, KOGlobals::EVENTEDITED);
     }
     
 }
 
 KOAgendaView::~KOAgendaView()
 {
     delete mAgendaPopup;
     delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
     delete KOAgendaItem::paintPixSel();
 }
 void KOAgendaView::resizeEvent( QResizeEvent* e )
 {
     //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width());
     bool uc = false;
     int ow =  e->oldSize().width();
     int oh =  e->oldSize().height();
     int w = e->size().width();
     int h =  e->size().height();
     if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { 
         if ( ! mBlockUpdating  && !globalFlagBlockStartup && !globalFlagBlockAgenda )
             uc = true;
         //qDebug("view changed %d %d %d %d ", ow, oh , w , h);
     }
     mUpcomingWidth = e->size().width() ;
     if ( mBlockUpdating || uc ) {
         mBlockUpdating = false;
         //mAgenda->setMinimumSize(800 , 600 );
         //qDebug("mAgenda->resize+++++++++++++++ ");
         updateConfig();
         //qDebug("KOAgendaView::Updating now possible ");
     } else 
         createDayLabels();
     //qDebug("resizeEvent end "); 
    
 }
 void KOAgendaView::createDayLabels()
 {
 
     if ( mBlockUpdating || globalFlagBlockLabel == 1) {
         // qDebug(" KOAgendaView::createDayLabels() blocked ");
         return;
 
     }
     int newHight;
 
     // ### Before deleting and recreating we could check if mSelectedDates changed...
     // It would remove some flickering and gain speed (since this is called by
     // each updateView() call)
 
     int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2;
     mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
     if ( maxWid < 0 )
         maxWid = 20;
 
     QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
     QFontMetrics fm ( dlf );
     int selCount = mSelectedDates.count();
     QString dayTest = "Mon 20";
     int wid = fm.width( dayTest );
     maxWid  -= ( selCount * 3 );  
     if ( maxWid < 0 )
         maxWid = 20;
     int needWid = wid * selCount;
     //qDebug("++++++++Needed : %d  MaxWidth: %d", needWid, maxWid );
     //if ( needWid > maxWid ) 
     //  qDebug("DAYLABELS TOOOOOOO BIG ");
     while ( needWid > maxWid   ) {
         dayTest = dayTest.left( dayTest.length() - 1 );
         wid = fm.width( dayTest );
         needWid = wid * selCount;
     }
     int maxLen =  dayTest.length();
     int fontPoint = dlf.pointSize();
     if (  maxLen < 2 ) {
         int fontPoint = dlf.pointSize();
         while ( fontPoint > 4 ) {
             --fontPoint;
             dlf.setPointSize( fontPoint );
             QFontMetrics f( dlf );
             wid = f.width( "20" );
             needWid = wid * selCount;
             if ( needWid < maxWid )
                 break;
         }
         maxLen = 2;
     }
     //qDebug("Max len %d ", dayTest.length() );
 
     QFontMetrics tempF( dlf );
     newHight = tempF.height();
     mDayLabels->setFont( dlf );
     // mLayoutDayLabels = new QHBoxLayout(mDayLabels);;
     // mLayoutDayLabels->addSpacing(mTimeLabels->width());
     //mLayoutDayLabels->addSpacing( 2 );
     // QFont lFont = dlf;
     bool appendLabels = false;
     QLabel *dayLabel;
     dayLabel = mDayLabelsList.first();
     if ( !dayLabel  ) {
         appendLabels = true;
         dayLabel = new QLabel(mDayLabels);
         mDayLabelsList.append( dayLabel );
         mLayoutDayLabels->addWidget(dayLabel);
     }
     dayLabel->setFixedWidth( mTimeLabels->width()+2  ); 
     dayLabel->setFont( dlf );
     dayLabel->setAlignment(QLabel::AlignHCenter);
     dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
     dayLabel->show();
     DateList::ConstIterator dit;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         QDate date = *dit;
         // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
         if (  ! appendLabels ) {
             dayLabel = mDayLabelsList.next();
             if (  !dayLabel  )
                 appendLabels = true;
         }
         if ( appendLabels ) {
             dayLabel = new QLabel(mDayLabels);
             mDayLabelsList.append( dayLabel );
             mLayoutDayLabels->addWidget(dayLabel);
         }
         dayLabel->setMinimumWidth( 1 );
         dayLabel->setMaximumWidth( 2048 );
         dayLabel->setFont( dlf );
         dayLabel->show();
         QString str;
         int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date);
         QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true );
         switch ( maxLen ) {
         case 2:
             str = QString::number( date.day() );
             break;
 
         case 3:
             str =  dayName.left( 1 )  +QString::number( date.day());
 
             break;
         case 4:
             str =  dayName.left( 1 ) + " " +QString::number( date.day());
 
             break;
         case 5:
             str =  dayName.left( 2 ) + " " +QString::number( date.day());
 
             break;
         case 6:
             str =  dayName.left( 3 ) + " " +QString::number( date.day());
             break;
 
         default:
             break;
         }
 
         dayLabel->setText(str);
         dayLabel->setAlignment(QLabel::AlignHCenter);
         if (date == QDate::currentDate()) {
             QFont bFont = dlf;
             bFont.setBold( true );
             dayLabel->setFont(bFont);
         }
         //dayLayout->addWidget(dayLabel);
 
 #ifndef KORG_NOPLUGINS
         CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
         CalendarDecoration *it;
         for(it = cds.first(); it; it = cds.next()) {
             QString text = it->shortText( date );
             if ( !text.isEmpty() ) {
                 QLabel *label = new QLabel(text,mDayLabels);
                 label->setAlignment(AlignCenter);
                 dayLayout->addWidget(label);
             }
         }
 
         for(it = cds.first(); it; it = cds.next()) {
             QWidget *wid = it->smallWidget(mDayLabels,date);
             if ( wid ) {
                 //      wid->setHeight(20);
                 dayLayout->addWidget(wid);
             }
         }
 #endif
     }
     if (  ! appendLabels ) {
         dayLabel = mDayLabelsList.next();
         if (  !dayLabel  )
             appendLabels = true;
     }
     if ( appendLabels ) {
         dayLabel = new QLabel(mDayLabels);
         mDayLabelsList.append( dayLabel );
         mLayoutDayLabels->addWidget(dayLabel);
     }
     //dayLabel->hide();//test only
 
     int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ;
     if ( offset < 0 ) offset = 0;
     //qDebug("mLayoutDayLabels->addSpacing %d  ", mAgenda->verticalScrollBar()->width()+offset+2  );
     dayLabel->setText("");//QString::number ( mSelectedDates.first().month() ) );
     dayLabel->show();
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
     //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
     //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
     if ( !appendLabels ) {
         dayLabel = mDayLabelsList.next();
         while (  dayLabel  ) {
             //qDebug("!dayLabel %d",dayLabel );
             dayLabel->hide();
             dayLabel = mDayLabelsList.next();
         }
     }
     //mDayLabelsFrame->show();
     //mDayLabels->show();
     //qDebug("heigt %d %d %d ",mDayLabelsFrame->height(), mDayLabelsFrame->sizeHint().height(), newHight);
     //mDayLabelsFrame->resize( mAgenda->visibleWidth(), newHight );
     mDayLabelsFrame->setFixedHeight( newHight );
 }
 
 int KOAgendaView::maxDatesHint()
 {
     // Not sure about the max number of events, so return 0 for now.
     return 0;
 }
 
 int KOAgendaView::currentDateCount()
 {
     return mSelectedDates.count();
 }
 
 QPtrList<Incidence> KOAgendaView::selectedIncidences()
 {
     QPtrList<Incidence> selected;
     Incidence *incidence;
 
     incidence = mAgenda->selectedIncidence();
     if (incidence) selected.append(incidence);
 
     incidence = mAllDayAgenda->selectedIncidence();
     if (incidence) selected.append(incidence);
 
     return selected;
 }
 
 DateList KOAgendaView::selectedDates()
 {
     DateList selected;
     QDate qd;
 
     qd = mAgenda->selectedIncidenceDate();
     if (qd.isValid()) selected.append(qd);
 
     qd = mAllDayAgenda->selectedIncidenceDate();
     if (qd.isValid()) selected.append(qd);
 
     return selected;
 }
 
 
 void KOAgendaView::updateView()
 {
     if ( mBlockUpdating )
         return;
     //  kdDebug() << "KOAgendaView::updateView()" << endl;
     fillAgenda();
  
 }
 
 
 /*
   Update configuration settings for the agenda view. This method is not
   complete.
 */
 void KOAgendaView::updateConfig()
 {
     if ( mBlockUpdating )
         return;
     //  kdDebug() << "KOAgendaView::updateConfig()" << endl;
 
     // update config for children
     mTimeLabels->updateConfig();
     mAgenda->storePosition();
     mAgenda->updateConfig();
     mAllDayAgenda->updateConfig();
     // widget synchronization
     //TODO: find a better way, maybe signal/slot
     mTimeLabels->positionChanged();
 
     // for some reason, this needs to be called explicitly
     mTimeLabels->repaint();
 
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // ToolTips displaying summary of events
     KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
                                              ->mEnableToolTips);
   
     //setHolidayMasks();
 
     //createDayLabels(); called by via updateView();
     mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); 
     updateView();
     mAgenda->restorePosition();
 }
 
 
 void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
 {
     //  kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl;
     //qDebug("KOAgendaView::updateEventDates ");
     QDateTime startDt,endDt;
     QDate startDate;
     int lenInSecs;
     //  if ( type == KOAgenda::RESIZETOP )
     //       qDebug("RESIZETOP ");
     //   if ( type ==  KOAgenda::RESIZEBOTTOM )
     //       qDebug("RESIZEBOTTOM ");
     //   if ( type ==  KOAgenda::MOVE )
     //       qDebug("MOVE ");
     if ( item->incidence()->type() == "Event" ) {
         startDt =item->incidence()->dtStart();
         endDt = item->incidence()->dtEnd();
         lenInSecs = startDt.secsTo( endDt );
     }
 
     // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
 
     if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
         startDate = mSelectedDates[item->mLastMoveXPos];
     } else {
         if (item->cellX() < 0) {
             startDate = (mSelectedDates.first()).addDays(item->cellX());
         } else {
             startDate = mSelectedDates[item->cellX()];
         }
     }
     startDt.setDate(startDate);
 
     if (item->incidence()->doesFloat()) {
         endDt.setDate(startDate.addDays(item->cellWidth() - 1));
     } else {
         if ( type == KOAgenda::RESIZETOP ||  type ==  KOAgenda::MOVE )
             startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
         if ( item->incidence()->type() == "Event" ) {
             if ( type ==  KOAgenda::MOVE ) {
                 endDt = startDt.addSecs(lenInSecs);
 
             } else if ( type ==  KOAgenda::RESIZEBOTTOM  ) {
                 if (item->lastMultiItem()) {
                     endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
                     endDt.setDate(startDate.
                                   addDays(item->lastMultiItem()->cellX() - item->cellX()));
                 } else {
                     endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
                     endDt.setDate(startDate);
                 }
             }
         } else {
             // todo
             if (item->lastMultiItem()) {
                 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
                 endDt.setDate(startDate.
                               addDays(item->lastMultiItem()->cellX() - item->cellX()));
             } else {
                 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
                 if ( item->cellYBottom() > 0 )
                     endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
                 else
                     endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
                 endDt.setDate(startDate);
             }
         }
     }
 
 
     if ( item->incidence()->type() == "Event" ) {
         item->incidence()->setDtStart(startDt);
         (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
     } else if ( item->incidence()->type() == "Todo" ) {
         (static_cast<Todo*>(item->incidence()))->setDtDue(endDt);
     }
     //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
     item->incidence()->setRevision(item->incidence()->revision()+1);
     item->setItemDate(startDt.date());
     //item->updateItem();
     if ( item->incidence()->type() == "Todo" ) {
          emit  todoMoved((Todo*)item->incidence(),  KOGlobals::EVENTEDITED );
 
     }
      else
          emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
      item->updateItem();
 }
 
 void KOAgendaView::showDates( const QDate &start, const QDate &end )
 {
     //  kdDebug() << "KOAgendaView::selectDates" << endl;
 
     mSelectedDates.clear();
     // qDebug("KOAgendaView::showDates ");
     QDate d = start;
     while (d <= end) {
         mSelectedDates.append(d);
         d = d.addDays( 1 );
     }
 
     // and update the view
     fillAgenda();
 }
 
 
 void KOAgendaView::showEvents(QPtrList<Event>)
 {
     kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
 }
 
 void KOAgendaView::changeEventDisplay(Event *, int)
 {
     //  qDebug("KOAgendaView::changeEventDisplay ");
     //  kdDebug() << "KOAgendaView::changeEventDisplay" << endl;
     // this should be re-written to be MUCH smarter.  Right now we
     // are just playing dumb.
     fillAgenda();
 }
 
 void KOAgendaView::fillAgenda(const QDate &)
 {
     // qDebug("KOAgendaView::fillAgenda ");
     fillAgenda();
 }
 
 void KOAgendaView::fillAgenda()
 {
     if ( globalFlagBlockStartup )
         return;
     if ( globalFlagBlockAgenda == 1 )
         return;
     //if ( globalFlagBlockAgenda == 2 )
     //globalFlagBlockAgenda = 0;
     // globalFlagBlockPainting = false;
     if ( globalFlagBlockAgenda == 0 )
         globalFlagBlockAgenda = 1;
     //  clearView();
     //qDebug("fillAgenda()++++ ");
     globalFlagBlockAgendaItemPaint = 1;
     mAllDayAgenda->changeColumns(mSelectedDates.count());
     mAgenda->changeColumns(mSelectedDates.count());
     qApp->processEvents(); 
     mEventIndicatorTop->changeColumns(mSelectedDates.count());
     mEventIndicatorBottom->changeColumns(mSelectedDates.count());
     setHolidayMasks();
 
     //mAgenda->hideUnused();
     //mAllDayAgenda->hideUnused();
  
     //   mAgenda->blockNextRepaint( false );
     //   mAgenda->viewport()->repaint();
     //   mAgenda->blockNextRepaint( true );
     mMinY.resize(mSelectedDates.count());
     mMaxY.resize(mSelectedDates.count());
 
     QPtrList<Event> dayEvents;
 
     // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
     // Therefore, get all of them.
     QPtrList<Todo> todos  = calendar()->todos();
 
     mAgenda->setDateList(mSelectedDates);
 
     QDate today = QDate::currentDate();
 
     DateList::ConstIterator dit;
     int curCol = 0;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         QDate currentDate = *dit;
         //    kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
         //              << endl;
 
         dayEvents = calendar()->events(currentDate,true);
 
         // Default values, which can never be reached
         mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
         mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
 
         unsigned int numEvent;
         for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
             Event *event = dayEvents.at(numEvent);
             if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
                 if ( event->uid().left(15) == QString("last-syncEvent-")  )
                     continue;
             //      kdDebug() << " Event: " << event->summary() << endl;
 
             int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
             int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
 
             //      kdDebug() << "  beginX: " << beginX << "  endX: " << endX << endl;
 
             if (event->doesFloat()) {
                 if (event->recurrence()->doesRecur()) {
                     mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
                 } else {
                     if (beginX <= 0 && curCol == 0) {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                     } else if (beginX == curCol) {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                     }
                 }
             } else if (event->isMultiDay()) {
                 if ( event->doesRecur () ) {
                     QDate dateit = currentDate;
                     int count = 0;
                     int max = event->dtStart().daysTo( event->dtEnd() ) +2;
                     while (! event->recursOn( dateit ) && count <= max ) {
                         ++count; 
                         dateit = dateit.addDays( -1 );
                     }
                     bool ok;
                     QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok );
                     if ( ok )
                          {
                                 int secs = event->dtStart().secsTo( event->dtEnd() );
                                 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
                                 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
                                 endX = currentDate.daysTo(nextOcend.date()) + curCol;
                             
                         }
                 }
                 int startY = mAgenda->timeToY(event->dtStart().time());
                 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
                 //qDebug("insert %d %d %d %d   %d ",beginX,endX,startY,endY , curCol );
                 if ((beginX <= 0 && curCol == 0) || beginX == curCol) {
                     //qDebug("insert!!! ");
                     mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY);
                 }
                 if (beginX == curCol) {
                     mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
                     if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                 } else if (endX == curCol) {
                     mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
                     if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
                 } else {
                     mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
                     mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
                 }
             } else {
                 int startY = mAgenda->timeToY(event->dtStart().time());
                 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
                 if (endY < startY) endY = startY;
                 mAgenda->insertItem(event,currentDate,curCol,startY,endY);
                 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
             }
         }
         // ---------- [display Todos --------------
         unsigned int numTodo;
         for (numTodo = 0; numTodo < todos.count(); ++numTodo) {
             Todo *todo = todos.at(numTodo);
 
             if ( ! todo->hasDueDate() ) continue;  // todo shall not be displayed if it has no date
 
             // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
             // Already completed items can be displayed on their original due date
             //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
             bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
 
             if ( ((todo->dtDue().date() == currentDate) && !overdue) ||
                  ((currentDate == today) && overdue) ) {
                 if ( todo->doesFloat() || overdue ) {  // Todo has no due-time set or is already overdue
                     if ( KOPrefs::instance()->mShowTodoInAgenda )
                         mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
                 }
                 else {
 
                     int endY = mAgenda->timeToY(todo->dtDue().time()) - 1;
                     int hi = (18/KOPrefs::instance()->mHourSize);
                     //qDebug("hei %d ",KOPrefs::instance()->mHourSize);
                     int startY = endY -hi;
 
                     mAgenda->insertItem(todo,currentDate,curCol,startY,endY);
 
                     if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                     if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
                 }
             }
         }
         // ---------- display Todos] --------------
 
         ++curCol;
     }
     mAgenda->hideUnused();
     mAllDayAgenda->hideUnused();
     mAgenda->checkScrollBoundaries();
 
     deleteSelectedDateTime();
   
     createDayLabels();
     emit incidenceSelected( 0 );
 
     if ( globalFlagBlockAgenda == 2 ) {
         if ( KOPrefs::instance()->mSetTimeToDayStartAt )
             setStartHour( KOPrefs::instance()->mDayBegins  );
         else if ( KOPrefs::instance()->mCenterOnCurrentTime )
             setStartHour( QTime::currentTime ().hour() );
         //  qApp->processEvents();   
     }
     qApp->processEvents(); 
     //qDebug("qApp->processEvents(); END ");
     globalFlagBlockAgenda = 0; 
 
     // mAgenda->hideUnused();
     //mAllDayAgenda->hideUnused();
     mAllDayAgenda->drawContentsToPainter();
     mAgenda->drawContentsToPainter();
     repaintAgenda();
     // mAgenda->finishUpdate();
     //mAllDayAgenda->finishUpdate();
 
     // repaintAgenda();
     //qApp->processEvents(); 
     // globalFlagBlockAgenda = 0;
 }
 void KOAgendaView::repaintAgenda()
 {
    //  mAllDayAgenda->drawContentsToPainter();
 //     mAllDayAgenda->viewport()->repaint( false ); 
 //     mAgenda->drawContentsToPainter();
 //     mAgenda->viewport()->repaint( false ); 
 //     qApp->processEvents(); 
 
     //qDebug("KOAgendaView::repaintAgenda() ");
     //qApp->processEvents(); 
     mAgenda->viewport()->repaint( false );
     mAllDayAgenda->viewport()->repaint( false );
     mAgenda->finishUpdate();
     mAllDayAgenda->finishUpdate();
 }
 
 
 void KOAgendaView::clearView()
 {
     //  kdDebug() << "ClearView" << endl;
     mAllDayAgenda->clear();
     mAgenda->clear();
 }
 
 void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                 const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     if (fd == td)
         calPrinter->preview(CalPrinter::Day, fd, td);
     else
         calPrinter->preview(CalPrinter::Week, fd, td);
 #endif
 }
 
 // void KOAgendaView::updateMovedTodo()
 // {
 //     // updateConfig();
 //     // emit updateTodoViews();
 // }
 
 void KOAgendaView::newEvent(int gx, int gy)
 {
     if (!mSelectedDates.count()) return;
   
     QDate day = mSelectedDates[gx];
 
     QTime time = mAgenda->gyToTime(gy);
     QDateTime dt(day,time);
     // if ( dt <  QDateTime::currentDateTime () )
     //    dt = QDateTime::currentDateTime ().addSecs( 3600 );
     emit newEventSignal(dt);
 }
 
 void KOAgendaView::newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd)
 {
     if (!mSelectedDates.count()) return;
   
     QDate dayStart = mSelectedDates[gxStart];
     QDate dayEnd = mSelectedDates[gxEnd];
 
     QTime timeStart = mAgenda->gyToTime(gyStart);
     QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
 
     QDateTime dtStart(dayStart,timeStart);
     QDateTime dtEnd(dayEnd,timeEnd);
 
     emit newEventSignal(dtStart,dtEnd);
 }
 
 void KOAgendaView::newEventAllDay(int gx, int )
 {
     if (!mSelectedDates.count()) return;
 
     QDate day = mSelectedDates[gx];
 
     emit newEventSignal(day);
 }
 
 void KOAgendaView::updateEventIndicatorTop(int newY)
 {
     uint i;
     for(i=0;i<mMinY.size();++i) {
         if (newY >= mMinY.at(i)) mEventIndicatorTop->enableColumn(i,true);
         else mEventIndicatorTop->enableColumn(i,false);
     }
 
     mEventIndicatorTop->update();
 }
 
 void KOAgendaView::updateEventIndicatorBottom(int newY)
 {
     uint i;
     for(i=0;i<mMaxY.size();++i) {
         if (newY <= mMaxY.at(i)) mEventIndicatorBottom->enableColumn(i,true);
         else mEventIndicatorBottom->enableColumn(i,false);
     }
 
     mEventIndicatorBottom->update();
 }
 
 void KOAgendaView::startDrag(Event *event)
 {
 #ifndef KORG_NODND
     DndFactory factory( calendar() );
     ICalDrag *vd = factory.createDrag(event,this);
     if (vd->drag()) {
         kdDebug() << "KOAgendaView::startDrag(): Delete drag source" << endl;
     }
 #endif
 }
 
 void KOAgendaView::readSettings()
 {
     readSettings(KOGlobals::config());
 }
 
 void KOAgendaView::readSettings(KConfig *config)
 {
     //  kdDebug() << "KOAgendaView::readSettings()" << endl;
 
     config->setGroup("Views");
 
     //#ifndef KORG_NOSPLITTER
     QValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
     if (sizes.count() == 2) {
         if ( sizes[0] < 20 ) {
             sizes[1] = sizes[1] +20 - sizes[0];
             sizes[0] = 20;
         }
         mSplitterAgenda->setSizes(sizes);
         //  qDebug("read %d %d ",sizes[0],sizes[1]  );
     }
     //#endif
 
     // updateConfig();
 }
 
 void KOAgendaView::writeSettings(KConfig *config)
 {
     //  kdDebug() << "KOAgendaView::writeSettings()" << endl;
 
     config->setGroup("Views");
 
     //#ifndef KORG_NOSPLITTER
     QValueList<int> list = mSplitterAgenda->sizes();
     config->writeEntry("Separator AgendaView",list);
     //qDebug("write %d %d ", list[0],list[1] );
     //#endif
 }
 
 void KOAgendaView::setHolidayMasks()
 {
     mHolidayMask.resize(mSelectedDates.count());
 
     uint i;
     for(i=0;i<mSelectedDates.count();++i) {
         QDate date = mSelectedDates[i];
         bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6);
         bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7);
+        bool showHoliday = false;
+        if ( KOPrefs::instance()->mExcludeHolidays ) {
+            QPtrList<Event> events = calendar()->events( date, true );
+            Event *event;
+            for( event = events.first(); event; event = events.next() ) {
+                if ( event->categories().contains("Holiday") ||
+                     event->categories().contains(i18n("Holiday"))) {
+                    showHoliday = true;
+                    break;
+                }
+            }
+
+        }
+
 #ifndef KORG_NOPLUGINS
         bool showHoliday = KOPrefs::instance()->mExcludeHolidays &&
             !KOCore::self()->holiday(date).isEmpty();
-        bool showDay = showSaturday || showSunday || showHoliday;
-#else
-        bool showDay = showSaturday || showSunday;
 #endif
+        bool showDay = showSaturday || showSunday || showHoliday;
+
         if (showDay) {
             mHolidayMask.at(i) = true;
         } else {
             mHolidayMask.at(i) = false;
         }
     }
 
     mAgenda->setHolidayMask(&mHolidayMask);
     mAllDayAgenda->setHolidayMask(&mHolidayMask);
 }
 
 void KOAgendaView::setContentsPos(int y)
 {
     mAgenda->setContentsPos(0,y);
 }
 
 void KOAgendaView::setExpandedButton( bool expanded )
 {
     if ( expanded ) {
         mExpandButton->setPixmap( mExpandedPixmap );
     } else {
         mExpandButton->setPixmap( mNotExpandedPixmap );
     }
 }
 
 void KOAgendaView::clearSelection()
 {
     mAgenda->deselectItem();
     mAllDayAgenda->deselectItem();
 }
 
 void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart,
                                              int gxEnd, int gyEnd)
 {
     mTimeSpanInAllDay = true;
     newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd);
 }
 
 
 
 
 void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart,
                                        int gxEnd, int gyEnd)
 {
     if (!mSelectedDates.count()) return;
  
     QDate dayStart = mSelectedDates[gxStart];
     QDate dayEnd = mSelectedDates[gxEnd];
 
     QTime timeStart = mAgenda->gyToTime(gyStart);
     QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
 
     QDateTime dtStart(dayStart,timeStart);
     QDateTime dtEnd(dayEnd,timeEnd);
 
     mTimeSpanBegin = dtStart;
     mTimeSpanEnd = dtEnd;
  
 }
                                    
 void KOAgendaView::deleteSelectedDateTime()
 {
     mTimeSpanBegin.setDate(QDate());
     mTimeSpanEnd.setDate(QDate());
     mTimeSpanInAllDay = false;
 }
 
 void KOAgendaView::keyPressEvent ( QKeyEvent * e ) 
 {
     e->ignore();
 }
 
 void KOAgendaView::scrollOneHourUp()
 {
  
     mAgenda->scrollBy ( 0,  -mAgenda->contentsHeight () / 24 );
 }
 void KOAgendaView::scrollOneHourDown()
 {
     mAgenda->scrollBy ( 0,  mAgenda->contentsHeight () / 24 );
 }
 
 void  KOAgendaView::setStartHour( int h )
 {
     mAgenda->setStartHour( h );
 
 }
 
 void  KOAgendaView::updateTodo( Todo * t, int )
 { 
 
     bool remove = false;
     bool removeAD = false;
     if ( ! t->hasDueDate() ) {
         remove = true;
         removeAD = true;
     }
     else {
         bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
         if ( overdue && 
              QDate::currentDate() >= mSelectedDates.first() &&
              QDate::currentDate() <= mSelectedDates.last()) {
             removeAD = false;
             remove = true;
         }
         else {
             if ( t->dtDue().date() < mSelectedDates.first() ||
                  t->dtDue().date() > mSelectedDates.last() ) {
                 remove = true;
                 removeAD = true;
             } else {
                 remove = t->doesFloat();
                 removeAD = !remove;
             }
         }
     }
     int days = mSelectedDates.first().daysTo( t->dtDue().date()  );
     // qDebug("daysto %d ", days );
     mAgenda->updateTodo( t , days, remove); 
     if ( KOPrefs::instance()->mShowTodoInAgenda )
         mAllDayAgenda->updateTodo( t , days, removeAD);
     //qDebug("KOAgendaView::updateTodo( Todo *, int ) ");
 
 }
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 688d9e1..7d1e82f 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1,1056 +1,1056 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,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.
 */
 
 #include <qpopupmenu.h>
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qkeycode.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kiconloader.h>
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koglobals.h"
 #include <libkcal/kincidenceformatter.h>
 
 #include "komonthview.h"
 
 #define PIXMAP_SIZE 5
 
 class KNOWhatsThis :public QWhatsThis
 {
 public:
     KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _wid->getWhatsThisText(p) ;
   };
 private:
     KNoScrollListBox* _wid;
   
 };
 
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
   : QListBox(parent, name)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     new KNOWhatsThis(this);
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell or\non the date label\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence());
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
  
   switch(e->key()) {
     case Key_Right:
         // if ( e->state() == Qt::ControlButton )
         {
             e->ignore();
             return;
         }
         scrollBy(4,0);
       break;
     case Key_Left:
         //  if ( e->state() == Qt::ControlButton )
             {
             e->ignore();
             return;
         }
       scrollBy(-4,0);
       break;
     case Key_Up:
       if(!count()) break;
       setCurrentItem((currentItem()+count()-1)%count());
       if(!itemVisible(currentItem())) {
         if((unsigned int) currentItem() == (count()-1)) {
           setTopItem(currentItem()-numItemsVisible()+1);
         } else {
           setTopItem(topItem()-1);
         }
       }
       break;
     case Key_Down:
       if(!count()) break;
       setCurrentItem((currentItem()+1)%count());
       if(!itemVisible(currentItem())) {
         if(currentItem() == 0) {
           setTopItem(0);
         } else {
           setTopItem(topItem()+1);
         }
       }
       break;
     case Key_Shift:
       emit shiftDown();
       break;
     default:
         e->ignore();
       break;
   }
 }
 
 void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 {
   switch(e->key()) {
     case Key_Shift:
       emit shiftUp();
       break;
     default:
       break;
   }
 }
 
 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 );
 
   mIncidence = incidence;
   mDate = qd;
   // QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence  ));
   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;
   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;
       }
   }
   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, yPos- fm.height()/2+2,x+wid, yPos- fm.height()/2 +2);
   }
       
 }
 
 int MonthViewItem::height(const QListBox *lb) const
 {
   return  lb->fontMetrics().lineSpacing()+1;
 }
 
 int MonthViewItem::width(const QListBox *lb) const
 { 
     int size = PIXMAP_SIZE;
   if ( QApplication::desktop()->width() < 300 )
        size = 3;
   int x = 1; 
   if ( mInfo ) {
     x += size + 1;
   }
   if( mRecur ) {
     x += size+1;
   }
   if( mAlarm ) {
     x += size+1;
   }
   if( mReply ) {
     x += size+1;
   }
 
   return( x + lb->fontMetrics().width( text() ) + 1 );
 }
 
 
 MonthViewCell::MonthViewCell( KOMonthView *parent)
   : QWidget( parent ),
     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 );
   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( 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 * ) ) ); 
 }
 
 void MonthViewCell::setDate( const QDate &date )
 {
 //  kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl;
 
   mDate = date;
 
   QString text;
   bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
    if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 || (date.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
      text = KOGlobals::self()->calendarSystem()->monthName( date, 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 );
 }
 
 QDate MonthViewCell::date() const
 {
   return mDate;
 }
 
 void MonthViewCell::setPrimary( bool primary )
 {
     mPrimary = primary;
     //setMyPalette();
 }
 void MonthViewCell::setMyPalette()
 {
     
     if ( mHoliday) {
         setPalette( mHolidayPalette );
     } else {
         if ( mPrimary ) {
             setPalette( mPrimaryPalette );
         } else {
             setPalette( mNonPrimaryPalette );
         }
     }
     QPalette pal = palette();
     
     mLabel->setPalette( QPalette ( pal.color( QPalette::Normal,QColorGroup::Base),pal.color(QPalette::Normal,QColorGroup::Base )  ));
 }
 QPalette  MonthViewCell::getPalette ()
 {
     if ( !KOPrefs::instance()->mMonthViewUsesDayColors )
         return mStandardPalette;
     if ( mHoliday) {
         return mHolidayPalette ;
     } else {
         if ( mPrimary ) {
             return mPrimaryPalette ;
         } 
     }
     return mNonPrimaryPalette; 
 }
 bool MonthViewCell::isPrimary() const
 {
   return mPrimary;
 }
 
 void MonthViewCell::setHoliday( bool holiday )
 {
   mHoliday = holiday; 
   //setMyPalette();
 }
 
 void MonthViewCell::setHoliday( const QString &holiday )
 {
   mHolidayString = holiday;
 
   if ( !holiday.isEmpty() ) {
     setHoliday( true );
   }
 }
 void MonthViewCell::keyPressEvent ( QKeyEvent * e )
 {
 
      e->ignore();
 
 }
 void MonthViewCell::updateCell()
 {
   
     setPrimary( mDate.month()%2 );
-    setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() );
+    setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         mItemList->setLineWidth( 3 );
     } else {
             mItemList->setLineWidth( 1 );
     }
     mItemList->clear();
     //qApp->processEvents();
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         mItemList->insertItem( item );
     }
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) {
         if ( event->categories().contains("Holiday") ||
              event->categories().contains(i18n("Holiday"))) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 mItemList->setLineWidth( 3 );
         }
         QString text;
         if (event->isMultiDay()) {
             QString prefix = "<->";
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) )
                     prefix ="->" ;
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) )
                         prefix ="<-" ;
                 } 
 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;
                 }
             }
             text = prefix + event->summary();
         } else {
             if (event->doesFloat())
                 text = event->summary();
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + 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() );
         item->setMoreInfo( event->description().length() > 0  );
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
         bool insert = true;
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 insert = false;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     insert = false;
 
         }
         if ( insert )
             mItemList->insertItem( item );
     }
 
     // insert due todos
     QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
         text += i18n("To-Do: %1").arg(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 );
         mItemList->insertItem( item );
     }
     //setMyPalette(); 
     setMyPalette();
     resizeEvent( 0 );
     // if ( isVisible())
     //   qApp->processEvents();
 }
 
 void MonthViewCell::updateConfig()
 {
 
   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();
 }
 void MonthViewCell::select()
 {
     ;// updateCell();
 }
 
 void MonthViewCell::resizeEvent ( QResizeEvent * )
 {
     int size = height() - mLabel->height();
     if ( size > 0 )
         mItemList->verticalScrollBar()->setMaximumHeight( size );
     size = width() - mLabel->width();
     if ( size > 0 )
         mItemList->horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() );
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
 }
 
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
   if ( !item ) return;
 
   MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
   Incidence *incidence = eventItem->incidence();
   if ( incidence ) mMonthView->defaultAction( incidence );
 }
 void MonthViewCell::newEvent()
 {
     QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
     emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
     static  QListBoxItem * lastClicked = 0;
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
   /*
   if ( lastClicked )
       if ( ! item ) {
           if ( lastClicked->listBox() != item->listBox() )
               lastClicked->listBox()->clearSelection();
       }
   */
  
   mMonthView->setSelectedCell( this );
   if( KOPrefs::instance()->mEnableMonthScroll ) enableScrollBars( true );
   select();
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
   if ( !item ) return;
   
   MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
   Incidence *incidence = eventItem->incidence();
   if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
   if ( !item ) return;
 
   mMonthView->setSelectedCell( this );
 }
 
 
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
   mCells.setAutoDelete( true );
   mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
   // mDayLayout = new QGridLayout( this );
   // create the day of the week labels (Sun, Mon, etc) and add them to
   // the layout.
   mDayLabels.resize( mDaysPerWeek );
   QFont bfont = font();
   if ( QApplication::desktop()->width() < 650 ) {
       bfont.setPointSize( bfont.pointSize() - 2 );
   }
   bfont.setBold( true );
   int i;
   
   for( i = 0; i < mDaysPerWeek; i++ ) {
     QLabel *label = new QLabel( this );
     label->setFont(bfont);
     label->setFrameStyle(QFrame::Panel|QFrame::Raised);
     label->setLineWidth(1);
     label->setAlignment(AlignCenter);
     mDayLabels.insert( i, label );
   }
 
   bfont.setBold( false );
   mWeekLabels.resize( mNumWeeks+1 );
   for( i = 0; i < mNumWeeks+1; i++ ) {
       KOWeekButton *label = new KOWeekButton( this );
       label->setFont(bfont);
       connect( label, SIGNAL( selectWeekNum ( int )),this, SIGNAL( selectWeekNum ( int ))   );  
       label->setFlat(true);
       QWhatsThis::add(label,i18n("Click on the week number to\nshow week in agenda view"));
       //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
       //label->setLineWidth(1);
       //label->setAlignment(AlignCenter);
       mWeekLabels.insert( i, label );
   }
   mWeekLabels[mNumWeeks]->setText( i18n("W"));
   int row, col;
   mCells.resize( mNumCells );
   for( row = 0; row < mNumWeeks; ++row ) {
     for( col = 0; col < mDaysPerWeek; ++col ) {
       MonthViewCell *cell = new MonthViewCell( this );
       mCells.insert( row * mDaysPerWeek + col, cell );
 
       connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                SLOT( defaultAction( Incidence * ) ) );
       connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                SIGNAL( newEventSignal( QDateTime ) ) );
     }
   }
 
   mContextMenu = eventPopup();
   // updateConfig(); //useless here
 
   emit incidenceSelected( 0 );
 }
 
 KOMonthView::~KOMonthView()
 {
   delete mContextMenu;
 }
 
 int KOMonthView::maxDatesHint()
 {
   return mNumCells;
 }
 
 int KOMonthView::currentDateCount()
 {
   return mNumCells;
 }
 
 QPtrList<Incidence> KOMonthView::selectedIncidences()
 {
   QPtrList<Incidence> selected;
 
   if ( mSelectedCell ) {
     Incidence *incidence = mSelectedCell->selectedIncidence();
     if ( incidence ) selected.append( incidence );
   }
 
   return selected;
 }
 
 DateList KOMonthView::selectedDates()
 {
   DateList selected;
 
   if ( mSelectedCell ) {
     QDate qd = mSelectedCell->selectedIncidenceDate();
     if ( qd.isValid() ) selected.append( qd );
   }
 
   return selected;
 }
 
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                const QDate &td)
 {
 #ifndef KORG_NOPRINTER
   calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 
 void KOMonthView::updateConfig()
 {
  
   mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
   QFontMetrics fontmetric(mDayLabels[0]->font());
   mWidthLongDayLabel = 0;
 
   for (int i = 0; i < 7; i++) {
     int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
     if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
   }
   bool temp = mShowSatSunComp ;
   mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
   if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
       computeLayout();
   updateDayLabels();
   //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
   int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
   //resizeEvent( 0 );
    for (uint i = 0; i < mCells.count(); ++i) {
     mCells[i]->updateConfig();
   }
 }
 
 void KOMonthView::updateDayLabels()
 {
   
   for (int i = 0; i < 7; i++) {
     if (mWeekStartsMonday) {
         bool show = mShortDayLabels;
         if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > mDayLabels[i]->width()  )
             show = true;
         mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
     } else {
        if (i==0) mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
        else mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
 
     }
   }
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
 //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
 
   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 < mCells.size(); ++i ) {
     QDate date = mStartDate.addDays( i );
     mCells[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
     // add holiday, if present
     QString hstring(KOCore::self()->holiday(date));
     mCells[i]->setHoliday( hstring );
 #endif
 
   }
   QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
   for( i = 0; i < 6; ++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;
     mWeekLabels[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()
 {
  
   uint i;
   for( i = 0; i < mCells.count(); ++i ) {
     mCells[i]->updateCell();
   }
   //qDebug("KOMonthView::updateView() ");
   processSelectionChange();
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     computeLayout();
 }
 void KOMonthView::computeLayout()
 {
   // select the appropriate heading string size. E.g. "Wednesday" or "Wed".
   // note this only changes the text if the requested size crosses the
   // threshold between big enough to support the full name and not big
   // enough.
 
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = size().width();//e
     int hei = size().height()-1;
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
 
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     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) {
         
         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());
     mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
 }
 
 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 ");
     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 );
   }
 }
 
 void KOMonthView::clearSelection()
 {
   if ( mSelectedCell ) {
     mSelectedCell->deselect();
     mSelectedCell = 0;
   }
 }
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
     
     e->ignore();
    
 }