rec changes

11 files changed, 32 insertions, 23 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a76f2ed..a9d42f0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2994,1537 +2994,1537 @@ void  CalendarView::slotSelectPickerDate( QDate  d)
             if ( to->hasDueDate() ) 
                 tim = to->dtDue().time();
             else {
                 tim = QTime ( 0,0,0 );
                 to->setFloats( true );
                 to->setHasDueDate( true );
             }
             QDateTime dt ( d,tim );
             to->setDtDue( dt );
 
             if ( to->hasStartDate() ) {
                 if ( len>0 ) 
                     to->setDtStart(to->dtDue().addSecs( -len ));
                 else
                     if (to->dtStart() > to->dtDue() )
                         to->setDtStart(to->dtDue().addDays( -3 ));
             }
             
             todoChanged( to );
         } else if ( mMoveIncidence->typeID() == eventID ) { 
             if ( mMoveIncidence->doesRecur() ) {
 #if 0 
                 // PENDING implement this
                 Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate );
                 mCalendar()->addIncidence( newInc ); 
                 if ( mMoveIncidence->typeID() == todoID )
                     emit  todoMoved((Todo*)mMoveIncidence,  KOGlobals::EVENTEDITED );
                 else
                     emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED);
                 mMoveIncidence = newInc;
             
 #endif 
             }
             QTime tim = mMoveIncidence->dtStart().time(); 
             int secs = mMoveIncidence->dtStart().secsTo(  mMoveIncidence->dtEnd());
             QDateTime dt ( d,tim );
             mMoveIncidence->setDtStart( dt );
             ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) );
             changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED);
         } else if ( mMoveIncidence->typeID() == journalID ) { 
             QTime tim = mMoveIncidence->dtStart().time(); 
             QDateTime dt ( d,tim );
             mMoveIncidence->setDtStart( dt );
             updateView();
         }
         mMoveIncidence->setRevision( mMoveIncidence->revision()+1  );
     }
 }
 
 void CalendarView::removeCategories()
 {
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     QStringList newCatList;
     Incidence* inc = incList.first();
     uint i;
     while ( inc ) {
         newCatList.clear();
         catIncList =  inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
             if ( catList.contains (catIncList[i]))
                 newCatList.append( catIncList[i] );
         }
         newCatList.sort();
         inc->setCategories( newCatList.join(",") );
         inc = incList.next();
     }
 }
 
 int CalendarView::addCategories()
 { 
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     Incidence* inc = incList.first();
     uint i;
     int count = 0;
      while ( inc ) {
         catIncList = inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
             if ( !catList.contains (catIncList[i])) {
                 catList.append( catIncList[i] );
                 //qDebug("add cat %s ",  catIncList[i].latin1());
                 ++count;
             }
         }
         inc = incList.next();
     }
     catList.sort();
     KOPrefs::instance()->mCustomCategories = catList;
     return count;
 }
 
 void CalendarView::editCategories()
 {
     qDebug("CalendarView::editCategories() ");
     KPIM::CategoryEditDialog ced (KOPrefs::instance(),this );
     ced.exec(); 
 }
 void CalendarView::manageCategories()
 {
     KOCatPrefs* cp = new KOCatPrefs(); 
     cp->show();
     int w =cp->sizeHint().width() ;
     int h = cp->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     if ( cp->addCat() ) {
         count = addCategories();
         if ( count ) {
             topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! "));
             writeSettings();
         } else
             topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! "));
     } else {
         removeCategories();
         updateView();
     }
     delete cp;
 }
 
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
     QPtrList<Incidence> delSel ;
     delSel.append(Inc);
     beamIncidenceList( delSel );
 } 
 void CalendarView::beamCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
     //qDebug("beamCalendar()  ");
     beamIncidenceList( delSel );
 }
 void CalendarView::beamFilteredCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->incidences(); 
     //qDebug("beamFilteredCalendar()  ");
     beamIncidenceList( delSel );
 }
 void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
 {
     
     KOBeamPrefs beamDialog;
     if ( beamDialog.exec () == QDialog::Rejected ) 
         return;
 #ifdef DESKTOP_VERSION
     QString fn =  locateLocal( "tmp", "kopibeamfile" );
 #else
     QString fn = "/tmp/kopibeamfile";
 #endif
     QString mes;
     bool createbup = true;
     if ( createbup ) {
         QString description = "\n";
         CalendarLocal* cal = new CalendarLocal();
         if ( beamDialog.beamLocal() )
             cal->setLocalTime();
         else
             cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
         Incidence *incidence = delSel.first();
         bool addText = false;
         if ( delSel.count() < 10 )
             addText = true;
         else {
             description.sprintf(i18n("  %d items?"),delSel.count() );
         }
         while ( incidence ) {
             Incidence *in = incidence->clone();
             if ( ! in->summary().isEmpty() ) {
                 in->setDescription("");
             } else {
                 in->setSummary( in->description().left(20));
                 in->setDescription("");
             }
             if ( addText )
                 description += in->summary() + "\n";
             cal->addIncidence( in );
             incidence = delSel.next();
         }
         if ( beamDialog.beamVcal() ) {
             fn += ".vcs";
             FileStorage storage( cal, fn, new VCalFormat );
             storage.save();
         } else {
             fn += ".ics";
             FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
         topLevelWidget()->setCaption(mes); 
         KApplication::convert2latin1( fn );
 #ifndef DESKTOP_VERSION
         Ir *ir = new Ir( this ); 
         connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
         ir->send( fn, description, "text/x-vCalendar" );
 #endif
     }
 }
 
 #ifndef DESKTOP_VERSION
 void  CalendarView::beamDone( Ir *ir )
 {
     delete ir;
     topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
     topLevelWidget()->raise();
 }
 #else 
 void  CalendarView::beamDone( Ir *){;}
 #endif
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
     if ( !inc ) return;
     showDatePickerPopup(); 
     mDatePickerMode = 2;
     mMoveIncidence = inc ;
     QDate da;
     if ( mMoveIncidence->typeID() == todoID ) {
         Todo * to = (Todo *) mMoveIncidence;
             if ( to->hasDueDate() ) 
                 da = to->dtDue().date();
             else
                 da = QDate::currentDate();
     } else {
         da = mMoveIncidence->dtStart().date();
     }
     //PENDING set date for recurring incidence to date of recurrence
     //mMoveIncidenceOldDate;
     mDatePicker->setDate( da );
 }
 void CalendarView::showDatePickerPopup() 
 {
  if ( mDateFrame->isVisible() )
         mDateFrame->hide();
     else {
         int offX = 0, offY = 0;
 #ifdef DESKTOP_VERSION
         int w =mDatePicker->sizeHint().width() ;
         int h = mDatePicker->sizeHint().height() ;
         int dw = topLevelWidget()->width();
         int dh = topLevelWidget()->height();
         offX = topLevelWidget()->x();
         offY = topLevelWidget()->y();
 #else
         int w =mDatePicker->sizeHint().width() ;
         int h = mDatePicker->sizeHint().height() ;
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
 #endif
         mDateFrame->setGeometry( (dw-w)/2+offX, (dh - h )/2+offY ,w,h );
         mDateFrame->show();
     }
 }
 void CalendarView::showDatePicker( ) 
 {
     showDatePickerPopup(); 
     mDatePickerMode = 1;
     mDatePicker->setDate( mNavigator->selectedDates().first() );
 }
 
 void CalendarView::showEventEditor()
 {
 #ifdef DESKTOP_VERSION
     int x,y,w,h;
     x = mEventEditor->geometry().x();
     y = mEventEditor->geometry().y();
     w = mEventEditor->width();
     h = mEventEditor->height();
     mEventEditor->show();
     mEventEditor->setGeometry(x,y,w,h);
 #else
     if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
         qApp->processEvents();
         delete mEventEditor;
         mEventEditor = mDialogManager->getEventEditor(); 
         topLevelWidget()->setCaption( i18n("") );
     }
     mEventEditor->showMaximized();
 #endif
 }
 void CalendarView::showTodoEditor()
 {
 #ifdef DESKTOP_VERSION
     int x,y,w,h;
     x = mTodoEditor->geometry().x();
     y = mTodoEditor->geometry().y();
     w = mTodoEditor->width();
     h = mTodoEditor->height();
     mTodoEditor->show();
     mTodoEditor->setGeometry(x,y,w,h);
 #else
     if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
         qApp->processEvents();
         delete mTodoEditor;  
         mTodoEditor = mDialogManager->getTodoEditor(); 
         topLevelWidget()->setCaption( i18n("") );
     }
     mTodoEditor->showMaximized();
 #endif
 }
 
 void CalendarView::cloneIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cloneIncidence(incidence);
     }
 }
 void CalendarView::moveIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         moveIncidence(incidence);
     }
 }
 void CalendarView::beamIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         beamIncidence(incidence);
     }
 }
 void CalendarView::toggleCancelIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cancelIncidence(incidence);
     }
 }
 
 
 void CalendarView::cancelIncidence(Incidence * inc )
 {
     inc->setCancelled( ! inc->cancelled() );
     changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED );
     updateView();
 }
 void CalendarView::cloneIncidence(Incidence * orgInc )
 { 
     Incidence * newInc = orgInc->clone();
     newInc->recreate();
  
     if ( newInc->typeID() == todoID ) {
         Todo* t = (Todo*) newInc; 
         bool cloneSub = false;
         if (  orgInc->relations().count() ) {
             int result = KMessageBox::warningYesNoCancel(this, 
                                                          i18n("The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?").arg( KGlobal::formatMessage ( newInc->summary(),0 ) ),
                                                          i18n("Todo has subtodos"),
                                                          i18n("Yes"),
                                                          i18n("No"));
             
             if ( result == KMessageBox::Cancel ) {
                 delete t;
                 return;
             }
             if (result == KMessageBox::Yes) cloneSub = true;
         }
         showTodoEditor();
         mTodoEditor->editTodo( t );
         if ( mTodoEditor->exec() ) {
             if ( cloneSub ) {
                 orgInc->cloneRelations( t );
                 mCalendar->addIncidenceBranch( t );
                 updateView();
 
             } else {
                 mCalendar->addTodo( t );
                 updateView();
             }
         } else {
             delete t;
         }
     }
     else if ( newInc->typeID() == eventID ) {
         Event*  e = (Event*)  newInc;
         showEventEditor();
         mEventEditor->editEvent( e );
         if ( mEventEditor->exec() ) {
             mCalendar->addEvent( e );
             updateView();
         } else {
             delete e;
         }
     } if ( newInc->typeID() == journalID ) {
         mCalendar->addJournal( (Journal*) newInc );
         editJournal( (Journal*) newInc );
     }
     setActiveWindow();
 }
 
 void CalendarView::newEvent()
 {
     // TODO: Replace this code by a common eventDurationHint of KOBaseView.
     KOAgendaView *aView = mViewManager->agendaView();
     if (aView) {
         if (aView->selectionStart().isValid()) {
             if (aView->selectedIsAllDay()) {
                 newEvent(aView->selectionStart(),aView->selectionEnd(),true);
             } else {
                 newEvent(aView->selectionStart(),aView->selectionEnd());
             }
             return;
         }
     }
 
     QDate date = mNavigator->selectedDates().first();
 #if 0
     QDateTime current =  QDateTime::currentDateTime();
     if ( date <= current.date() ) {
         int hour = current.time().hour() +1;
         newEvent( QDateTime(  current.date(), QTime( hour, 0, 0 ) ),
                   QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
     } else
 #endif
         newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),
                   QDateTime( date, QTime( KOPrefs::instance()->mStartTime +
                                           KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
 }
 
 void CalendarView::newEvent(QDateTime fh)
 {
     newEvent(fh,
              QDateTime(fh.addSecs(3600*KOPrefs::instance()->mDefaultDuration)));
 }
 
 void CalendarView::newEvent(QDate dt)
 {
     newEvent(QDateTime(dt, QTime(0,0,0)),
              QDateTime(dt, QTime(0,0,0)), true);
 }
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint)
 {
     newEvent(fromHint,  toHint, false);
 }
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
 {
   
     showEventEditor();
     mEventEditor->newEvent(fromHint,toHint,allDay);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
         if (filter && filter->showCategories()) {
             mEventEditor->setCategories(filter->categoryList().join(",") );
         }
         if ( filter )
             mEventEditor->setSecrecy( filter->getSecrecy() );
     }
     mEventEditor->exec();
     setActiveWindow();
 }
 void  CalendarView::todoAdded(Todo * t)
 {
   
     changeTodoDisplay ( t ,KOGlobals::EVENTADDED);
     updateTodoViews();
 }
 void  CalendarView::todoChanged(Todo * t)
 {
     emit todoModified( t, 4 );
     // updateTodoViews();
 }
 void  CalendarView::todoToBeDeleted(Todo *)
 {
     //qDebug("todoToBeDeleted(Todo *) ");
     updateTodoViews();
 }
 void  CalendarView::todoDeleted()
 {
     //qDebug(" todoDeleted()");
     updateTodoViews();
 }
 
 
 void CalendarView::newTodoDateTime( QDateTime dt, bool allday )
 { 
     showTodoEditor();
     mTodoEditor->newTodo(dt,0,allday);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
         if (filter && filter->showCategories()) {
             mTodoEditor->setCategories(filter->categoryList().join(",") );
         }
         if ( filter )
             mTodoEditor->setSecrecy( filter->getSecrecy() );
     }
     mTodoEditor->exec();
     setActiveWindow();
 }
 
 void CalendarView::newTodo()
 { 
     newTodoDateTime( QDateTime(),true );
 }
 
 void CalendarView::newSubTodo()
 {
     Todo *todo = selectedTodo();
     if ( todo ) newSubTodo( todo );
 }
 
 void CalendarView::newSubTodo(Todo *parentEvent)
 {
   
     showTodoEditor();
     mTodoEditor->newTodo(QDateTime(),parentEvent,true); 
     mTodoEditor->exec();
     setActiveWindow();
 }
 
 void CalendarView::newFloatingEvent()
 {
     DateList tmpList = mNavigator->selectedDates();
     QDate date = tmpList.first();
 
     newEvent( QDateTime( date, QTime( 12, 0, 0 ) ),
               QDateTime( date, QTime( 12, 0, 0 ) ), true );
 }
 
 
 void CalendarView::editEvent( Event *event )
 {
 
     if ( !event ) return;
     if ( event->isReadOnly() ) {
         showEvent( event );
         return;
     }
     showEventEditor();
     mEventEditor->editEvent( event , mFlagEditDescription);
     mEventEditor->exec();
     setActiveWindow();
     
 }
 void CalendarView::editJournal( Journal *jour )
 { 
     if ( !jour ) return;
     mDialogManager->hideSearchDialog();
     mViewManager->showJournalView();
     mNavigator->slotDaySelect( jour->dtStart().date() );
 }
 void CalendarView::editTodo( Todo *todo )
 {
     if ( !todo ) return;
  
     if ( todo->isReadOnly() ) {
         showTodo( todo );
         return;
     }
     showTodoEditor();
     mTodoEditor->editTodo( todo ,mFlagEditDescription);
     mTodoEditor->exec();
     setActiveWindow();
 
 }
 
 KOEventViewerDialog* CalendarView::getEventViewerDialog()
 {
     if ( !mEventViewerDialog ) {
         mEventViewerDialog = new KOEventViewerDialog(0);
         connect( mEventViewerDialog, SIGNAL(  editIncidence( Incidence* )), this, SLOT(editIncidence( Incidence* )  ) );
         connect( this, SIGNAL(configChanged()), mEventViewerDialog, SLOT(updateConfig()));
         connect( mEventViewerDialog, SIGNAL(jumpToTime( const QDate &)), 
                  dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
         connect( mEventViewerDialog, SIGNAL(showAgendaView( bool ) ), 
                  viewManager(), SLOT( showAgendaView( bool ) ) );
         connect( mEventViewerDialog, SIGNAL(signalViewerClosed()), 
                  this, SLOT( slotViewerClosed() ) );
         connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), 
                  this, SLOT( todoChanged(Todo *) ) );
         connect( mEventViewerDialog, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) ));
         mEventViewerDialog->resize( 640, 480 );
         
     }
     return mEventViewerDialog;
 }
 void CalendarView::showEvent(Event *event)
 {
     getEventViewerDialog()->setEvent(event);
     getEventViewerDialog()->showMe();
 }
 
 void CalendarView::showTodo(Todo *event)
 {
     getEventViewerDialog()->setTodo(event);
     getEventViewerDialog()->showMe();
 }
 void CalendarView::showJournal( Journal *jour )
 { 
     getEventViewerDialog()->setJournal(jour);
     getEventViewerDialog()->showMe();
    
 }
 // void CalendarView::todoModified (Todo *event, int changed)
 // {
 //  //  if (mDialogList.find (event) != mDialogList.end ()) {
 // //     kdDebug() << "Todo modified and open" << endl;
 // //     KOTodoEditor* temp = (KOTodoEditor *) mDialogList[event];
 // //     temp->modified (changed);
 
 // //   }
 
 //   mViewManager->updateView();
 // }
 
 void CalendarView::appointment_show()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
     showEvent(anEvent);
 }
 
 void CalendarView::appointment_edit()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
     editEvent(anEvent);
 }
 
 void CalendarView::appointment_delete()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
     deleteEvent(anEvent);
 }
 
 void CalendarView::todo_resub( Todo * parent, Todo * sub )
 {
     if (!sub) return;
     if ( sub->relatedTo() == parent )
         return;
     sub->setRelatedTo(parent);
     sub->updated();
     setModified(true);
     updateView();
 }
 void CalendarView::todo_unsub(Todo *anTodo )
 {
     todo_resub( 0, anTodo );
 }
 
 void CalendarView::deleteTodo(Todo *todo)
 {
     if (!todo) {
         KNotifyClient::beep();
         return;
     }
     if (KOPrefs::instance()->mConfirm) {
         QString text = KGlobal::formatMessage ( todo->summary(),0 );
         if (!todo->relations().isEmpty()) {
             text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!");
 
         }
         switch (msgItemDelete(i18n("Todo:") +"\n"+text)) {
         case KMessageBox::Continue: // OK
             bool deleteT = false;
             if (!todo->relations().isEmpty()) {
                 deleteT = removeCompletedSubTodos( todo );
             } 
             // deleteT == true: todo already deleted in removeCompletedSubTodos
             if ( !deleteT ) {
                 checkExternalId(  todo );
                 calendar()->deleteTodo(todo);
                 changeTodoDisplay( todo,KOGlobals::EVENTDELETED );
                 updateView();
             }
             break;
         } // switch
     } else {
         checkExternalId(  todo );
         mCalendar->deleteTodo(todo);
         changeTodoDisplay( todo,KOGlobals::EVENTDELETED );
         updateView();
     }
     
     emit updateSearchDialog();
 }
 void CalendarView::deleteJournal(Journal *jour)
 {
     if (!jour) {
         KNotifyClient::beep();
         return;
     }
     if (KOPrefs::instance()->mConfirm) {
 
         QString des;
         if ( !jour->summary().isEmpty() ) {
             des = jour->summary();
         } else {
             des = jour->description().left(30);
             des = des.simplifyWhiteSpace ();
             des.replace (QRegExp ("\\n"),"" );
             des.replace (QRegExp ("\\r"),"" );
         }
         switch (msgItemDelete( i18n("Journal:") +"\n"+KGlobal::formatMessage ( des,0 ))) {
         case KMessageBox::Continue: // OK
             calendar()->deleteJournal(jour);
             updateView();
             break;
         } // switch
     } else {
         calendar()->deleteJournal(jour);;
         updateView();
     }
     emit updateSearchDialog();
 }
 
 void CalendarView::deleteEvent(Event *anEvent)
 {
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
-    if (anEvent->recurrence()->doesRecur()) {
+    if (anEvent->doesRecur()) {
         QDate itemDate = mViewManager->currentSelectionDate();
         int km;
         if (!itemDate.isValid()) {
             //kdDebug() << "Date Not Valid" << endl;
             if (KOPrefs::instance()->mConfirm) {
                 km = KMessageBox::warningContinueCancel(this,KGlobal::formatMessage ( anEvent->summary(),0 ) +
                                                         i18n("\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?"),
                                                         i18n("KO/Pi Confirmation"),i18n("Delete All"));
                 if ( km == KMessageBox::Continue )
                     km = KMessageBox::No; // No = all below
             } else
                 km = KMessageBox::No;
         } else {
             km = KMessageBox::warningYesNoCancel(this,KGlobal::formatMessage ( anEvent->summary(),0 ) +
                                                  i18n("\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n")+
                                                       KGlobal::locale()->formatDate(itemDate)+i18n(" ?\n\nDelete:\n"),
                                                  i18n("KO/Pi Confirmation"),i18n("Current"),
                                                  i18n("All"));
         }
         switch(km) {
 
         case KMessageBox::No: // Continue // all
             //qDebug("KMessageBox::No ");
             if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0)
                 schedule(Scheduler::Cancel,anEvent);
 
             checkExternalId( anEvent);
             mCalendar->deleteEvent(anEvent);
             changeEventDisplay(anEvent,KOGlobals::EVENTDELETED);
             break;
 
             // Disabled because it does not work
             //#if 0
         case KMessageBox::Yes: // just this one
             //QDate qd = mNavigator->selectedDates().first();
             //if (!qd.isValid()) {
             //  kdDebug() << "no date selected, or invalid date" << endl;
             //  KNotifyClient::beep();
             //  return;
             //}
             //while (!anEvent->recursOn(qd)) qd = qd.addDays(1);
             if (itemDate!=QDate(1,1,1) || itemDate.isValid()) {
                 anEvent->addExDate(itemDate);
                 int duration = anEvent->recurrence()->duration();
                 if ( duration > 0 ) {
                     anEvent->recurrence()->setDuration( duration - 1 );
                 }
                 changeEventDisplay(anEvent, KOGlobals::EVENTEDITED);
             }
             break;
             //#endif
         } // switch
     } else {
         if (KOPrefs::instance()->mConfirm) {
             switch (KMessageBox::warningContinueCancel(this,KGlobal::formatMessage ( anEvent->summary(),0 ) +
                                                        i18n("\nAre you sure you want\nto delete this event?"),
                                                        i18n("KO/Pi Confirmation"),i18n("Delete"))) {
             case KMessageBox::Continue: // OK
                 if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0)
                     schedule(Scheduler::Cancel,anEvent);
                 checkExternalId( anEvent);
                 mCalendar->deleteEvent(anEvent);
                 changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
                 break;
             } // switch
         } else {
             if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0)
                 schedule(Scheduler::Cancel,anEvent);
             checkExternalId( anEvent);
             mCalendar->deleteEvent(anEvent);
             changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
         }
     } // if-else
     emit updateSearchDialog();
 }
 
 bool CalendarView::deleteEvent(const QString &uid)
 {
     Event *ev = mCalendar->event(uid);
     if (ev) {
         deleteEvent(ev);
         return true;
     } else {
         return false;
     }
 }
 
 /*****************************************************************************/
 
 void CalendarView::action_mail()
 {
 #ifndef KORG_NOMAIL
     KOMailClient mailClient;
 
     Incidence *incidence = currentSelection();
 
     if (!incidence) {
         KMessageBox::sorry(this,i18n("Can't generate mail:\nNo event selected."));
         return;
     }
     if(incidence->attendeeCount() == 0 ) {
         KMessageBox::sorry(this,
                            i18n("Can't generate mail:\nNo attendees defined.\n"));
         return;
     }
 
     CalendarLocal cal_tmp;
     Event *event = 0;
     Event *ev = 0;
     if ( incidence && incidence->typeID() == eventID ) {
         event = static_cast<Event *>(incidence);
         ev = new Event(*event);
         cal_tmp.addEvent(ev);
     }
     ICalFormat mForm();
     QString attachment = mForm.toString( &cal_tmp );
     if (ev) delete(ev);
 
     mailClient.mailAttendees(currentSelection(), attachment);
 
 #endif
 
 #if 0
     Event *anEvent = 0;
     if (mViewManager->currentView()->isEventView()) {
         anEvent = dynamic_cast<Event *>((mViewManager->currentView()->selectedIncidences()).first());
     }
 
     if (!anEvent) {
         KMessageBox::sorry(this,i18n("Can't generate mail:\nNo event selected."));
         return;
     }
     if(anEvent->attendeeCount() == 0 ) {
         KMessageBox::sorry(this,
                            i18n("Can't generate mail:\nNo attendees defined.\n"));
         return;
     }
 
     mailobject.emailEvent(anEvent);
 #endif
 }
 
 
 void CalendarView::schedule_publish(Incidence *incidence)
 {
     Event *event = 0;
     Todo *todo = 0;
 
     if (incidence == 0) {
         incidence = mViewManager->currentView()->selectedIncidences().first();
         if (incidence == 0) {
             incidence = mTodoList->selectedIncidences().first();
         }
     }
     if ( incidence && incidence->typeID() == eventID ) {
         event = static_cast<Event *>(incidence);
     } else {
         if ( incidence && incidence->typeID() == todoID ) {
             todo = static_cast<Todo *>(incidence);
         }
     }
 
     if (!event && !todo) {
         KMessageBox::sorry(this,i18n("No event selected."));
         return;
     }
 
     PublishDialog *publishdlg = new PublishDialog();
     if (incidence->attendeeCount()>0) {
         QPtrList<Attendee> attendees = incidence->attendees();
         attendees.first();
         while ( attendees.current()!=0 ) {
             publishdlg->addAttendee(attendees.current());
             attendees.next();
         }
     }
     bool send = true;
     if ( KOPrefs::instance()->mMailClient == KOPrefs::MailClientSendmail ) {
         if ( publishdlg->exec() != QDialog::Accepted )
             send = false;
     }
     if ( send ) {
         OutgoingDialog *dlg = mDialogManager->outgoingDialog();
         if ( event ) {
             Event *ev = new Event(*event);
             ev->registerObserver(0);
             ev->clearAttendees();
             if (!dlg->addMessage(ev,Scheduler::Publish,publishdlg->addresses())) {
                 delete(ev);
             }
         } else {
             if ( todo ) {
                 Todo *ev = new Todo(*todo);
                 ev->registerObserver(0);
                 ev->clearAttendees();
                 if (!dlg->addMessage(ev,Scheduler::Publish,publishdlg->addresses())) {
                     delete(ev);
                 }
             }
         }
     }
     delete publishdlg;
 }
 
 void CalendarView::schedule_request(Incidence *incidence)
 {
     schedule(Scheduler::Request,incidence);
 }
 
 void CalendarView::schedule_refresh(Incidence *incidence)
 {
     schedule(Scheduler::Refresh,incidence);
 }
 
 void CalendarView::schedule_cancel(Incidence *incidence)
 {
     schedule(Scheduler::Cancel,incidence);
 }
 
 void CalendarView::schedule_add(Incidence *incidence)
 {
     schedule(Scheduler::Add,incidence);
 }
 
 void CalendarView::schedule_reply(Incidence *incidence)
 {
     schedule(Scheduler::Reply,incidence);
 }
 
 void CalendarView::schedule_counter(Incidence *incidence)
 {
     schedule(Scheduler::Counter,incidence);
 }
 
 void CalendarView::schedule_declinecounter(Incidence *incidence)
 {
     schedule(Scheduler::Declinecounter,incidence);
 }
 
 void CalendarView::schedule_publish_freebusy(int daysToPublish)
 {
     QDateTime start = QDateTime::currentDateTime();
     QDateTime end = start.addDays(daysToPublish);
 
     FreeBusy *freebusy = new FreeBusy(mCalendar, start, end);
     freebusy->setOrganizer(KOPrefs::instance()->email());
 
 
     PublishDialog *publishdlg = new PublishDialog();
     if ( publishdlg->exec() == QDialog::Accepted ) {
         OutgoingDialog *dlg = mDialogManager->outgoingDialog();
         if (!dlg->addMessage(freebusy,Scheduler::Publish,publishdlg->addresses())) {
             delete(freebusy);
         }
     }
     delete publishdlg;
 }
 
 void CalendarView::schedule(Scheduler::Method method, Incidence *incidence)
 {
     Event *event = 0;
     Todo *todo = 0;
 
     if (incidence == 0) {
         incidence = mViewManager->currentView()->selectedIncidences().first();
         if (incidence == 0) {
             incidence = mTodoList->selectedIncidences().first();
         }
     }
     if ( incidence && incidence->typeID() == eventID ) {
         event = static_cast<Event *>(incidence);
     }
     if ( incidence && incidence->typeID() == todoID ) {
         todo = static_cast<Todo *>(incidence);
     }
 
     if (!event && !todo) {
         KMessageBox::sorry(this,i18n("No event selected."));
         return;
     }
 
     if( incidence->attendeeCount() == 0 && method != Scheduler::Publish ) {
         KMessageBox::sorry(this,i18n("The event has no attendees."));
         return;
     }
 
     Event *ev = 0;
     if (event) ev = new Event(*event);
     Todo *to = 0;
     if (todo) to = new Todo(*todo);
 
     if (method == Scheduler::Reply || method == Scheduler::Refresh) {
         Attendee *me = incidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
         if (!me) {
             KMessageBox::sorry(this,i18n("Could not find your attendee entry.\nPlease check the emails."));
             return;
         }
         if (me->status()==Attendee::NeedsAction && me->RSVP() && method==Scheduler::Reply) {
             StatusDialog *statdlg = new StatusDialog(this);
             if (!statdlg->exec()==QDialog::Accepted) return;
             me->setStatus( statdlg->status() );
             delete(statdlg);
         }
         Attendee *menew = new Attendee(*me);
         if (ev) {
             ev->clearAttendees();
             ev->addAttendee(menew,false);
         } else {
             if (to) {
                 todo->clearAttendees();
                 todo->addAttendee(menew,false);
             }
         }
     }
 
     OutgoingDialog *dlg = mDialogManager->outgoingDialog();
     if (ev) {
         if ( !dlg->addMessage(ev,method) ) delete(ev);
     } else {
         if (to) {
             if ( !dlg->addMessage(to,method) ) delete(to);
         }
     }
 }
 
 void CalendarView::openAddressbook()
 {
     KRun::runCommand("kaddressbook");
 }
 
 void CalendarView::setModified(bool modified)
 {
     //qDebug("CalendarView::setModified %d ", modified);
     if ( modified )
         emit signalmodified();
     mModified = modified;
     if ( mModified )
         emit modifiedChanged(mModified);
   
 }
 
 bool CalendarView::isReadOnly()
 {
     return mReadOnly;
 }
 
 void CalendarView::setReadOnly(bool readOnly)
 {
     if (mReadOnly != readOnly) {
         mReadOnly = readOnly;
         emit readOnlyChanged(mReadOnly);
     }
 }
 
 bool CalendarView::isModified()
 {
     return mModified;
 }
 void CalendarView::slotprintSelInc()
 {
     if ( currentSelection() == 0 ) {
         KMessageBox::sorry(this,i18n("There is nothing selected!"));
         return;
     }
     showIncidence();
     getEventViewerDialog()->print();
     
 }
 void CalendarView::printSetup()
 {
 #ifndef KORG_NOPRINTER
     createPrinter();
 
     mCalPrinter->setupPrinter();
 #endif
 }
 
 void CalendarView::print()
 {
 #ifndef KORG_NOPRINTER
     createPrinter();
 
     DateList tmpDateList = mNavigator->selectedDates();
     mCalPrinter->print(CalPrinter::Month,
                        tmpDateList.first(), tmpDateList.last());
 #endif
 }
 
 void CalendarView::printPreview()
 {
 #ifndef KORG_NOPRINTER
     kdDebug() << "CalendarView::printPreview()" << endl;
 
     createPrinter();
 
     DateList tmpDateList = mNavigator->selectedDates();
 
     mViewManager->currentView()->printPreview(mCalPrinter,tmpDateList.first(),
                                               tmpDateList.last());
 #endif
 }
 
 void CalendarView::exportICalendar()
 {
     QString filename = KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this);
 
     // Force correct extension
     if (filename.right(4) != ".ics") filename += ".ics";
 
     FileStorage storage( mCalendar, filename, new ICalFormat() );
     storage.save();
 }
 
 bool CalendarView::exportVCalendar( QString filename )
 {
     if (mCalendar->journals().count() > 0) {
         int result = KMessageBox::warningContinueCancel(this,
                                                         i18n("The journal entries can not be\nexported to a vCalendar file."),
                                                         i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"),
                                                         true);
         if (result != KMessageBox::Continue) return false;
     }
 
     //QString filename = KFileDialog::getSaveFileName("vcalout.vcs",i18n("*.vcs|VCalendars"),this);
 
     // Force correct extension
     if (filename.right(4) != ".vcs") filename += ".vcs";
 
     FileStorage storage( mCalendar, filename, new VCalFormat );
     return storage.save();
  
 }
 
 void CalendarView::eventUpdated(Incidence *)
 {
     setModified();
     // Don't call updateView here. The code, which has caused the update of the
     // event is responsible for updating the view.
     //  updateView();
 }
 
 void CalendarView::adaptNavigationUnits()
 {
     if (mViewManager->currentView()->isEventView()) {
         int days = mViewManager->currentView()->currentDateCount();
         if (days == 1) {
             emit changeNavStringPrev(i18n("&Previous Day"));
             emit changeNavStringNext(i18n("&Next Day"));
         } else {
             emit changeNavStringPrev(i18n("&Previous Week"));
             emit changeNavStringNext(i18n("&Next Week"));
         }
     }
 }
 
 void CalendarView::processMainViewSelection( Incidence *incidence )
 {
     if ( incidence ) mTodoList->clearSelection();
     processIncidenceSelection( incidence );
 }
 
 void CalendarView::processTodoListSelection( Incidence *incidence )
 {
     if ( incidence && mViewManager->currentView() ) {
         mViewManager->currentView()->clearSelection();
     }
     processIncidenceSelection( incidence );
 }
 
 void CalendarView::processIncidenceSelection( Incidence *incidence )
 {
     emit incidenceSelected( incidence );
     if ( incidence == mSelectedIncidence ) return;
     mSelectedIncidence = incidence;
 
     if ( incidence && incidence->typeID() == eventID ) {
         Event *event = static_cast<Event *>( incidence );
         if ( event->organizer() == KOPrefs::instance()->email() ) {
             emit organizerEventsSelected( true );
         } else {
             emit organizerEventsSelected(false);
         }
         if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails,
                                     KOPrefs::instance()->email() ) ) {
             emit groupEventsSelected( true );
         } else {
             emit groupEventsSelected(false);
         }
         return;
     } else {
         if  ( incidence && incidence->typeID() == todoID ) {
             emit todoSelected( true );
             Todo *event = static_cast<Todo *>( incidence );
             if ( event->organizer() == KOPrefs::instance()->email() ) {
                 emit organizerEventsSelected( true );
             } else {
                 emit organizerEventsSelected(false);
             }
             if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails,
                                         KOPrefs::instance()->email() ) ) {
                 emit groupEventsSelected( true );
             } else {
                 emit groupEventsSelected(false);
             }
             return;
         } else {
             emit todoSelected( false );
             emit organizerEventsSelected(false);
             emit groupEventsSelected(false);
         }
         return;
     }
 
     /*  if  ( incidence && incidence->typeID() == todoID ) {
         emit todoSelected( true );
         } else {
         emit todoSelected( false );
         }*/
 }
 
 
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
     if (ICalDrag::canDecode(QApplication::clipboard()->data())) {
         emit pasteEnabled(true);
     } else {
         emit pasteEnabled(false);
     }
 #endif
 }
 
 void CalendarView::showDates(const DateList &selectedDates)
 {
     //  kdDebug() << "CalendarView::selectDates()" << endl;
   
 
     if ( !mBlockShowDates ) {
         if ( mViewManager->currentView() ) {
             updateView( selectedDates.first(), selectedDates.last() );
         } else {
             mViewManager->showAgendaView();
         }
     }
 
     QDate date = selectedDates.first();
     if ( ! date.isValid() ) {
         topLevelWidget()->setCaption("");
         return;
     }
 
     QString selDates;
     selDates = KGlobal::locale()->formatDate( date, true);
     if  (selectedDates.first() < selectedDates.last() )
         selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true);
     else {
         QString addString;
         if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
         else if (  date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");
         else if ( date  == QDateTime::currentDateTime().date().addDays(-1) )
             addString = i18n("Yesterday");
         else if ( date == QDateTime::currentDateTime().date().addDays(-2) )
             addString = i18n("Day before yesterday");
         else if ( date == QDateTime::currentDateTime().date().addDays(2) )
             addString = i18n("Day after tomorrow");
         if ( !addString.isEmpty() ) {
             topLevelWidget()->setCaption( addString+", " + selDates );
             return;
         }
     }
     topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
   
 }
 
 QPtrList<CalFilter> CalendarView::filters()
 {
     return mFilters;
 
 }
 void CalendarView::editFilters()
 {
     //  kdDebug() << "CalendarView::editFilters()" << endl;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         filter = mFilters.next();
     }
 
     mDialogManager->showFilterEditDialog(&mFilters);
     updateFilter();
 }
 void CalendarView::toggleFilter()
 {
     if ( mLeftFrame->isHidden() ) {
         toggleExpand();
         showFilter( true );
     } else 
         showFilter(! mCalEditView->isVisible());
 }
 
 KOFilterView *CalendarView::filterView()
 {
     return mFilterView;
 }
 void CalendarView::selectFilter( int fil )
 {
     mFilterView->setSelectedFilter( fil );
     updateUnmanagedViews();
 }
 void CalendarView::showFilter(bool visible)
 {
 #if 1
     if (visible)  {
         mCalEditView->readConfig(); 
         mCalEditView->show(); 
         QValueList<int> sizes;
         sizes = mLeftFrame->sizes();
         if ( sizes.count() == 4 &&  sizes[3] < 20 ) {
             sizes.clear();
             sizes << 100;
             sizes << 0;
             sizes << 0;
             sizes << 100;
             mLeftFrame->setSizes(sizes);
         }
 #if 0
         sizes = mLeftFrame->sizes();
         int ccc = 0;
         while ( ccc < sizes.count()) {
             qDebug("size %d %d ", ccc, sizes[ccc]);
             ++ccc;    
         }
 #endif
         
     }
     else {
         mCalEditView->hide();
     }
 #else
     if (visible) mFilterView->show();
     else mFilterView->hide();
 #endif
 }
 void CalendarView::toggleFilerEnabled( )
 {
     mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled()  );
     if ( !mFilterView->filtersEnabled()   ) 
         topLevelWidget()->setCaption( i18n("Filter disabled ") );
     updateUnmanagedViews();
         
 }
 void CalendarView::updateFilter()
 {
     CalFilter *filter = mFilterView->selectedFilter();
     if (filter) {
         QString mess;
         if (mFilterView->filtersEnabled()) {
             mess =  i18n("Filter selected: ")+filter->name();
             filter->setEnabled(true);
         }
         else filter->setEnabled(false);
         mCalendar->setFilter(filter);
         updateView();
         if ( !mess.isEmpty() )
             topLevelWidget()->setCaption( mess );
             
     }
     emit filtersUpdated();
 }
 
 void CalendarView::filterEdited()
 {
     mFilterView->updateFilters();
     updateFilter();
     writeSettings();
 }
 
 
 void CalendarView::takeOverEvent()
 {
     Incidence *incidence = currentSelection();
 
     if (!incidence) return;
 
     incidence->setOrganizer(KOPrefs::instance()->email());
     incidence->recreate();
     incidence->setReadOnly(false);
 
     updateView();
 }
 
 void CalendarView::takeOverCalendar()
 {
     // TODO: Create Calendar::allIncidences() function and use it here
 
     clearAllViews();
     QPtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {
         events.at(i)->setOrganizer(KOPrefs::instance()->email());
         events.at(i)->recreate();
         events.at(i)->setReadOnly(false);
     }
 
     QPtrList<Todo> todos = mCalendar->todos();
     for(uint i=0; i<todos.count(); ++i) {
         todos.at(i)->setOrganizer(KOPrefs::instance()->email());
         todos.at(i)->recreate();
         todos.at(i)->setReadOnly(false);
     }
 
     QPtrList<Journal> journals = mCalendar->journals();
     for(uint i=0; i<journals.count(); ++i) {
         journals.at(i)->setOrganizer(KOPrefs::instance()->email());
         journals.at(i)->recreate();
         journals.at(i)->setReadOnly(false);
     }
 
     updateView();
 }
 
 void CalendarView::showIntro()
 {
     kdDebug() << "To be implemented." << endl;
 }
 
 QWidgetStack *CalendarView::viewStack()
 {
     return mRightFrame;
 }
 
 QWidget *CalendarView::leftFrame()
 {
     return ( QWidget *)mLeftFrame;
 }
 
 DateNavigator *CalendarView::dateNavigator()
 {
     return mNavigator;
 }
 
 KDateNavigator* CalendarView::dateNavigatorWidget()
 {
     return mDateNavigator->navigatorView();
 }
 void CalendarView::toggleDateNavigatorWidget()
 {
     KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ;
    
     if (!KOPrefs::instance()->mShowDateNavigator )
         mDateNavigator->hide();
     else
         mDateNavigator->show();
 }
 void CalendarView::addView(KOrg::BaseView *view)
 {
     mViewManager->addView(view);
 }
 
 void CalendarView::showView(KOrg::BaseView *view)
 {
     mViewManager->showView(view, mLeftFrame->isVisible());
 }
 
 Incidence *CalendarView::currentSelection()
 {
     return mViewManager->currentSelection();
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 0dd5ef5..c738f7e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1,1770 +1,1770 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     Marcus Bains line.
     Copyright (c) 2001 Ali Rahimi
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef _WIN32_
 #define protected public
 #include <qwidget.h>
 #undef protected 
 #endif
 #include <qintdict.h>
 #include <qdatetime.h>
 #include <qapplication.h>
 #include <qpopupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
 #include "koagendaitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "koagenda.h"
 
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockStartup;
 
 
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
     : QFrame(_agenda->viewport(),name), agenda(_agenda)
 {
     setLineWidth(0);
     setMargin(0);
     setBackgroundColor(Qt::red);
     minutes = new QTimer(this);
     connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
     minutes->start(0, true);
     mTimeBox = new QLabel(this);
     mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
     QPalette pal = mTimeBox->palette();
     pal.setColor(QColorGroup::Foreground, Qt::red);
     mTimeBox->setPalette(pal);
     //mTimeBox->setAutoMask(true);
 
     agenda->addChild(mTimeBox);
 
     oldToday = -1;
 }
 
 MarcusBains::~MarcusBains()
 {
     //delete minutes;
 }
 
 int MarcusBains::todayColumn()
 {
     QDate currentDate = QDate::currentDate();
 
     DateList dateList = agenda->dateList();
     DateList::ConstIterator it;
     int col = 0;
     for(it = dateList.begin(); it != dateList.end(); ++it) {
 	if((*it) == currentDate)
 	    return KOGlobals::self()->reverseLayout() ?
 	                         agenda->columns() - 1 - col : col;
         ++col;
     }
 
     return -1;
 }
 void MarcusBains::updateLoc()
 {
     updateLocation();
 }
 void MarcusBains::updateLocation(bool recalculate)
 {
   
     QTime tim = QTime::currentTime();
     //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1());
     if((tim.hour() == 0) && (oldTime.hour()==23))
         recalculate = true;
 
     int mins = tim.hour()*60 + tim.minute();
     int minutesPerCell = 24 * 60 / agenda->rows();
     int y = mins*agenda->gridSpacingY()/minutesPerCell;
     int today = recalculate ? todayColumn() : oldToday;
     int x = agenda->gridSpacingX()*today;
     bool disabled = !(KOPrefs::instance()->mMarcusBainsEnabled);
 
     oldTime = tim;
     oldToday = today;
 
     if(disabled || (today<0)) {
         hide(); mTimeBox->hide();
         return;
     } else {
         show(); mTimeBox->show();
     }
 
     if(recalculate)
         setFixedSize(agenda->gridSpacingX(),1);
     agenda->moveChild(this, x, y);
     raise();
 
     if(recalculate)
         //mTimeBox->setFont(QFont("helvetica",10));
       mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont);
 
     mTimeBox->setText(KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds));
     mTimeBox->adjustSize();
     // the -2 below is there because there is a bug in this program
     // somewhere, where the last column of this widget is a few pixels
     // narrower than the other columns.
     int offs = (today==agenda->columns()-1) ? -4 : 0;
     agenda->moveChild(mTimeBox,
                x+agenda->gridSpacingX()-mTimeBox->width()+offs-1,
                   y-mTimeBox->height());
     mTimeBox->raise();
     //mTimeBox->setAutoMask(true);
     int secs = QTime::currentTime().second();
     minutes->start( (60 - secs +1)*1000 ,true);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////
 
 
 /*
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
                    const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
    
     mAllAgendaPopup = 0;
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
   //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
   connect ( this, SIGNAL (contentsMoving ( int , int )   ), this, SLOT ( slotContentMove(int,int)) );
 }
 
 /*
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
 KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
     mAllAgendaPopup = 0;
   blockResize = false;
   mColumns = columns;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
   mGridSpacingY = KOPrefs::instance()->mAllDaySize;
   mAllDayMode = true;
 #ifndef DESKTOP_VERSION
   //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
 }
 
 
 KOAgenda::~KOAgenda()
 {
     if(mMarcusBains) delete mMarcusBains;
     
 }
 
 Incidence *KOAgenda::selectedIncidence() const
 {
   return (mSelectedItem ? mSelectedItem->incidence() : 0);
 }
 
 
 QDate KOAgenda::selectedIncidenceDate() const
 {
   return (mSelectedItem ? mSelectedItem->itemDate() : QDate());
 }
 
 
 void KOAgenda::init()
 {  
     mPopupTimer = new QTimer(this);
     connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
 
     mNewItemPopup = new QPopupMenu( this );
     connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
     QString pathString = "";
     if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
     if ( QApplication::desktop()->width() < 480 )
         pathString += "icons16/";
     } else
         pathString += "iconsmini/";
     
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
     mNewItemPopup->insertSeparator ( ); 
     mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
     mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #ifndef _WIN32_
   int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase
   viewport()->setWFlags ( wflags);
 #endif
   mGridSpacingX = 80;
   mResizeBorderWidth = 8;
   mScrollBorderWidth = 8;
   mScrollDelay = 30;
   mScrollOffset = 10;
   mPaintPixmap.resize( 20,20);
   //enableClipper(true);
 
   // Grab key strokes for keyboard navigation of agenda. Seems to have no
   // effect. Has to be fixed.
   setFocusPolicy(WheelFocus);
 
   connect(&mScrollUpTimer,SIGNAL(timeout()),SLOT(scrollUp()));
   connect(&mScrollDownTimer,SIGNAL(timeout()),SLOT(scrollDown()));
   connect(&mResizeTimer,SIGNAL(timeout()),SLOT(finishResize()));
 
   mStartCellX = 0;
   mStartCellY = 0;
   mCurrentCellX = 0;
   mCurrentCellY = 0;
 
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 
   mOldLowerScrollValue = -1;
   mOldUpperScrollValue = -1;
 
   mClickedItem = 0;
 
   mActionItem = 0;
   mActionType = NOP;
   mItemMoved = false;
 
   mSelectedItem = 0;
 
   // mItems.setAutoDelete(true);
 
   resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
 
   viewport()->update();
 
   setMinimumSize(30,  1);
 //  setMaximumHeight(mGridSpacingY * mRows + 5);
 
   // Disable horizontal scrollbar. This is a hack. The geometry should be
   // controlled in a way that the contents horizontally always fits. Then it is
   // not necessary to turn off the scrollbar.
   setHScrollBarMode(AlwaysOff);
   if ( ! mAllDayMode ) 
       setVScrollBarMode(AlwaysOn);
   else
       setVScrollBarMode(AlwaysOff);
       
   setStartHour(KOPrefs::instance()->mDayBegins);
 
   calculateWorkingHours();
 
   connect(verticalScrollBar(),SIGNAL(valueChanged(int)),
           SLOT(checkScrollBoundaries(int)));
 
   // Create the Marcus Bains line.
   if(mAllDayMode)
       mMarcusBains = 0;
   else {
       mMarcusBains = new MarcusBains(this);
       addChild(mMarcusBains);
   }  
   mPopupKind = 0;
   mPopupItem =  0; 
   mInvalidPixmap = false;
   
 }
 
 void KOAgenda::shrinkPixmap()
 {
     mPaintPixmap.resize( 20,20);
     mInvalidPixmap = true;
 }
 void KOAgenda::slotContentMove(int,int)
 {
     emit sendPing(); 
     if ( mActionType == NOP )
         slotClearSelection(); 
     if ( mSelectedItem && !mActionItem ) {
         deselectItem();
         emit incidenceSelected( 0 );
     }
 }
 void KOAgenda::clear()
 {
   KOAgendaItem *item;
   for ( item=mItems.first(); item != 0; item=mItems.next() ) {
     mUnusedItems.append( item );
     //item->hide();
   }
   mItems.clear();
   mSelectedItem = 0;
   clearSelection();
 }
 
 void KOAgenda::clearSelection()
 {
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 }
 
 void KOAgenda::marcus_bains()
 {
     if(mMarcusBains) mMarcusBains->updateLocation(true);
 }
 
 
 void KOAgenda::changeColumns(int columns)
 {
     if (columns == 0) {
         qDebug("KOAgenda::changeColumns() called with argument 0 ");
         return;
     }
     clear();
     mColumns = columns;
     computeSizes();
 }
 
 /*
   This is the eventFilter function, which gets all events from the KOAgendaItems
   contained in the agenda. It has to handle moving and resizing for all items.
 */
 bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 {
     //  kdDebug() << "KOAgenda::eventFilter" << endl;
     switch(event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
         return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
 
     case (QEvent::Leave):
         if (!mActionItem)
             setCursor(arrowCursor);
         return true;
 
     default:
         return QScrollView::eventFilter(object,event);
     }
 }
 void KOAgenda::popupMenu()
 {
     mPopupTimer->stop();
     if (  mPopupKind == 1 || mPopupKind == 3 ) {
         if (mActionItem ) {
             endItemAction();
         }
         mLeftMouseDown = false; // no more leftMouse computation
         if (mPopupItem) {
             //mClickedItem = mPopupItem;
             selectItem(mPopupItem);
             if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 )
                 mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
             
         } 
     } else if ( mPopupKind == 2 || mPopupKind == 4 ) {
         if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action
             endSelectAction( false ); // do not emit new event signal
             mLeftMouseDown = false; // no more leftMouse computation
         }
         if ( KOPrefs::instance()->mBlockPopupMenu &&  mPopupKind == 2 )
             mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
         
     }
     mLeftMouseDown = false;
     mPopupItem = 0;
     mPopupKind = 0;
 }
 void KOAgenda::categoryChanged(Incidence * inc)
 {
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( item->incidence() == inc ) {
             item->initColor ();
             item->updateItem();
         }
     }
 }
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
 
     if ( mInvalidPixmap ) {
         mInvalidPixmap = false;
         qDebug("KO: Upsizing Pixmaps ");
         computeSizes();
         emit updateViewSignal();
         return true;
     } 
     emit sendPing(); 
     static int startX = 0;
     static int startY = 0;
     int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 );
     static bool blockMoving = true;
 
     //qDebug("KOAgenda::eventFilter_mous ");
     if ( object == mNewItemPopup ) {
         //qDebug("mNewItemPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mNewItemPopup->removeEventFilter( this ); 
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
                 dX = -dX;
             int dY =  me->globalPos().y() - mPopupPos.y();
             if ( dY < 0 )
                 dY = -dY;
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 mNewItemPopup->hide();
             }
         }
         return true;
     }
     if ( object == mAllAgendaPopup ) {
         //qDebug(" mAllAgendaPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mAllAgendaPopup->removeEventFilter( this );
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
                 dX = -dX;
             int dY =  me->globalPos().y() - mPopupPos.y();
             if ( dY < 0 )
                 dY = -dY;
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 mAllAgendaPopup->hide();
             } 
         }
         return true;
     }
     QPoint viewportPos;
     if (object != viewport()) {
         blockmoveDist = blockmoveDist*2;
         viewportPos = ((QWidget *)object)->mapToParent(me->pos());
     } else {
         viewportPos = me->pos();
     }
     bool objIsNotViewport = (object != viewport());
     bool leftButt = false;
 #ifdef DESKTOP_VERSION
     leftButt  = (me->button() == LeftButton);
 #endif
     switch (me->type())  {
     case QEvent::MouseButtonPress:
         if (me->button() == LeftButton) {
             mPopupTimer->start( 600 );
             mLeftMouseDown = true;
         }
         blockMoving = true;
         startX = viewportPos.x();
         startY = viewportPos.y();  
         mPopupPos = me->globalPos();
         if (  objIsNotViewport && !leftButt ) {
             KOAgendaItem * tempItem = (KOAgendaItem *)object;
             if (mAllDayMode) {
                 if ( tempItem->height() > 10 ) {
                     int minV = tempItem->height()/4;
                     if ( minV > (blockmoveDist/2)-2 ) {
                         if ( minV > blockmoveDist )
                             minV = blockmoveDist;
                         else
                             minV = (blockmoveDist/2);
                     }
                     bool border = false;
                     int diff = tempItem->y() - viewportPos.y();
                     if ( diff < 0 )
                         diff *= -1;
                     if ( diff < minV ) {
                         border = true;
                         objIsNotViewport = false;
                     }
                     if ( ! border ) {
                         diff = tempItem->y() + tempItem->height()- viewportPos.y();
                         if ( diff < 0 )
                             diff *= -1;
                         if ( diff < minV ) {
                             border = true;
                             objIsNotViewport = false;
                         }
                     }
                 }
             } else { // not allday
                 if ( tempItem->width() > 10 ) {
                     int minH = tempItem->width()/4;
                     if ( minH > (blockmoveDist/2)-2 ) {
                         if ( minH > blockmoveDist )
                             minH = blockmoveDist;
                         else
                             minH = (blockmoveDist/2);
                     }
                     bool border = false;
                     int diff = tempItem->x() - viewportPos.x();
                     if ( diff < 0 )
                         diff *= -1;
                     if ( diff < minH ) {
                         border = true;
                         objIsNotViewport = false;
                     }
                     if ( ! border ) {
                         diff = tempItem->x() + tempItem->width() - viewportPos.x();
                         if ( diff < 0 )
                             diff *= -1;
                         if ( diff < minH ) {
                             border = true;
                             objIsNotViewport = false;
                         }          
                     }
                 }
             }
         }
         if ( objIsNotViewport ) {
             mPopupItem = (KOAgendaItem *)object;
             mPopupKind = 1;
             if (me->button() == RightButton) {
                 mPopupKind = 3;
                 popupMenu();
             } else if (me->button() == LeftButton) {
                 mActionItem = (KOAgendaItem *)object;
                 if (mActionItem) {
                     emit signalClearSelection();
                     slotClearSelection();
                     selectItem(mActionItem);
                     Incidence *incidence = mActionItem->incidence();
-                    if ( incidence->isReadOnly() /*|| incidence->recurrence()->doesRecur() */) {
+                    if ( incidence->isReadOnly() /*|| incidence->doesRecur() */) {
                         mActionItem = 0;
                     } else {
                         startItemAction(viewportPos);
                     }
                 }
             }
         } else { // ---------- viewport()
             mPopupItem = 0;
             mPopupKind = 2;
             selectItem(0);
             mActionItem = 0;   
             if (me->button() == RightButton) {
                 int x,y;
                 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
                 int gx,gy;
                 contentsToGrid(x,y,gx,gy); 
                 mCurrentCellX = gx;
                 mCurrentCellY = gy;
                 mStartCellX = gx;
                 mStartCellY = gy;
                 mPopupKind = 4;
                 popupMenu();
             } else if (me->button() == LeftButton) {
                 setCursor(arrowCursor);
                 startSelectAction(viewportPos);
             }
         }
         break;
 
     case QEvent::MouseButtonRelease:
         if (me->button() == LeftButton ) {  
             mPopupTimer->stop();
         }
         if (object != viewport()) { 
             if (me->button() == LeftButton && mLeftMouseDown) {
                 if (mActionItem) {  
                     QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
                     //qDebug(" %d %d %d  ",clipperPos.y(),visibleHeight() , 9  );
                     if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) {
                         mScrollUpTimer.stop();
                         mScrollDownTimer.stop();
                         mActionItem->resetMove();
                         placeSubCells( mActionItem );
                         // emit startDragSignal( mActionItem->incidence() );
                         setCursor( arrowCursor );
                         mActionItem = 0;
                         mActionType = NOP;
                         mItemMoved = 0;
                         mLeftMouseDown = false;
                         return true;
                     }
                     endItemAction();
                 }
             }
             
         } else { // ---------- viewport()
            if (me->button() == LeftButton && mLeftMouseDown ) { //left click
                 endSelectAction( true ); // emit new event signal
             }
         }
         if (me->button() == LeftButton) 
             mLeftMouseDown = false;
        
         break;
 
     case QEvent::MouseMove:
         //qDebug("mm ");
         if (  !mLeftMouseDown )
             return false;
         if ( blockMoving ) {
             int dX, dY; 
             dX = startX - viewportPos.x();
             if ( dX < 0   )
                 dX = -dX;
             dY = viewportPos.y() - startY;
             if ( dY < 0 )
                 dY = -dY;
             //qDebug("%d %d %d ", dX, dY , blockmoveDist  );
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 blockMoving = false;
             }
         } 
         if ( ! blockMoving  )
             mPopupTimer->stop();
         if (object != viewport()) {
             KOAgendaItem *moveItem = (KOAgendaItem *)object;
             if (!moveItem->incidence()->isReadOnly()  ) {
                 if (!mActionItem)
                     setNoActionCursor(moveItem,viewportPos);
                 else {
                     if ( !blockMoving )
                         performItemAction(viewportPos);
                 }
             }
         } else { // ---------- viewport() 
             mPopupPos =  viewport()->mapToGlobal( me->pos() );
             if ( mActionType == SELECT ) {
                 performSelectAction( viewportPos );
             }
         }
         break;
 
     case QEvent::MouseButtonDblClick:
         mPopupTimer->stop();
         if (object == viewport()) {
             selectItem(0);
             int x,y;
             viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
             int gx,gy;
             contentsToGrid(x,y,gx,gy);
             emit newEventSignal(gx,gy);
         } else {
             KOAgendaItem *doubleClickedItem = (KOAgendaItem *)object;
             selectItem(doubleClickedItem);
             if ( KOPrefs::instance()->mEditOnDoubleClick )
                 emit editIncidenceSignal(doubleClickedItem->incidence());
             else
                 emit showIncidenceSignal(doubleClickedItem->incidence());
         }
         break;
 
     default:
         break;
     }
     return true;
 
 }
 
 void KOAgenda::newItem( int item )
 {
     if ( item == 1 ) { //new event
         newEventSignal(mStartCellX ,mStartCellY  );
     } else
         if ( item == 2 ) { //new event
             newTodoSignal(mStartCellX ,mStartCellY  );
         } else 
             {
                 emit showDateView( item, mStartCellX );
                 // 3Day view
                 // 4Week view
                 // 5Month view
                 // 6Journal view
             }
 }
 void KOAgenda::slotClearSelection()
 {
     if (mSelectionHeight) {
         int selectionX = mSelectionCellX * mGridSpacingX; 
         int top = mSelectionYTop - 2 *mGridSpacingY;
         int hei = mSelectionHeight + 4 *mGridSpacingY;
         clearSelection();
         repaintContents( selectionX, top,
                      mGridSpacingX, hei ,false );
     }
 
 }
 void KOAgenda::startSelectAction(QPoint viewportPos)
 {
    
     emit signalClearSelection();
     slotClearSelection();
 
     mActionType = SELECT;
 
     int x,y;
     viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
     int gx,gy;
     contentsToGrid(x,y,gx,gy);
 
     mStartCellX = gx;
     mStartCellY = gy;
     mCurrentCellX = gx;
     mCurrentCellY = gy;
 
     // Store new selection
     mSelectionCellX = gx;
     mSelectionYTop = gy * mGridSpacingY;
     mSelectionHeight = mGridSpacingY;
   
     // Paint new selection
     repaintContents( mSelectionCellX * mGridSpacingX+1, mSelectionYTop,
                      mGridSpacingX-1, mSelectionHeight );
 }
 
 void KOAgenda::performSelectAction(QPoint viewportPos)
 {
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   QPoint clipperPos = clipper()->
                       mapFromGlobal(viewport()->mapToGlobal(viewportPos));
   
   // Scroll if cursor was moved to upper or lower end of agenda.
   if (clipperPos.y() < mScrollBorderWidth) {
     mScrollUpTimer.start(mScrollDelay);
   } else if (visibleHeight() - clipperPos.y() <
              mScrollBorderWidth) {
     mScrollDownTimer.start(mScrollDelay);
   } else {
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
   }
 
   if ( gy > mCurrentCellY ) {
     mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop;
 
 
     repaintContents( (KOGlobals::self()->reverseLayout() ?
                      mColumns - 1 - mSelectionCellX : mSelectionCellX) *
                      mGridSpacingX, mSelectionYTop,
                      mGridSpacingX, mSelectionHeight , false);
 
     mCurrentCellY = gy;
   } else if ( gy < mCurrentCellY ) {
     if ( gy >= mStartCellY ) {
       int selectionHeight = mSelectionHeight;
       mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop;
 
       repaintContents( (KOGlobals::self()->reverseLayout() ?
                        mColumns - 1 - mSelectionCellX : mSelectionCellX) *
                        mGridSpacingX, mSelectionYTop,
                        mGridSpacingX, selectionHeight,false );
     
       mCurrentCellY = gy;
     } else {
     }
   }
 }
 
 void KOAgenda::endSelectAction( bool emitNewEvent )
 {
   mActionType = NOP;
   mScrollUpTimer.stop();
   mScrollDownTimer.stop();
   
   emit newTimeSpanSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
   if ( emitNewEvent && mStartCellY < mCurrentCellY ) {
       emit newEventSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
   }
 }
 
 void KOAgenda::startItemAction(QPoint viewportPos)
 {
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   mStartCellX = gx;
   mStartCellY = gy;
   mCurrentCellX = gx;
   mCurrentCellY = gy;
 
   if (mAllDayMode) {
     int gridDistanceX = (x - gx * mGridSpacingX);
     if (gridDistanceX < mResizeBorderWidth &&
         mActionItem->cellX() == mCurrentCellX) {
       mActionType = RESIZELEFT;
       setCursor(sizeHorCursor);
     } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
                mActionItem->cellXWidth() == mCurrentCellX) {
       mActionType = RESIZERIGHT;
       setCursor(sizeHorCursor);
     } else {
       mActionType = MOVE;
       mActionItem->startMove();
       setCursor(sizeAllCursor);
     }
   } else {
     int gridDistanceY = (y - gy * mGridSpacingY);
     bool allowResize = ( mActionItem->incidence()->typeID() != todoID );
     if (allowResize && gridDistanceY < mResizeBorderWidth &&
         mActionItem->cellYTop() == mCurrentCellY &&
         !mActionItem->firstMultiItem()) {
       mActionType = RESIZETOP;
       setCursor(sizeVerCursor);
     } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
                mActionItem->cellYBottom() == mCurrentCellY &&
                !mActionItem->lastMultiItem())  {
       mActionType = RESIZEBOTTOM;
       setCursor(sizeVerCursor);
     } else {
       mActionType = MOVE;
       mActionItem->startMove();
       setCursor(sizeAllCursor);
     }
   }
 }
 
 void KOAgenda::performItemAction(QPoint viewportPos)
 {
 //  kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl;
 //  QPoint point = viewport()->mapToGlobal(viewportPos);
 //  kdDebug() << "Global: " << point.x() << "," << point.y() << endl;
 //  point = clipper()->mapFromGlobal(point);
 //  kdDebug() << "clipper: " << point.x() << "," << point.y() << endl;
 //  kdDebug() << "visible height: " << visibleHeight() << endl;
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
 //  kdDebug() << "contents: " << x << "," << y << "\n" << endl;
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
   QPoint clipperPos = clipper()->
                       mapFromGlobal(viewport()->mapToGlobal(viewportPos));
 
   // Cursor left active agenda area.
   // This starts a drag.
   if ( /*clipperPos.y() < 0 || clipperPos.y() > visibleHeight() ||*/
        clipperPos.x() < 0 || clipperPos.x() > visibleWidth() ) {
     if ( mActionType == MOVE ) {
       mScrollUpTimer.stop();
       mScrollDownTimer.stop();
       mActionItem->resetMove();
       placeSubCells( mActionItem );
       // emit startDragSignal( mActionItem->incidence() );
       setCursor( arrowCursor );
       mActionItem = 0;
       mActionType = NOP;
       mItemMoved = 0;
       return;
     }
   } else {
     switch ( mActionType ) {
       case MOVE:
         setCursor( sizeAllCursor );
         break;
       case RESIZETOP:
       case RESIZEBOTTOM:
         setCursor( sizeVerCursor );
         break;
       case RESIZELEFT:
       case RESIZERIGHT:
         setCursor( sizeHorCursor );
         break;
       default:
         setCursor( arrowCursor );
     }
   }
 
   // Scroll if item was moved to upper or lower end of agenda.
   if (clipperPos.y() < mScrollBorderWidth) {
     mScrollUpTimer.start(mScrollDelay);
   } else if (visibleHeight() - clipperPos.y() <
              mScrollBorderWidth) {
     mScrollDownTimer.start(mScrollDelay);
   } else {
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
   }
 
   // Move or resize item if necessary
   if (mCurrentCellX != gx || mCurrentCellY != gy) {
     mItemMoved = true;
     mActionItem->raise();
     if (mActionType == MOVE) {
       // Move all items belonging to a multi item
       KOAgendaItem *moveItem = mActionItem->firstMultiItem();
       bool isMultiItem = (moveItem || mActionItem->lastMultiItem());
       if (!moveItem) moveItem = mActionItem;
       while (moveItem) {
         int dy;
         if (isMultiItem) dy = 0;
         else dy = gy - mCurrentCellY;
         moveItem->moveRelative(gx - mCurrentCellX,dy);
         int x,y;
         gridToContents(moveItem->cellX(),moveItem->cellYTop(),x,y);
         moveItem->resize(mGridSpacingX * moveItem->cellWidth(),
                          mGridSpacingY * moveItem->cellHeight());
         moveItem->raise();
         moveChild(moveItem,x,y);
         moveItem = moveItem->nextMultiItem();
       }
     } else if (mActionType == RESIZETOP) {
       if (mCurrentCellY <= mActionItem->cellYBottom()) {
         mActionItem->expandTop(gy - mCurrentCellY);
         mActionItem->resize(mActionItem->width(),
                             mGridSpacingY * mActionItem->cellHeight());
         int x,y;
         gridToContents(mCurrentCellX,mActionItem->cellYTop(),x,y);
         //moveChild(mActionItem,childX(mActionItem),y);
         QScrollView::moveChild( mActionItem,childX(mActionItem),y );
       }
     } else if (mActionType == RESIZEBOTTOM) {
       if (mCurrentCellY >= mActionItem->cellYTop()) {
         mActionItem->expandBottom(gy - mCurrentCellY);
         mActionItem->resize(mActionItem->width(),
                             mGridSpacingY * mActionItem->cellHeight());
       }
     } else if (mActionType == RESIZELEFT) {
        if (mCurrentCellX <= mActionItem->cellXWidth()) {
          mActionItem->expandLeft(gx - mCurrentCellX);
          mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(),
                              mActionItem->height());
         int x,y;
         gridToContents(mActionItem->cellX(),mActionItem->cellYTop(),x,y);
         moveChild(mActionItem,x,childY(mActionItem));
        }
     } else if (mActionType == RESIZERIGHT) {
        if (mCurrentCellX >= mActionItem->cellX()) {
          mActionItem->expandRight(gx - mCurrentCellX);
          mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(),
                              mActionItem->height());
        }
     }
     mCurrentCellX = gx;
     mCurrentCellY = gy;
   }
 }
 
 void KOAgenda::endItemAction()
 {
  
     if ( mItemMoved ) {
         KOAgendaItem *placeItem = mActionItem->firstMultiItem();
         if ( !placeItem ) {
             placeItem = mActionItem;      
         }
-        if ( placeItem->incidence()->recurrence()->doesRecur() ) {
+        if ( placeItem->incidence()->doesRecur() ) {
             Incidence* oldInc =  placeItem->incidence();
             placeItem->recreateIncidence();
             emit addToCalSignal(placeItem->incidence(), oldInc );
         }
         int type = mActionType;
         if ( mAllDayMode )
             type = -1;
         KOAgendaItem *modifiedItem = placeItem;
         //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */);
         QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
         KOAgendaItem *item;
   
         if ( placeItem->incidence()->typeID() == todoID ) {
             mSelectedItem = 0;
             //qDebug("todo %d %d %d ", mCurrentCellX, modifiedItem->cellX() ,modifiedItem->cellXWidth());
             modifiedItem->mLastMoveXPos = mCurrentCellX;
             emit itemModified( modifiedItem, mActionType ); 
         }  
         else {  
 
 
             globalFlagBlockAgendaItemPaint = 1;
             for ( item=oldconflictItems.first(); item != 0;
                   item=oldconflictItems.next() ) {
                 placeSubCells(item);    
             } 
             while ( placeItem ) { 
                 //qDebug("placeItem  %s ", placeItem->incidence()->summary().latin1());  
                 oldconflictItems = placeItem->conflictItems();
                 for ( item=oldconflictItems.first(); item != 0;
                       item=oldconflictItems.next() ) {
                     placeSubCells(item);    
                 } 
                 placeSubCells( placeItem );
                 placeItem = placeItem->nextMultiItem();
             } 
             globalFlagBlockAgendaItemPaint = 0;
             for ( item=oldconflictItems.first(); item != 0;
                   item=oldconflictItems.next() ) {
                 globalFlagBlockAgendaItemUpdate = 0;
                 item->repaintMe();
                 globalFlagBlockAgendaItemUpdate = 1;
                 item->repaint( false );    
             } 
             placeItem = modifiedItem;
         
             while ( placeItem ) { 
                 //qDebug("placeItem  %s ", placeItem->incidence()->summary().latin1());  
                 globalFlagBlockAgendaItemUpdate = 0;
                 placeItem->repaintMe();
                 globalFlagBlockAgendaItemUpdate = 1;
                 placeItem->repaint(false);
                 placeItem = placeItem->nextMultiItem();
             }  
             emit itemModified( modifiedItem, mActionType ); 
          
 
             placeItem = modifiedItem;
             while ( placeItem ) {
                 oldconflictItems = placeItem->conflictItems();
                 for ( item=oldconflictItems.first(); item != 0;
                       item=oldconflictItems.next() ) {
                     placeSubCells(item);    
                 } 
                 placeSubCells( placeItem );
                 placeItem = placeItem->nextMultiItem();
 
             } 
             placeItem = modifiedItem;
             while ( placeItem ) {
                 oldconflictItems = placeItem->conflictItems();
                 for ( item=oldconflictItems.first(); item != 0;
                       item=oldconflictItems.next() ) {
                     globalFlagBlockAgendaItemUpdate = 0;
                     item->repaintMe();
                     globalFlagBlockAgendaItemUpdate = 1;
                     item->repaint(false);    
                 }
                 placeItem = placeItem->nextMultiItem();
             } 
             /*
 
             oldconflictItems = modifiedItem->conflictItems();
             for ( item=oldconflictItems.first(); item != 0;
             item=oldconflictItems.next() ) {
             globalFlagBlockAgendaItemUpdate = 0;
             item->paintMe(false);
             globalFlagBlockAgendaItemUpdate = 1;
             item->repaint(false);    
             }
             */
 
  
         }
      
     }
     if ( mActionItem )
         emit incidenceSelected( mActionItem->incidence() );
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
     setCursor( arrowCursor );
     mActionItem = 0;
     mActionType = NOP;
     mItemMoved = 0;
 
 }
 
 void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
 {
 //  kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl;
 //  QPoint point = viewport()->mapToGlobal(viewportPos);
 //  kdDebug() << "Global: " << point.x() << "," << point.y() << endl;
 //  point = clipper()->mapFromGlobal(point);
 //  kdDebug() << "clipper: " << point.x() << "," << point.y() << endl;
 
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
 //  kdDebug() << "contents: " << x << "," << y << "\n" << endl;
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   // Change cursor to resize cursor if appropriate
   if (mAllDayMode) {
     int gridDistanceX = (x - gx * mGridSpacingX);
     if (gridDistanceX < mResizeBorderWidth &&
         moveItem->cellX() == gx) {
       setCursor(sizeHorCursor);
     } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
              moveItem->cellXWidth() == gx) {
       setCursor(sizeHorCursor);
     } else {
       setCursor(arrowCursor);
     }
   } else {
     int gridDistanceY = (y - gy * mGridSpacingY);
     if (gridDistanceY < mResizeBorderWidth &&
         moveItem->cellYTop() == gy &&
         !moveItem->firstMultiItem()) {
       setCursor(sizeVerCursor);
     } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
                moveItem->cellYBottom() == gy &&
                !moveItem->lastMultiItem()) {
       setCursor(sizeVerCursor);
     } else {
       setCursor(arrowCursor);
     }
   }
 }
 
 
 /*
   Place item in cell and take care that multiple items using the same cell do
   not overlap. This method is not yet optimal. It doesn´t use the maximum space
   it can get in all cases.
   At the moment the method has a bug: When an item is placed only the sub cell
   widths of the items are changed, which are within the Y region the item to
   place spans. When the sub cell width change of one of this items affects a
   cell, where other items are, which do not overlap in Y with the item to place,
   the display gets corrupted, although the corruption looks quite nice.
 */
 void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 {
 
     QPtrList<KOAgendaItem> conflictItems;
     int maxSubCells = 0;
     QIntDict<KOAgendaItem> subCellDict(7);
 
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if (item != placeItem) {
             if (placeItem->cellX() <= item->cellXWidth() &&
                 placeItem->cellXWidth() >= item->cellX()) {
                 if ((placeItem->cellYTop() <= item->cellYBottom()) &&
                     (placeItem->cellYBottom() >= item->cellYTop())) {
                     conflictItems.append(item);
                     if (item->subCells() > maxSubCells)
                         maxSubCells = item->subCells();
                     subCellDict.insert(item->subCell(),item);
                 }
             }
         }
     }
 
     if (conflictItems.count() > 0) {
         // Look for unused sub cell and insert item
         int i;
         for(i=0;i<maxSubCells;++i) {
             if (!subCellDict.find(i)) {
                 placeItem->setSubCell(i);
                 break;
             }
         }
         if (i == maxSubCells) {
             placeItem->setSubCell(maxSubCells);
             maxSubCells++;  // add new item to number of sub cells
         }
 
         // Prepare for sub cell geometry adjustment
         int newSubCellWidth;
         if (mAllDayMode) newSubCellWidth = mGridSpacingY / maxSubCells;
         else newSubCellWidth = mGridSpacingX / maxSubCells;
         conflictItems.append(placeItem);
 
 
         // Adjust sub cell geometry of all direct conflict items
         for ( item=conflictItems.first(); item != 0;
               item=conflictItems.next() ) {
             item->setSubCells(maxSubCells);
             if (mAllDayMode) {
                 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
             } else {
                 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
             }
             int x,y;
             gridToContents(item->cellX(),item->cellYTop(),x,y);
             if (mAllDayMode) {
                 y += item->subCell() * newSubCellWidth;
             } else {
                 x += item->subCell() * newSubCellWidth;
             }
             moveChild(item,x,y);  
             // qDebug("moveChild %s %d %d ", item->incidence()->summary().latin1() ,x,y);  
             //item->updateItem();
         }
         // Adjust sub cell geometry of all conflict items of all conflict items
         for ( item=conflictItems.first(); item != 0;
               item=conflictItems.next() ) {
             if ( placeItem != item ) {
                 KOAgendaItem *item2;
                 QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
                 for ( item2=conflictItems2.first(); item2 != 0;
                       item2=conflictItems2.next() ) {
                     if ( item2->subCells() != maxSubCells) {
                         item2->setSubCells(maxSubCells);
                         if (mAllDayMode) {
                             item2->resize(item2->cellWidth() * mGridSpacingX, newSubCellWidth);
                         } else {
                             item2->resize(newSubCellWidth, item2->cellHeight() * mGridSpacingY);
                         }
                         int x,y;
                         gridToContents(item2->cellX(),item2->cellYTop(),x,y);
                         if (mAllDayMode) {
                             y += item2->subCell() * newSubCellWidth;
                         } else {
                             x += item2->subCell() * newSubCellWidth;
                         }
                         moveChild(item2,x,y);  
                         //qDebug("setttttt %d %s",maxSubCells, item2->text().latin1() );
                     }
                 }
             }
         }
     } else {
         placeItem->setSubCell(0);
         placeItem->setSubCells(1);
         if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY);
         else placeItem->resize(mGridSpacingX,placeItem->height());
         int x,y;
         gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
         moveChild(placeItem,x,y);
     }
     placeItem->setConflictItems(conflictItems);
   //   for ( item=conflictItems.first(); item != 0;
 //           item=conflictItems.next() ) {
 //         //item->updateItem();
 //         //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() );  
 //     }
 //     placeItem->updateItem();
 } 
 
 void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
 
     if ( mInvalidPixmap ) {
         mInvalidPixmap = false;
         qDebug("KO: Upsizing Pixmaps ");
         computeSizes();
         emit updateViewSignal();
         return;
     }
     if ( ! mAllDayMode ) {
         // currently not working for
    
         //qDebug("KOAgenda::drawContents ");
 #if 0
         if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
             qDebug("WAU ");
             drawContentsToPainter();
         }
 #endif
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
 
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
             if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                                                                     ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
             
                 int vxSel, vySel;
                 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
                 int off = mSelectionHeight;
                 if ( vySel < 0 )
                     off += vySel;
                 //qDebug("OFF %d %d %d", off,vySel, vy );  
                 bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
             } else {
                 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
             }
         }
         if ( mSelectionHeight > 0 ) { 
             //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
             if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                  ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
                 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
                 // bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
                 int hei = mSelectionHeight;
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
                     bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     } else {
 #if 0
         qDebug("mCurPixWid  %d %d ",mCurPixWid, contentsWidth() );
         if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
             qDebug("WAUWAU ");
             drawContentsToPainter();
         }
 #endif
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
             bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
     
         if ( mSelectionHeight > 0 ) { 
             //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
             if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                  ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
                 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
                 //bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
                 int hei = mSelectionHeight;
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
                     bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     }
 
 }
 
 void KOAgenda::finishUpdate()
 {
 
     KOAgendaItem *item;
     globalFlagBlockAgendaItemPaint = 1;  
     // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( !item->checkLayout() ) {
             //qDebug(" conflictitem found ");
             int newSubCellWidth;
             if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells();
             else newSubCellWidth = mGridSpacingX / item->subCells();
 
             if (mAllDayMode) {
                 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
             } else {
                 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
             }
             int x,y;
             gridToContents(item->cellX(),item->cellYTop(),x,y);
             if (mAllDayMode) {
                 y += item->subCell() * newSubCellWidth;
             } else {
                 x += item->subCell() * newSubCellWidth;
             }
             moveChild(item,x,y); 
         }
     }
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( !item->isVisible() )
             item->show();
        
     }
     globalFlagBlockAgendaItemUpdate = 0;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
             item->repaintMe( );
     }
     globalFlagBlockAgendaItemUpdate = 1;
     qApp->processEvents(); 
     globalFlagBlockAgendaItemPaint = 0;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         item->repaint( false );
     }
     marcus_bains();
 }
 
 /*
   Draw grid in the background of the agenda.
 */
 void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch)
 {
 
  
     if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask )
         return;
     if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 )
         return;
     int cx = 0, cy = 0,  cw = contentsWidth(),  ch = contentsHeight();
     if ( ch < 1 )
         ch = 1;
     if (  mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) {
         mPaintPixmap.resize( contentsWidth()+42, ch );
     }
     mCurPixWid = contentsWidth();
     mCurPixHei = ch;
     if ( mHighlightPixmap.width() < mGridSpacingX-1  ) {
         mHighlightPixmap.resize( mGridSpacingX-1, 5 );
         mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor );
     }
     mPixPainter.begin( &mPaintPixmap) ;
     //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height()  );
     QPainter * p ;
     if (paint == 0) {
         mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor);
         p = &mPixPainter;
     }
     else
         p = paint ;
     // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ",  cx, cy, cw, ch); 
    
     //--cx;++cw;
     int lGridSpacingY = mGridSpacingY*2;
     int selDay;
     QDate curDate = QDate::currentDate();
     if ( !backgroundOnly ) {
         for ( selDay = 0; selDay < mSelectedDates.count();  ++selDay)
             {
                 if ( mSelectedDates[selDay] == curDate && KOPrefs::instance()->mHighlightCurrentDay) {
                     int x1 = cx;
                     int y1 = 0;
                     if (y1 < cy) y1 = cy;
                     int x2 = cx+cw-1;
                     int y2 = contentsHeight();
                     if (y2 > cy+ch-1) y2=cy+ch-1;
                     if (x2 >= x1 && y2 >= y1) {
                         int gxStart = selDay;
                         int gxEnd = gxStart ;
                         int xStart = KOGlobals::self()->reverseLayout() ?
                             (mColumns - 1 - gxStart)*mGridSpacingX :
                             gxStart*mGridSpacingX;
                         if (xStart < x1) xStart = x1;
                         int xEnd = KOGlobals::self()->reverseLayout() ?
                             (mColumns - gxStart)*mGridSpacingX-1 :
                             (gxStart+1)*mGridSpacingX-1;
                         if (xEnd > x2) xEnd = x2;
                         if ( KOPrefs::instance()->mUseHighlightLightColor )
                             p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                         KOPrefs::instance()->mAgendaBgColor.light());
                         else
                             p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                         KOPrefs::instance()->mAgendaBgColor.dark());
                       
                     } 
                 }
             }
     }
     // Highlight working hours
 
     if ( !backgroundOnly )
         if (mWorkingHoursEnable) {
             int x1 = cx;
             int y1 = mWorkingHoursYTop;
             if (y1 < cy) y1 = cy;
             int x2 = cx+cw-1;
             //  int x2 = mGridSpacingX * 5 - 1;
             //  if (x2 > cx+cw-1) x2 = cx + cw - 1;
             int y2 = mWorkingHoursYBottom;
             if (y2 > cy+ch-1) y2=cy+ch-1;
 
             if (x2 >= x1 && y2 >= y1) {
                 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX );
                 int gxStart = x1/mGridSpacingX;
                 int gxEnd = x2/mGridSpacingX;
                 while(gxStart <= gxEnd) {
                     if (gxStart < int(mHolidayMask->count()) &&
                         !mHolidayMask->at(gxStart)) {
                         int xStart = KOGlobals::self()->reverseLayout() ?
                             (mColumns - 1 - gxStart)*mGridSpacingX :
                             gxStart*mGridSpacingX;
                         if (xStart < x1) xStart = x1;
                         int xEnd = KOGlobals::self()->reverseLayout() ?
                             (mColumns - gxStart)*mGridSpacingX-1 :
                             (gxStart+1)*mGridSpacingX-1;
                         if (xEnd > x2) xEnd = x2;
                         if ( mSelectedDates[gxStart] == curDate && KOPrefs::instance()->mHighlightCurrentDay ) {
                             if ( KOPrefs::instance()->mUseHighlightLightColor )
                                 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                             KOPrefs::instance()->mWorkingHoursColor.light());
                             else
                                 p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                             KOPrefs::instance()->mWorkingHoursColor.dark());
                         } else {
                             p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                         KOPrefs::instance()->mWorkingHoursColor);
                         }
                     }
                     ++gxStart;
                 }
             }
         }
     /*
       int selectionX = KOGlobals::self()->reverseLayout() ?
       (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
       mSelectionCellX * mGridSpacingX;
 
       // Draw selection
       if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
       ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
       // TODO: paint only part within cx,cy,cw,ch
       p->fillRect( selectionX, mSelectionYTop, mGridSpacingX,
       mSelectionHeight, KOPrefs::instance()->mHighlightColor );
       }
     */
     // Draw vertical lines of grid
  
     int x = ((int)(cx/mGridSpacingX))*mGridSpacingX;
     if ( mGridSpacingX > 0 ) {
         while (x < cx + cw) {
             p->drawLine(x,cy,x,cy+ch);
             x+=mGridSpacingX;
         }
     }
     // Draw horizontal lines of grid
     int y = ((int)(cy/lGridSpacingY))*lGridSpacingY;
     if ( lGridSpacingY > 0 ) {
         while (y < cy + ch) {
             p->setPen( SolidLine );
             p->drawLine(cx,y,cx+cw,y);
             y+=lGridSpacingY;
             p->setPen( DotLine );
             p->drawLine(cx,y,cx+cw,y);
             y+=lGridSpacingY;
         } 
         p->setPen( SolidLine );
     }
     mPixPainter.end() ;
 }
 
 /*
   Convert srcollview contents coordinates to agenda grid coordinates.
 */
 void KOAgenda::contentsToGrid (int x, int y, int& gx, int& gy)
 {
   gx = KOGlobals::self()->reverseLayout() ? mColumns - 1 - x/mGridSpacingX :
                                                         x/mGridSpacingX;
   gy = y/mGridSpacingY;
 }
 
 /*
   Convert agenda grid coordinates to scrollview contents coordinates.
 */
 void KOAgenda::gridToContents (int gx, int gy, int& x, int& y)
 {
   x = KOGlobals::self()->reverseLayout() ? (mColumns - 1 - gx)*mGridSpacingX:
                                                          gx*mGridSpacingX;
   y = gy*mGridSpacingY;
 }
 
 
 /*
   Return Y coordinate corresponding to time. Coordinates are rounded to fit into
   the grid.
 */
 int KOAgenda::timeToY(const QTime &time)
 {
   int minutesPerCell = 24 * 60 / mRows;
   int timeMinutes = time.hour() * 60 + time.minute();
   int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell;
   return Y;
 }
 
 
 /*
   Return time corresponding to cell y coordinate. Coordinates are rounded to
   fit into the grid.
 */
 QTime KOAgenda::gyToTime(int gy)
 {
 
   int secondsPerCell = 24 * 60 * 60/ mRows;
 
   int timeSeconds = secondsPerCell * gy;
 
   QTime time( 0, 0, 0 );
   if ( timeSeconds < 24 * 60 * 60 ) {
     time = time.addSecs(timeSeconds);
   } else {
     time.setHMS( 23, 59, 59 );
   }
 
   return time;
 }
 
 void KOAgenda::setStartHour(int startHour)
 {
   int startCell = startHour * mRows / 24;
   setContentsPos(0,startCell * gridSpacingY());
 }
 QTime KOAgenda::getEndTime()
 {
     int tim = (contentsY ()+viewport()->height())*24/contentsHeight ();
     if ( tim > 23 )
         return QTime ( 23,59,59);
     return QTime ( tim,0,0);
 }
 void KOAgenda::hideUnused()
 {
     // experimental only
     // return;
     KOAgendaItem *item;
     for ( item=mUnusedItems.first(); item != 0; item=mUnusedItems.next() ) {
         item->hide();
     }
 }
 
 
 KOAgendaItem *KOAgenda::getNewItem(Incidence * event,QDate qd, QWidget* view)
 {
 
     KOAgendaItem *fi;
     for ( fi=mUnusedItems.first(); fi != 0; fi=mUnusedItems.next() ) {
         if ( fi->incidence() ==  event ) {
             mUnusedItems.remove();
             fi->init( event, qd );
             return fi;
         }
     }
     fi=mUnusedItems.first();
     if ( fi ) {
         mUnusedItems.remove();
         fi->init( event, qd );
         return fi;
     }
     // qDebug("new KOAgendaItem ");
 
     KOAgendaItem* agendaItem = new KOAgendaItem( event, qd, view, mAllDayMode );
     agendaItem->installEventFilter(this);
     addChild(agendaItem,0,0);
     return  agendaItem;
 }
 KOAgendaItem * KOAgenda::getItemForTodo ( Todo * todo )
 {
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( item->incidence() == todo ) {
             mItems.remove();
             return item;
         }
     }
     return 0;
 }
 
 
 void KOAgenda::updateTodo( Todo * todo, int days, bool remove) 
 { 
       // ( todo->hasCompletedDate() && todo->completed().date() == currentDate )||
     KOAgendaItem *item;
     item = getItemForTodo ( todo );
     //qDebug("KOAgenda::updateTodo %d %d %d %d", this, todo, days, remove);
     if ( item ) {
         blockSignals( true );
         //qDebug("item found ");
         item->hide();
         item->setCellX(-2, -1 );
         item->select(false);
         mUnusedItems.append( item );
         mItems.remove( item );
         QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
         KOAgendaItem *itemit; 
         //globalFlagBlockAgendaItemPaint = 1;
         for ( itemit=oldconflictItems.first(); itemit != 0;
               itemit=oldconflictItems.next() ) {
             if ( itemit != item )
                 placeSubCells(itemit); 
         }  
         qApp->processEvents();
         //globalFlagBlockAgendaItemPaint = 0;
         for ( itemit=oldconflictItems.first(); itemit != 0;
               itemit=oldconflictItems.next() ) {
             globalFlagBlockAgendaItemUpdate = 0;
             if ( itemit != item )
                 itemit->repaintMe();
             globalFlagBlockAgendaItemUpdate = 1; 
             //qDebug("sigleshot ");
             QTimer::singleShot( 0, itemit, SLOT ( repaintItem() ));
             //itemit->repaint( false ); repaintItem()
         }
         blockSignals( false );
     }
     if ( remove ) {
         //qDebug("remove****************************************** ");
         return;
     }
     if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
         return;
     //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
     QDate currentDate = QDate::currentDate();
     bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&&  ( KOPrefs::instance()->mShowTodoInAgenda );
     QDateTime dt;
     if ( todo->hasCompletedDate() )
         dt =  todo->completed();
     else
         dt = todo->dtDue();
     if ( overdue ) {
         days += todo->dtDue().date().daysTo( currentDate );
     }
     else
         currentDate = dt.date();
     
     if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) {  
         if ( ! mAllDayMode ) return;
         // aldayagenda
         globalFlagBlockAgendaItemPaint = 1;
         item = insertAllDayItem(todo, currentDate,days, days);
         item->show();
       
     }
     else {
         if (  mAllDayMode ) return;
         // mAgenda
         globalFlagBlockAgendaItemPaint = 1;
         int endY = timeToY(dt.time()) - 1; 
         int hi = 12/KOPrefs::instance()->mHourSize;
         int startY = endY - 1-hi;
         item = insertItem(todo,currentDate,days,startY,endY);
         item->show();
     }
     qApp->processEvents();
     globalFlagBlockAgendaItemPaint = 0; 
     QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
     KOAgendaItem *itemit; 
     for ( itemit=oldconflictItems.first(); itemit != 0;
           itemit=oldconflictItems.next() ) {
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 303a92a..49ad9b8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -1,850 +1,850 @@
 /*
     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 <qlabel.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qdragobject.h>
 #include <qdrawutil.h> 
 #include <qpainter.h> 
 
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #define AGENDA_ICON_SIZE 5
 #else
 #include <qapplication.h>
 #define AGENDA_ICON_SIZE 7
 #endif
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/kincidenceformatter.h>
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 
 #include "koprefs.h"
 
 #include "koagendaitem.h"
 //#include "koagendaitem.moc"
 
 
 //--------------------------------------------------------------------------
 
 QToolTipGroup *KOAgendaItem::mToolTipGroup = 0;
 
 //--------------------------------------------------------------------------
 
 class KOAgendaItemWhatsThis :public QWhatsThis
 {
 public:
   KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& )
   {
     return _view->getWhatsThisText() ;
   }
 private:
   KOAgendaItem * _view;
 };
 
 KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
                            const char *name,WFlags) :
     QWidget(parent, name), mIncidence(incidence), mDate(qd)
 {
 #ifndef DESKTOP_VERSION
     //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif
     mKOAgendaItemWhatsThis =  new KOAgendaItemWhatsThis(this);
     int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
     setWFlags ( wflags);
     mAllDay = allday;
     init ( incidence, qd );
     //setMouseTracking(true);
     //setAcceptDrops(true);
     xPaintCoord = -1;
     yPaintCoord = -1;
 }
 QString KOAgendaItem::getWhatsThisText()
 {
     if ( mIncidence )
         return KIncidenceFormatter::instance()->getFormattedText( mIncidence, 
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
     return "KOAgendaItem::getWhatsThisText()::internal error";
 }
 
 void KOAgendaItem::initColor ()
 {
     if ( (mIncidence->typeID() == todoID ) &&
          ( !((static_cast<Todo*>(mIncidence))->isCompleted()) &&
            ((static_cast<Todo*>(mIncidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
         if (  (static_cast<Todo*>(mIncidence))->dtDue() <  QDateTime::currentDateTime().date()) 
             mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
         else 
             mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
     }
     else {
         QStringList categories = mIncidence->categories();
         QString cat = categories.first();
         if (cat.isEmpty()) {
             if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) )
                 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
             else
                 mBackgroundColor =KOPrefs::instance()->defaultColor( mIncidence->calID() );
         } else {
             mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
             if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) ) {
                 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
                     mBackgroundColor = KOPrefs::instance()->mTodoDoneColor;
             }
         }
             
     }
 
     QColor BackgroundColor ( mBackgroundColor );
     if ( mIncidence->calID() > 1 ) {
         //BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
     }
     mColorGroup  = QColorGroup( BackgroundColor.light(), 
                                 BackgroundColor.dark(),BackgroundColor.light(),
                                 BackgroundColor.dark(),BackgroundColor, black, BackgroundColor) ;
     setBackgroundColor( mBackgroundColor );
     mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250);
 }
 void KOAgendaItem::init ( Incidence *incidence, QDate qd )
 {
     mIncidence = incidence;
     mDate = qd;
     mFirstMultiItem = 0;
     mNextMultiItem = 0;
     mLastMultiItem = 0;  
     computeText();
     initColor();
     mConflictItems.clear();
     setCellXY(0,0,1);
     setCellXWidth(0);
     setSubCell(0);
     setSubCells(1);
     setMultiItem(0,0,0);
     startMove();
     mSelected = true;
     select(false);
     QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont);
     mFontPixelSize = fontinf.height();;
     hide();
     xPaintCoord = -1;
     yPaintCoord = -1;
 }
 
 
 KOAgendaItem::~KOAgendaItem()
 {
 #if QT_VERSION >= 0x030000
 
 #else
     delete mKOAgendaItemWhatsThis;
 #endif 
   
 }
 
 void KOAgendaItem::recreateIncidence()
 {
 #if 0
     Incidence* newInc = mIncidence->clone();
     newInc->recreate();
     if ( mIncidence->doesRecur() ) {
         mIncidence->addExDate( mDate );
         newInc->recurrence()->unsetRecurs();
         int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd());
         QTime tim = mIncidence->dtStart().time();
         newInc->setDtStart( QDateTime(mDate, tim) );
         ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
     }
 #endif
     mIncidence = mIncidence->recreateCloneException( mDate );
 }
 bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
 {
     int size = AGENDA_ICON_SIZE;
 
     int yOff = 0;
     int xOff = 0;
     int x = pos().x();
 
     if ( x < 0 ) x = 0;
     x += 3; 
     int y;
     if ( mAllDay )
         y = pos().y()+3;
     else
         y =  mCellYTop * ( height() / cellHeight() ) +3;
 
 
     if ( mIncidence->calID() > 1 ) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, KOPrefs::instance()->defaultColor( mIncidence->calID() ) );
         p->drawRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x-1, yOff*( 1 +AGENDA_ICON_SIZE)+y-1, AGENDA_ICON_SIZE+2, AGENDA_ICON_SIZE+2 );
         if ( horLayout ){
             ++xOff;
             ++x;
         }
         else {
             ++yOff;
             ++y;
         }
     }
     if (mIncidence->cancelled() &&  height() < 20 ) {
         int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
         int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;
         p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1  );
         p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->isAlarmEnabled() && mIncidence->alarmEnabled()) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
-    if (mIncidence->recurrence()->doesRecur()) {
+    if (mIncidence->doesRecur()) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->description().length() > 0) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
    if (mIncidence->isReadOnly()) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
 
     if (mIncidence->attendeeCount()>0) {
         
         if (mIncidence->organizer() == KOPrefs::instance()->email()) {
             p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black );
             if ( horLayout )
                 ++xOff;
             else
                 ++yOff;
         } else {
             Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
             if (me!=0) {
 
 
             } else {
                 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow  );
                 if ( horLayout )
                     ++xOff;
                 else
                     ++yOff;
 
             }
             p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow );
             if ( horLayout )
                 ++xOff;
             else
                 ++yOff;
 
         }
 
     }
   return ( yOff || xOff );
 }
 
 
 void KOAgendaItem::select(bool selected)
 {
     //qDebug("select %d %d",firstMultiItem(), nextMultiItem() );
     if (mSelected == selected) return;
     mSelected = selected;
     if ( ! isVisible() )
         return;
     if ( firstMultiItem() )
         firstMultiItem()->select( selected );
     if ( !firstMultiItem() && nextMultiItem() ) {
         KOAgendaItem *  placeItem = nextMultiItem();
         while ( placeItem ) { 
             placeItem->select( selected );
             placeItem = placeItem->nextMultiItem();
         }  
     }
     globalFlagBlockAgendaItemUpdate = 0;
     paintMe( selected );
     globalFlagBlockAgendaItemUpdate = 1;
     repaint( false );
 }
 
 
 /*
   The eventFilter has to filter the mouse events of the agenda item childs. The
   events are fed into the event handling method of KOAgendaItem. This allows the
   KOAgenda to handle the KOAgendaItems by using an eventFilter.
 */
 bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e )
 {
     if (e->type() == QEvent::MouseButtonPress ||
         e->type() == QEvent::MouseButtonDblClick ||
         e->type() == QEvent::MouseButtonRelease ||
         e->type() == QEvent::MouseMove) {
         QMouseEvent *me = (QMouseEvent *)e;
         QPoint itemPos = this->mapFromGlobal(((QWidget *)object)->
                                              mapToGlobal(me->pos()));
         QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state());
         return event(&returnEvent);
     } else {
         return false;
     }
 }
 void KOAgendaItem::repaintMe( )
 { 
     paintMe ( mSelected );
 }
 void KOAgendaItem::paintMe( bool selected, QPainter* paint )
 {    
     if ( globalFlagBlockAgendaItemUpdate && ! selected)
       return;
     QPainter pa;
     
     if ( mSelected ) {
         pa.begin( this );
     } else {
         if ( mAllDay )
             pa.begin( paintPixAllday() );
         else
             pa.begin( paintPix() );
     }
     int x, yy, w,  h;
     float nfh = 7.0;
     x = pos().x(); w = width(); h = height ();
     if ( mAllDay )
         yy = y();
     else
         yy = mCellYTop * ( height() / cellHeight() ); 
     if ( mSelected ) {
         pa.translate( -x, -yy );
     } 
     xPaintCoord= x;
     yPaintCoord = yy;
     wPaintCoord = width();
     hPaintCoord = height();
     //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height());
     if ( paint == 0 )
         paint = &pa;
     bool horLayout = ( w < h );
     int maxhei = mFontPixelSize+4;
     if (  horLayout )
         maxhei +=  AGENDA_ICON_SIZE -4;
     bool small = ( h < maxhei  );
     if ( ! small ) 
         paint->setFont(KOPrefs::instance()->mAgendaViewFont);
     else {
         QFont f =  KOPrefs::instance()->mAgendaViewFont;
         f.setBold( false );
         int fh = f.pointSize();
         nfh = (((float)height())/(float)(mFontPixelSize+4))*fh;
         if ( nfh < 6 )
             nfh = 6;
         f.setPointSize( nfh );
         paint->setFont(f);
     }
     paint->fillRect ( x, yy,  w, h, mBackgroundColor );
     static const  QPixmap completedPxmp = SmallIcon("greenhook16");
     static const QPixmap overduePxmp = SmallIcon("redcross16");
     if ( mIncidence->typeID() == todoID ) {
         Todo* tempTodo = static_cast<Todo*>(mIncidence);
         int xx = pos().x()+(width()-completedPxmp.width()-3 );
         int yyy =  yy+3;
         if ( tempTodo->isCompleted() )
             paint->drawPixmap ( xx, yyy, completedPxmp );
         else {
             paint->drawPixmap ( xx, yyy, overduePxmp );
             
         }
     }
     bool addIcon = false;
     if ( ! small || w > 3 * h || h > 3* w )
        addIcon =  updateIcons(  paint, horLayout );
 
     //qDrawShadePanel (paint, x,  yy,  w,  h, mColorGroup, selected , 2, 0);
     qDrawWinPanel (paint, x,  yy,  w,  h, mColorGroup, selected ,0);
     //qDebug("draw rect %d %d %d %d ",x,  yy,  w,  h );
     if ( ! small ) {
         x += 3; yy += 3;w -= 6;  h-= 5;
     } else {
         x += 2; yy += 1;w -= 4;  h-= 4; 
         if ( nfh < 6.01 ) {
             yy -= 2;
             h += 4;
         }
         else
             if ( nfh < h -2 )
                 ++yy;
     }
     int align;
 #ifndef DESKTOP_VERSION
     align = ( AlignLeft|WordBreak|AlignTop);
 #else
     align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
 #endif
     if (  addIcon  ) {
         if ( ! horLayout ) {
             x += AGENDA_ICON_SIZE+3;
             w -= (AGENDA_ICON_SIZE+3);
         }
         else {
             yy+= AGENDA_ICON_SIZE+2;
             h -=(AGENDA_ICON_SIZE+3);
         }
     } 
     if ( mWhiteText )
         paint->setPen ( white); 
     if ( x < 0 ) {
         w = w+x-3;
         x = 3;
         if ( !horLayout && addIcon )
             x += AGENDA_ICON_SIZE+3;
         if ( w > parentWidget()->width() ){
             w = parentWidget()->width() - 6;
 #ifndef DESKTOP_VERSION
     align = ( AlignHCenter|WordBreak|AlignTop);
 #else
     align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop);
 #endif
 
         }
     }
     QRect dr;
     if ( w + x > parentWidget()->width() )
         w = parentWidget()->width()-x;
      paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr );
      //qDebug("%d %d %d %d ",   x, yy, w, h );
      if ( mIncidence->cancelled() ){
 
 
          small = ( height() < 20  );
         
          if ( ! small ) {
              QFontMetrics fm ( paint->font() );
              paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2);
          }
 
      }
     pa.end();
  
 }
 
 QPixmap * KOAgendaItem::paintPix()
 {
     static QPixmap* mPaintPix = 0;
     if ( ! mPaintPix ) {
         int w = QApplication::desktop()->width();
         int h = QApplication::desktop()->height();
         mPaintPix = new QPixmap(w,h);
     }
     return mPaintPix ; 
 }
 QPixmap * KOAgendaItem::paintPixAllday()
 {
     static QPixmap* mPaintPixA = 0;
     if ( ! mPaintPixA ) {
         int w = QApplication::desktop()->width();
         int h = QApplication::desktop()->height()/5;
         mPaintPixA = new QPixmap(w,h);
     }
     return mPaintPixA ; 
 }
 
 void KOAgendaItem::repaintItem()
 { 
     globalFlagBlockAgendaItemPaint = 0;
     globalFlagBlockAgenda = 0;
     repaint( false );
 }
 void KOAgendaItem::paintEvent ( QPaintEvent *e )
 {  
   
     if ( globalFlagBlockAgendaItemPaint )
         return; 
     if ( globalFlagBlockAgenda > 0 &&  globalFlagBlockAgenda < 5 )
       return;
     int yy;
     if ( mAllDay )
         yy = y();
     else
         yy = mCellYTop * ( height() / cellHeight() );
     int xx = x();
   
     if ( xPaintCoord != xx || yPaintCoord != yy || 
          wPaintCoord != width() ||  hPaintCoord != height()) {
         xPaintCoord= xx;
         yPaintCoord = yy;
         wPaintCoord = width();
         hPaintCoord = height();
         globalFlagBlockAgendaItemUpdate = 0;
         paintMe( mSelected );
         //qDebug("calling paintMe ");
         globalFlagBlockAgendaItemUpdate = 1;
         if ( mSelected )
             return;
     }
     int rx, ry, rw, rh;
     rx =  e->rect().x();
     ry =  e->rect().y();
     rw =  e->rect().width();
     rh =  e->rect().height();
     //qDebug("   paintevent %s %d %d    %d  %d", mIncidence->summary().latin1(), x(), yy, width(), height()); 
 
     QPixmap* paintFrom ;
     if ( mSelected ) {
         paintMe( mSelected );
         return;
     } else {
         if ( mAllDay )
             paintFrom =  paintPixAllday();
         else
             paintFrom =  paintPix();
     }
     xx += rx;
 
     if ( xx < 0 ) {
         rw = rw + xx;
         rx -= xx;
         xx = 0;
         if ( rw <= 1  ) {
             //qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1());
             return;
         }
     }
     if ( paintFrom->width() <   xx+rw ) {
         rw =  paintFrom->width() - xx;
         if ( rw <= 1 ) {
             //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
             return;
         }
     }
     //qDebug("%d %d %d %d %d  %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh);
     bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); 
 }
 void KOAgendaItem::computeText()
 {
     mDisplayedText =  mIncidence->summary();
     if ( (mIncidence->typeID() == todoID ) ) {
         if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
             if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() )
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")";
             else if ( !(mIncidence->doesFloat()))
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")";
         } 
     } else {
         if ( !(mIncidence->doesFloat()) &&  KOPrefs::instance()->mShowTimeInAgenda)
             mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
 
         if (  mAllDay ) {
             if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {  
                 if ( mIncidence->doesRecur() ) {
                     mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")";
                 } else {
                     mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
                 }
             }  
         }
     }
     
     if ( !mIncidence->location().isEmpty() ) {
         if ( mAllDay )
             mDisplayedText += " (";
         else
             mDisplayedText += "\n(";
         mDisplayedText += mIncidence->location() +")";
     }
 #ifdef DESKTOP_VERSION
     QString tipText = mIncidence->summary();
     if ( !mIncidence->doesFloat() ) {
         if ( mIncidence->typeID() == eventID ) {
             if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
                 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr();
                 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr();
             }
             else {
                 tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr();
                 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr();
             }
         }
         else if ( mIncidence->typeID() == todoID ) {
             if (mIncidence->hasStartDate())
                 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr();
             if (((Todo*)mIncidence)->hasDueDate())
                 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr();
         }
     } else if ( mIncidence->typeID() == todoID ) {
             if (mIncidence->hasStartDate())
                 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr();
             if (((Todo*)mIncidence)->hasDueDate())
                 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr();
         }
 
     if (!mIncidence->location().isEmpty()) {
         tipText += "\n"+i18n("Location: ")+mIncidence->location();
     }
     QToolTip::add(this,tipText,toolTipGroup(),""); 
 #endif
 }
 void KOAgendaItem::updateItem()
 {  
     computeText();
      
     //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y());
     paintMe( mSelected );
     repaint( false);
 }
   
 void KOAgendaItem::resizeEvent ( QResizeEvent *ev )
 {
     //qDebug("KOAgendaItem::resizeEvent %s ",  mIncidence->summary().latin1());
     paintMe( mSelected );
     repaint( false );
 } 
 
 /*
   Return height of item in units of agenda cells
 */
 int KOAgendaItem::cellHeight()
 {
     int ret = mCellYBottom - mCellYTop + 1;
     if ( ret <= 0 ) {
         ret = 1;
         mCellYBottom = 0;
         mCellYTop = 0;
     }
     return ret;
 }
 
 /*
   Return height of item in units of agenda cells
 */
 int KOAgendaItem::cellWidth()
 {
     return mCellXWidth - mCellX + 1;
 }
 
 void KOAgendaItem::setItemDate(QDate qd)
 {
   mDate = qd;
 }
 
 void KOAgendaItem::setCellXY(int X, int YTop, int YBottom)
 {
   mCellX = X;
   mCellYTop = YTop;
   mCellYBottom = YBottom;
 }
 
 void KOAgendaItem::setCellXWidth(int xwidth)
 {
   mCellXWidth = xwidth;
 }
 
 void KOAgendaItem::setCellX(int XLeft, int XRight)
 {
   mCellX = XLeft;
   mCellXWidth = XRight;
 }
 
 void KOAgendaItem::setCellY(int YTop, int YBottom)
 {
   mCellYTop = YTop;
   mCellYBottom = YBottom;
 }
 
 void KOAgendaItem::setSubCell(int subCell)
 {
   mSubCell = subCell;
 }
 
 void KOAgendaItem::setSubCells(int subCells)
 {
   mSubCells = subCells;
 }
 
 void KOAgendaItem::setMultiItem(KOAgendaItem *first,KOAgendaItem *next,
                                 KOAgendaItem *last)
 {
   mFirstMultiItem = first;
   mNextMultiItem = next;
   mLastMultiItem = last;
 }
 
 void KOAgendaItem::startMove()
 {
   mStartCellX = mCellX;
   mStartCellXWidth = mCellXWidth;
   mStartCellYTop = mCellYTop;
   mStartCellYBottom = mCellYBottom;
 }
 
 void KOAgendaItem::resetMove()
 {
   mCellX = mStartCellX;
   mCellXWidth = mStartCellXWidth;
   mCellYTop = mStartCellYTop;
   mCellYBottom = mStartCellYBottom;
 }
 
 void KOAgendaItem::moveRelative(int dx, int dy)
 {
   int newX = cellX() + dx;
   int newXWidth = cellXWidth() + dx;
   int newYTop = cellYTop() + dy;
   int newYBottom = cellYBottom() + dy;
   setCellXY(newX,newYTop,newYBottom);
   setCellXWidth(newXWidth);
 }
 
 void KOAgendaItem::expandTop(int dy)
 {
   int newYTop = cellYTop() + dy;
   int newYBottom = cellYBottom();
   if (newYTop > newYBottom) newYTop = newYBottom;
   setCellY(newYTop, newYBottom);
 }
 
 void KOAgendaItem::expandBottom(int dy)
 {
   int newYTop = cellYTop();
   int newYBottom = cellYBottom() + dy;
   if (newYBottom < newYTop) newYBottom = newYTop;
   setCellY(newYTop, newYBottom);
 }
 
 void KOAgendaItem::expandLeft(int dx)
 {
   int newX = cellX() + dx;
   int newXWidth = cellXWidth();
   if (newX > newXWidth) newX = newXWidth;
   setCellX(newX,newXWidth);
 }
 
 void KOAgendaItem::expandRight(int dx)
 {
   int newX = cellX();
   int newXWidth = cellXWidth() + dx;
   if (newXWidth < newX) newXWidth = newX;
   setCellX(newX,newXWidth);
 }
 
 QToolTipGroup *KOAgendaItem::toolTipGroup()
 {
   if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
   return mToolTipGroup;
 }
 
 void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e )
 {
 #ifndef KORG_NODND
   if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) ||
        !QTextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
   e->accept();
 #endif
 }
 
 void KOAgendaItem::dropEvent( QDropEvent *e )
 {
 #ifndef KORG_NODND
   QString text;
   if(QTextDrag::decode(e,text))
   {
     kdDebug() << "Dropped : " << text << endl;
     QStringList emails = QStringList::split(",",text);
     for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
       kdDebug() << " Email: " << (*it) << endl;
       int pos = (*it).find("<");
       QString name = (*it).left(pos);
       QString email = (*it).mid(pos);
       if (!email.isEmpty()) {
         mIncidence->addAttendee(new Attendee(name,email));
       }
     }
   }
 #endif
 }
 
 
 QPtrList<KOAgendaItem> KOAgendaItem::conflictItems()
 {
   return mConflictItems;
 }
 
 void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci)
 {
   mConflictItems = ci;
   KOAgendaItem *item;
   for ( item=mConflictItems.first(); item != 0;
         item=mConflictItems.next() ) {
     item->addConflictItem(this);
   }
 }
 
 void KOAgendaItem::addConflictItem(KOAgendaItem *ci)
 {
   if (mConflictItems.find(ci)<0)
     mConflictItems.append(ci);
 }
 
 bool KOAgendaItem::checkLayout()
 {
     if ( !mConflictItems.count() )
         return true;
     int max = 0;
     KOAgendaItem *item;
     for ( item=mConflictItems.first(); item != 0;
           item=mConflictItems.next() ) {
         if ( item->subCells() > max )
             max = item->subCells();
     }
     if ( max > subCells() ) {
         setSubCells( max );
         return false;
     }
     return true;
 }
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index a01323a..04f30bb 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -436,1255 +436,1255 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
 #ifndef DESKTOP_VERSION
     mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
 #endif
     mDayLabelsFrame = new QHBox(agendaFrame);
     //topLayout->addWidget(mDayLabelsFrame);
     mDayLabels = new QFrame (mDayLabelsFrame);
     mLayoutDayLabels = new QHBoxLayout(mDayLabels);
     agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2);
     agendaLayout->addWidget(mEventIndicatorTop,1,1);
 
     mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
                                                agendaFrame);
     agendaLayout->addWidget(mEventIndicatorBottom,3,1);
     QWidget *dummyAgendaRight = new QWidget(agendaFrame);
     agendaLayout->addWidget(dummyAgendaRight,1,2);
 
     // Create time labels
     mTimeLabels = new TimeLabels(24,agendaFrame);
     agendaLayout->addWidget(mTimeLabels,2,0);
     connect(mTimeLabels,SIGNAL( scaleChanged()),
             this,SLOT(updateConfig()));
 
     // Create agenda
     mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
     agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
     agendaLayout->setColStretch(1,1);
     mAgenda->setFocusPolicy(NoFocus);
     // Create event context menu for agenda
     mAllAgendaPopup = eventPopup();
   
 #if 0
     mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
                                     SLOT(popupAlarm()),true);
 
 #endif
     connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
   
     connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
 
     connect(mAllAgendaPopup,SIGNAL(categoryChanged(Incidence *)),
             this,SLOT(categoryChanged(Incidence *)));
 
 
     mAgenda->setPopup( mAllAgendaPopup );
     mAllDayAgenda->setPopup( mAllAgendaPopup );
     // 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)));
 
     connect(mAgenda,SIGNAL(showDateView( int, int)),SLOT(slotShowDateView( int, int )));
     connect(mAllDayAgenda,SIGNAL(showDateView( int, int )), SLOT(slotShowDateView( int, int ) ));
 
     // Create/Show/Edit/Delete Event
     connect(mAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEvent(int,int)));
     connect(mAgenda,SIGNAL(newTodoSignal(int,int)),
             SLOT(newTodo(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(newTodoSignal(int,int)),
             SLOT(newTodoAllDay(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 *) ) );
 
     connect( mAllDayAgenda, SIGNAL( signalClearSelection() ),mAgenda, SLOT( slotClearSelection()) ); 
     connect( mAgenda, SIGNAL( signalClearSelection() ),mAllDayAgenda, SLOT( slotClearSelection()) );   
 #ifndef DESKTOP_VERSION
     connect( mAllDayAgenda, SIGNAL( updateViewSignal() ),this, SLOT( fillAgenda()) ); 
     connect( mAgenda, SIGNAL( updateViewSignal() ), this, SLOT( fillAgenda()) );   
     connect( mAllDayAgenda, SIGNAL( sendPing() ),this, SLOT( startIdleTimeout()) ); 
     connect( mAgenda, SIGNAL( sendPing() ), this, SLOT( startIdleTimeout()) );   
     mIdleTimer = new QTimer ( this );;
     connect(mIdleTimer,SIGNAL(timeout()),SLOT(slotIdleTimeout()));
 #endif
 }
 void KOAgendaView::startIdleTimeout()
 {
 #ifndef DESKTOP_VERSION
     mIdleStart = QDateTime::currentDateTime();
     mIdleTimer->start( IDLETIMEOUT * 1000 );
 #endif
 }
 void KOAgendaView::slotIdleTimeout()
 {
 #ifndef DESKTOP_VERSION
     //qDebug("SECS TO %d ",mIdleStart.secsTo( QDateTime::currentDateTime()  ) );
     int secsfromstart = mIdleStart.secsTo( QDateTime::currentDateTime()  );
     mIdleTimer->stop();
     bool isActice = topLevelWidget()->isActiveWindow();
     //qDebug("KO: Active Window %d %d",  isActice, isVisible());
     // we do nothing if we wake up from a suspend
     if ( secsfromstart > IDLETIMEOUT + 30 && isActice ) {
         qDebug("KO: Wakeup from suspend ");
         startIdleTimeout();
         return;
     }
     qDebug("KO: Downsizing Pixmaps ");
     mAgenda->shrinkPixmap();
     mAllDayAgenda->shrinkPixmap();
     KOAgendaItem::paintPix()->resize( 20,20);
     KOAgendaItem::paintPixAllday()->resize( 20,20);
 #endif
     
 }
 void KOAgendaView::toggleAllDay()
 {
     if ( mSplitterAgenda->firstHandle() ) 
         mSplitterAgenda->firstHandle()->toggle();
 }
 void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
 {
     calendar()->addIncidence( inc ); 
     
     if ( incOld ) {
         if ( incOld->typeID() == todoID )
             emit  todoMoved((Todo*)incOld,  KOGlobals::EVENTEDITED );
         else
             emit incidenceChanged(incOld, KOGlobals::EVENTEDITED);
     }
     
 }
 void KOAgendaView::categoryChanged(Incidence * inc)
 {
     mAgenda->categoryChanged( inc );
     mAllDayAgenda->categoryChanged( inc );
 }
 KOAgendaView::~KOAgendaView()
 {
     delete mAllAgendaPopup;
     //delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
     delete KOAgendaItem::paintPixAllday();
 }
 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::slotDaylabelClicked( int num )
 {
   
     QDate firstDate = mSelectedDates.first();
     if ( num == -1 )
         emit showDateView( 6, firstDate );
     else if (num >= 0 ) {
         if ( mSelectedDates.count() == 1)
             emit showDateView( 9, firstDate.addDays( num ) );
         else
             emit showDateView( 3, firstDate.addDays( num ) );
     }
     else
         showDateView( 10, firstDate.addDays(1) );
 }
 
 KOAgendaButton* KOAgendaView::getNewDaylabel()
 {
 
     KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels);
     connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) );
     mDayLabelsList.append( dayLabel );
     mLayoutDayLabels->addWidget(dayLabel);
     return dayLabel ;
 }
 
 void KOAgendaView::createDayLabels()
 {
 
     if ( mBlockUpdating || globalFlagBlockLabel == 1) {
         // qDebug(" KOAgendaView::createDayLabels() blocked ");
         return;
 
     }
     int newHight;
     if ( !mSelectedDates.count())
         return;
 
     // ### 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() - mAgenda->frameWidth()*2;
     mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
     if ( maxWid < 20 )
         maxWid = 20;
 
     QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
     QFontMetrics fm ( dlf );
     dlf.setBold( true );
     int selCount = mSelectedDates.count();
     int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1;
     QString dayTest = "Mon 20";
     //QString dayTest = "Mon 20";
     int wid = fm.width( dayTest );
     //maxWid  -= ( selCount * 3 );  //working for QLabels
     if ( QApplication::desktop()->width() <= 320 )
         maxWid  -= ( selCount * 3 );  //working for QPushButton
     else
         maxWid  -= ( selCount * 4 );  //working for QPushButton
     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( "30" );
             needWid = wid * selCount;
             if ( needWid < maxWid )
                 break;
         }
         maxLen = 2;
     }
     //qDebug("Max len %d ", dayTest.length() );
     if ( !KOPrefs::instance()->mTimeLabelsFont.bold() )
         dlf.setBold( false );
     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;
     KOAgendaButton *dayLabel;
     dayLabel = mDayLabelsList.first();
     if ( !dayLabel  ) {
         appendLabels = true;
         dayLabel = getNewDaylabel();
     }
     dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() ); 
     dayLabel->setFont( dlf );
     dayLabel->setNum( -1 );
     //dayLabel->setAlignment(QLabel::AlignHCenter);
 
     dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
     dayLabel->show();
     DateList::ConstIterator dit;
     bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
     int counter = -1;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         ++counter;
         QDate date = *dit;
         // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
         if (  ! appendLabels ) {
             dayLabel = mDayLabelsList.next();
             if (  !dayLabel  )
                 appendLabels = true;
         }
         if ( appendLabels ) {
             dayLabel = getNewDaylabel();
         }
         dayLabel->setMinimumWidth( 1 );
         dayLabel->setMaximumWidth( 10240 );
         dayLabel->setFont( dlf );
         dayLabel->show();
         dayLabel->setAutoRepeat( false );
         dayLabel->setNum( counter );
         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;
         }
         if ( oneday ) {
             QString addString;
             if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
                 addString = i18n("Today");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
                 addString = i18n("Tomorrow");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
                 addString = i18n("Yesterday");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
                 addString = i18n("Day before yesterday");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
                 addString = i18n("Day after tomorrow");
             if ( !addString.isEmpty() ) {
                 if (  QApplication::desktop()->width() < 640 )
                     str = addString+", " + str;
                 else
                     str = addString+", "+ KGlobal::locale()->formatDate( date, false);
             } else {
                 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer);
             }
         }
         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 = getNewDaylabel();
     }
     //dayLabel->hide();//test only
    
     dayLabel->setText(">");
     dayLabel->setFont( dlf );
     dayLabel->setAutoRepeat( true );
     dayLabel->show();
     dayLabel->setNum( -2 );
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ widModulo  );
 
     //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
     if ( !appendLabels ) {
         dayLabel = mDayLabelsList.next();
         while (  dayLabel  ) {
             //qDebug("!dayLabel %d",dayLabel );
             dayLabel->hide();
             dayLabel = mDayLabelsList.next();
         }
     }
    
     mDayLabelsFrame->setFixedHeight( newHight + 4 );
 }
 
 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;
     if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) {
         int old = KOPrefs::instance()->mHourSize;
         KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1;
         //qDebug("KOPrefs::instance()->mHourSize adjusted %d to  %d ", old,KOPrefs::instance()->mHourSize );
     }
 
 
     // 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)
 {
  
 
     int xxx = item->cellX();
     //qDebug("KOAgendaView::updateEventDates %d %d %d %d %d", xxx, mMinY.at(xxx),mMaxY.at(xxx),item->cellYTop(),item->cellYBottom() );
     if ( mMinY.at(xxx) > item->cellYTop() )
         mMinY.at(xxx) = item->cellYTop();
     if ( mMaxY.at(xxx) < item->cellYBottom() )
         mMaxY.at(xxx) = item->cellYBottom();
     
     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()->typeID() == eventID ) {
         startDt =item->incidence()->dtStart();
         endDt = item->incidence()->dtEnd();
         lenInSecs = startDt.secsTo( endDt );
     }
 
     // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
 
     if ( item->incidence()->typeID()== todoID && 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()->typeID() == eventID ) {
             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()->typeID() == eventID ) {
         item->incidence()->setDtStart(startDt);
         (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
     } else if ( item->incidence()->typeID() == todoID ) {
         Todo* to = static_cast<Todo*>(item->incidence());
 
         to->setDtDue(endDt);
         if ( to->hasStartDate() ) {
             if (to->dtStart() >= to->dtDue() )
                 to->setDtStart(to->dtDue().addDays( -2 ));
         }
         
     }
     //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()->typeID() == todoID ) {
          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;
     static bool onlyOne = false;
     if ( onlyOne )
         return;
     onlyOne = true;
     //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();
 
     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, gtodoset all of them.
     QPtrList<Todo> todos  = calendar()->todos();
 
     mAgenda->setDateList(mSelectedDates);
 
     QDate today = QDate::currentDate();
 
     DateList::ConstIterator dit;
     int curCol = 0;
     int maxCol = mSelectedDates.count()-1;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         QDate currentDate = *dit;
         //    kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
         //              << endl;
 
         dayEvents = calendar()->events(currentDate,false);
 
         // 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;
         //qDebug("+++++NUMEVENT %d", dayEvents.count());
         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()) {
+                if (event->doesRecur()) {
                     if (event->isMultiDay() ) {
                         endX = endX - beginX;// endX is now number of days
                         if ( event->recursOn( currentDate ) ) {
                             endX +=  curCol;
                             beginX = curCol;
                             mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                         } else {
                             //qDebug("days endX %d curCol %d max Col %d %s",endX ,curCol, maxCol, currentDate.toString().latin1());
                             if ( curCol == maxCol && maxCol+1 < endX ) {
                                 int i;
                                 for ( i = 1; i< endX; ++i ) {
                                     if ( event->recursOn( currentDate.addDays( -i ) ) )
                                         break;
                                 }
                                 if ( i > maxCol ) {
                                     mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
                                     //qDebug("BINGO ");
                                 }
 
                             } else {
                                 QDate dateit = currentDate.addDays( -endX );
                                 if ( event->recursOn( dateit ) ) {
                                     //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1()  );
                                     if ( curCol-endX < 0 ) {
                                         mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
                                     }
                                 }
                             }
                         }
                     } else {
                         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() && !todo->hasCompletedDate()) continue;  // todo shall not be displayed if it has no date
             if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) continue;
             // 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;
             bool fillIn = false;
             if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
                 fillIn = true;
             if ( ! fillIn && !todo->hasCompletedDate() ) 
                 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
             if ( fillIn ) {
                 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) {  // Todo has no due-time set or is already overdue
                     if ( KOPrefs::instance()->mShowTodoInAgenda )
                         mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
                 }
                 else {
                     QDateTime dt;
                     if ( todo->hasCompletedDate() )
                         dt = todo->completed();
                     else
                         dt = todo->dtDue();;
                         
 
                     int endY = mAgenda->timeToY(dt.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(); 
     globalFlagBlockAgenda = 0; 
     mAllDayAgenda->drawContentsToPainter();
     mAgenda->drawContentsToPainter();
     repaintAgenda();
     startIdleTimeout();
     onlyOne = false;
 }
 void KOAgendaView::repaintAgenda()
 {
     mAgenda->viewport()->repaint( false );
     mAllDayAgenda->viewport()->repaint( false );
     mAgenda->finishUpdate();
     mAllDayAgenda->finishUpdate();
 }
 
 
 void KOAgendaView::clearView()
 {
     mAllDayAgenda->clear();
     mAgenda->clear();
 }
 void KOAgendaView::clearList()
 {
     clearView();
     mAllDayAgenda->hideUnused();
     mAgenda->hideUnused();
 }
 
 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::slotShowDateView( int mode , int d )
 {
     if ( d >= mSelectedDates.count() ) {
         qDebug("KOAgendaView::slotShowDateView datecounterror %d %d ", d, mSelectedDates.count() );
 
     } else {
         QDate day = mSelectedDates[d];
         emit showDateView(mode , day );
     }
 
 }
 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::newTodoAllDay(int gx, int )
 {
     if (!mSelectedDates.count()) return;
 
     QDateTime day (mSelectedDates[gx] );
     emit newTodoSignal(day, true);
 }
 void KOAgendaView::newTodo(int gx, int gy )
 {
     if (!mSelectedDates.count()) return;
     QDate dayStart = mSelectedDates[gx];
     QTime timeStart = mAgenda->gyToTime(gy);
     QDateTime dt (dayStart,timeStart);
     emit newTodoSignal( dt, false );
 }
 
 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->isHoliday()) {
                     showHoliday = true;
                     break;
                 }
             }
 
         }
 
 #ifndef KORG_NOPLUGINS
         bool showHoliday = KOPrefs::instance()->mExcludeHolidays &&
             !KOCore::self()->holiday(date).isEmpty();
 #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::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::setInitStartHour()
 {
  
     if ( KOPrefs::instance()->mCenterOnCurrentTime )
         setStartHour( QTime::currentTime ().hour() );
     else
         setStartHour( KOPrefs::instance()->mDayBegins  );
     
 }
  
 
 void  KOAgendaView::updateTodo( Todo * t, int )
 { 
     if ( !isVisible() )
         return;
     bool remove = false;
     bool removeAD = false;
     QDate da;
     if ( t->hasCompletedDate() )
         da = t->completed().date();
     else 
         da = t->dtDue().date();
     if ( ! t->hasDueDate() && !t->hasCompletedDate() ) {
         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 ( da < mSelectedDates.first() ||
                  da > mSelectedDates.last() ) {
                 remove = true;
                 removeAD = true;
             } else {
                 remove = t->doesFloat() && !t->hasCompletedDate();
                 removeAD = !remove;
             }
         }
     }
     int days = mSelectedDates.first().daysTo( da  );
     //qDebug("daysto %d  %d %d", days, remove,removeAD );
     mAgenda->updateTodo( t , days, remove); 
     if ( KOPrefs::instance()->mShowTodoInAgenda )
         mAllDayAgenda->updateTodo( t , days, removeAD);
     //qDebug("KOAgendaView::updateTodo( Todo *, int ) ");
 
 }
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ec1154a..057df0d 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -1,1217 +1,1217 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at>
     Parts of the source code have been copied from kdpdatebutton.cpp
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source ode for Qt in the source distribution.
 */
 
 #include <qevent.h>
 #include <qpainter.h>
 #include <qptrlist.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "kodaymatrix.h"
 
 // ============================================================================
 //  D Y N A M I C   T I P
 // ============================================================================
 
 DynamicTip::DynamicTip( QWidget * parent )
     : QToolTip( parent )
 {
     matrix = (KODayMatrix*)parent;
 }
 
 class KODaymatrixWhatsThis :public QWhatsThis
 {
 public:
     KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
     ~KODaymatrixWhatsThis() { ;  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
     return _view->getWhatsThisText( p ) ;
   }
 private:
   KODayMatrix * _view;
 };
 
 void DynamicTip::maybeTip( const QPoint &pos )
 {
   //calculate which cell of the matrix the mouse is in
   QRect sz = matrix->frameRect();
   int dheight = sz.height()*7 / 42;
   int dwidth = sz.width() / 7;
   int row = pos.y()/dheight;
   int col = pos.x()/dwidth;
 
   QRect rct(col*dwidth, row*dheight, dwidth, dheight);
 
 //  kdDebug() << "DynamicTip::maybeTip matrix cell index [" <<
 //                col << "][" << row << "] => " <<(col+row*7) << endl;
 
   //show holiday names only
   QString str = matrix->getHolidayLabel(col+row*7);
   if (str.isEmpty()) return;
   tip(rct, str);
 }
 
 
 // ============================================================================
 //  K O D A Y M A T R I X
 // ============================================================================
 
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
     : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
 
 
 { 
     mLastView = -1;
     oldW = 0;
     oldH = 0;
     myPix.resize( 150, 120 );
     mRedrawNeeded = true;
   mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
   bDays.resize ( NUMDAYS );
   pDays.resize ( NUMDAYS );
   hDays.resize ( NUMDAYS );
   eDays.resize ( NUMDAYS );
   days = new QDate[NUMDAYS];
   daylbls = new QString[NUMDAYS];
   //events = new int[NUMDAYS];
   mToolTip = new DynamicTip(this);
 
   // set default values used for drawing the matrix
   mDefaultBackColor = palette().active().base();
   mDefaultTextColor = palette().active().foreground();
   mDefaultTextColorShaded = getShadedColor(mDefaultTextColor);
   mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor);
   mSelectedDaysColor = QColor("white");
   mTodayMarginWidth = 2;
   mSelEnd = mSelStart = NOSELECTION;
 
   setAcceptDrops(true);
   //setFont( QFont("Arial", 10) );
 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() ));
   mRepaintTimer = new QTimer( this );
   connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() ));
   mDayChanged = false;
   updateView();
 }
 QString KODayMatrix::getWhatsThisText( QPoint p )
 {
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
     QPtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( deTag( mToolTipText ) );
     }
     mToolTip.sort();
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         QPtrList<Todo> todolist = mCalendar->todos(mDate);
         Todo  *todo;
         for(todo=todolist.first();todo != 0;todo=todolist.next()) { 
             QString mToolTipText;
             if ( !todo->doesFloat() )
                 mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" ";
             mToolTipText +=  todo->summary();
             if ( !todo->location().isEmpty() )
                 mToolTipText += " (" + todo->location() + ")";
             mToolTipText = deTag( mToolTipText);
             mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );
         }               
     }
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
         QPtrList<Journal> j_list = mCalendar->journals4Date( mDate );
         Journal *j = j_list.first();
         while ( j ) {
             QString mToolTipText;
             if ( !j->summary().isEmpty() ) {
                 mToolTipText = j->summary().left(30);
                 if ( j->summary().length() > 30 )
                     mToolTipText += " ...";
             } else {
                 mToolTipText = j->description().left(25);
                 if ( j->description().length() > 25 )
                     mToolTipText += " ...";
                 mToolTipText = deTag( mToolTipText);
             }
             mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );
             j = j_list.next();
         }
     }
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 
 
 QString KODayMatrix::deTag( QString mToolTipText  )
 {
 
 #if QT_VERSION >= 0x030000
     mToolTipText.replace( '<' , "&lt;" );
     mToolTipText.replace( '>' , "&gt;" );
 #else
     if ( mToolTipText.find ('<') >= 0 ) {
         mToolTipText.replace( QRegExp("<") , "&lt;" );
     }
     if ( mToolTipText.find ('>') >= 0 ) {
         mToolTipText.replace( QRegExp(">") , "&gt;" );
     }
 #endif
     return mToolTipText;
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
 
   setAcceptDrops( mCalendar );
 
   updateEvents();
 }
 
 QColor KODayMatrix::getShadedColor(QColor color)
 {
   QColor shaded;
   int h=0;
   int s=0;
   int v=0;
   color.hsv(&h,&s,&v);
   s = s/4;
   v = 192+v/4;
   shaded.setHsv(h,s,v);
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
 #if QT_VERSION >= 0x030000
 
 #else
    delete mKODaymatrixWhatsThis;
 #endif 
 
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   //delete [] events;
   delete mToolTip;
 }
 
 /*
 void KODayMatrix::setStartDate(QDate start)
 {
   updateView(start);
 }
 */
 
 void KODayMatrix::addSelectedDaysTo(DateList& selDays)
 {
  
   if (mSelStart == NOSELECTION) {
     return;
   }
 
   //cope with selection being out of matrix limits at top (< 0)
   int i0 = mSelStart;
   if (i0 < 0) {
     for (int i = i0; i < 0; i++) {
       selDays.append(days[0].addDays(i));
     }
     i0 = 0;
   }
 
   //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
   if (mSelEnd > NUMDAYS-1) {
     for (int i = i0; i <= NUMDAYS-1; i++) {
       selDays.append(days[i]);
     }
     for (int i = NUMDAYS; i < mSelEnd; i++) {
       selDays.append(days[0].addDays(i));
     }
 
   // apply normal routine to selection being entirely within matrix limits
   } else {
     for (int i = i0; i <= mSelEnd; i++) {
       selDays.append(days[i]);
     }
   }
 }
 
 bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 {  
     mRedrawNeeded = true;
     bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
   mSelStart = startdate.daysTo(start);
   if ( mSelStart < 0 )
       mSelStart = 0;
   mSelEnd = startdate.daysTo(end);
   if ( mSelEnd  > NUMDAYS-1 )
       mSelEnd = NUMDAYS-1;
   if ( mSelEnd < 0 || mSelStart >  NUMDAYS-1 ) {
       clearSelection();
       if ( noSel )
           return false;
   }
  
   return true;
 }
 void KODayMatrix::clearSelection()
 {
     mSelEnd = mSelStart = NOSELECTION;
 }
 
 
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         //events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 { 
     mRedrawNeeded = true;
     // bDays.fill( false);
     //pDays.fill( false);
     //hDays.fill( false);
     //eDays.fill( false);
     mRepaintTimer->stop(); 
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     int i;
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
     repaint(false);
 }
 void KODayMatrix::computeEvent(Event *event, int i )
 {
     QString holiStr = mHolidays[i];
     if ( event->isHoliday()) {
         pDays.setBit(i);
         hDays.setBit(i);
         if ( !holiStr.isEmpty() )
             holiStr += "\n";
         holiStr += event->summary();
         if ( !event->location().isEmpty() )
             holiStr += " (" + event->location() + ")";
         mHolidays[i] =holiStr ;
         eDays.setBit(i);
     }
     if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) {
         if ( event->isBirthday()) {
             pDays.setBit(i);
             if ( !holiStr.isEmpty() )
                 holiStr += "\n";
             holiStr += i18n("Birthday") + ": "+event->summary();
             if ( !event->location().isEmpty() )
                 holiStr += " (" + event->location() + ")";
             bDays.setBit(i);
             mHolidays[i] =holiStr ;
         }
     }
     if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW )
         eDays.setBit(i);
 }
 void KODayMatrix::updateViewTimed()
 {
     mUpdateTimer->stop(); 
     if ( !mCalendar ) {
         qDebug("NOT CAL ");
         return;
     }
 #if 1
 
    
  int i;
     int timeSpan = NUMDAYS-1;
     QPtrList<Event> events = mCalendar->events();
     Event *event;
     QDateTime dt;
     bool ok;
     bDays.fill( false);
     pDays.fill( false);
     hDays.fill( false);
     eDays.fill( false);
     mHolidays.clear();
     QDate mStartDate = days[0];
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
-        ushort recurType = event->recurrence()->doesRecur();
+        ushort recurType = event->doesRecur();
         if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
             (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
             continue;
         }
         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) {
                                     computeEvent( event, iii );
                                 }
                             }
                         }
                     } 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)
                         computeEvent( event, iii );
                 }
             }
         }
     }
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW  ) {
         bDays.fill( false);
         // insert due todos
         QPtrList<Todo> todos = mCalendar->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)  {
                     int i = day;
                     QString holiStr = mHolidays[i];
                     pDays.setBit(i);
                     if ( !holiStr.isEmpty() )
                         holiStr += "\n";
                     holiStr += i18n("Todo") + ": "+todo->summary();
                     if ( !todo->location().isEmpty() )
                         holiStr += " (" + todo->location() + ")";
                     bDays.setBit(i);
                     mHolidays[i] =holiStr ;
                     eDays.setBit(i);
                 }
             }
         }
     } 
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW  ) {
         bDays.fill( false);
         // insert due todos
         QPtrList<Journal> todos = mCalendar->journals( );
         Journal *todo;
         for(todo = todos.first(); todo; todo = todos.next()) {
             int day = mStartDate.daysTo( todo->dtStart().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 int i = day;
                 QString holiStr = mHolidays[i];
                 pDays.setBit(i);
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += i18n("Journal: ")+todo->summary().left(25);
                 if ( todo->summary().length() > 25 )
                     holiStr +="...";
                 bDays.setBit(i);
                 mHolidays[i] =holiStr ;
                 eDays.setBit(i);
                 
             }
         }
     }
 #else
     //qDebug("KODayMatrix::updateViewTimed ");
     for(int i = 0; i < NUMDAYS; i++) {
         // if events are set for the day then remember to draw it bold
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
         QString holiStr = "";
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
             ushort recurType = event->recurrence()->doesRecur();
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
             if ( event->isHoliday()) {
                 hDays.setBit(i);
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
             }
             if ( event->isBirthday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += i18n("Birthday") + ": "+event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
                 bDays.setBit(i);
             }
         }
         if ( numEvents ) 
             eDays.setBit(i);
         //if it is a holy day then draw it red. Sundays are consider holidays, too
         if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) ||
              !holiStr.isEmpty()) {
             mHolidays[i] = holiStr;
         } else {
             mHolidays[i] = QString::null;
         }
     }
 #endif
     mRedrawNeeded = true;
     if ( ! mPendingUpdateBeforeRepaint )
         repaint(false);
 }
 void KODayMatrix::updateView(QDate actdate)
 {
     if ( mLastView != KOPrefs::instance()->mCurrentDisplayedView )
         mRedrawNeeded = true;
     mLastView = KOPrefs::instance()->mCurrentDisplayedView;
     if ( ! actdate.isValid() ) {
         //qDebug("date not valid ");
         return;
     }
     mDayChanged = false;
     //flag to indicate if the starting day of the matrix has changed by this call
     //mDayChanged = false;
     // if a new startdate is to be set then apply Cornelius's calculation
     // of the first day to be shown
     if (actdate != startdate) {
         // reset index of selection according to shift of starting date from startdate to actdate
         if (mSelStart != NOSELECTION) {
             int tmp = actdate.daysTo(startdate);
             //kdDebug() <<  "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl;
             // shift selection if new one would be visible at least partly !
 
             if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) {
                 // nested if is required for next X display pushed from a different month - correction required
                 // otherwise, for month forward and backward, it must be avoided
                 if( mSelStart > NUMDAYS || mSelStart < 0 )
                     mSelStart = mSelStart + tmp;
                 if( mSelEnd > NUMDAYS || mSelEnd < 0 )
                     mSelEnd = mSelEnd + tmp;
             }	
         }
         startdate = actdate;
         mDayChanged = true;
         recalculateToday();
         mRedrawNeeded = true;
     }
     //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
     } else {
 #ifdef DESKTOP_VERSION
         //mRepaintTimer->start( 100 );
         //updateViewTimed();
      mUpdateTimer->start( 50 );
 #else
         mRepaintTimer->start( 350 ); 
         mUpdateTimer->start( 800 );
 #endif
     }
 }
 void KODayMatrix::updateEvents()
 {
   if ( !mCalendar ) return;
 
   for( int i = 0; i < NUMDAYS; i++ ) {
     // if events are set for the day then remember to draw it bold
     QPtrList<Event>  eventlist = mCalendar->events( days[ i ] );
     int numEvents = eventlist.count();
     Event *event;
     for( event = eventlist.first(); event != 0;event=eventlist.next()) {
       ushort recurType = event->doesRecur();
 
       if ( ( recurType == Recurrence::rDaily &&
              !KOPrefs::instance()->mDailyRecur ) ||
            ( recurType == Recurrence::rWeekly &&
              !KOPrefs::instance()->mWeeklyRecur ) ) {
         numEvents--;
       }
     } 
     if ( numEvents ) 
         eDays.setBit(i);
     else
         eDays.clearBit(i);
   }
 }
 
 const QDate& KODayMatrix::getDate(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset2 %d", offset);
     return days[0];
   }
   return days[offset];
 }
 
 QString KODayMatrix::getHolidayLabel(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset1 %d", offset);
       return QString();
   }
   return mHolidays[offset];
 }
 
 int KODayMatrix::getDayIndexFrom(int x, int y)
 { 
   int colModulo = (width()-2)  % 7;
   int rowModulo = (height()-2)  % 6;
 #if 0
   return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ? 
             6 - x/daysize.width() : x/daysize.width());
 #endif
   int xVal = (x-colModulo/2-2)/daysize.width();
   int yVal = (y-rowModulo/2-2)/daysize.height();
   
   
   return 7*(yVal) + xVal;
 
 }
 
 // ----------------------------------------------------------------------------
 //  M O U S E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::mousePressEvent (QMouseEvent* e)
 {
   
     if ( e->button() == LeftButton )
         mouseDown = true; 
   mSelStart = getDayIndexFrom(e->x(), e->y());
   if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
   mSelInit = mSelStart;
   mSelEnd = mSelStart; 
   mRedrawNeeded = true;
   repaint(false);
 }
 
 void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
 {
   mRedrawNeeded = true;
   if ( e->button() == LeftButton )
       if ( ! mouseDown ) {
           return;
       }
       else
           mouseDown = false; 
   int tmp = getDayIndexFrom(e->x(), e->y());
   if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
 
   if (mSelInit > tmp) {
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
       repaint(false);
     }
   } else {
     mSelStart = mSelInit;
 
     //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
       repaint(false);
     }
   }
 
   DateList daylist;
     if ( mSelStart < 0 )
         mSelStart = 0;
   for (int i = mSelStart; i <= mSelEnd; i++) {
     daylist.append(days[i]);
   }
   emit selected((const DateList)daylist);
 
 }
 
 void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
 { 
     if ( ! mouseDown ) {
         return;
     }
   mRedrawNeeded = true;
   int tmp = getDayIndexFrom(e->x(), e->y());
   if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
 
   if (mSelInit > tmp) {
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
       repaint(false);
     }
   } else {
     mSelStart = mSelInit;
 
     //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
       repaint(false);
     }
   }
 }
 
 // ----------------------------------------------------------------------------
 //  D R A G ' N   D R O P   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   // some visual feedback
 //  oldPalette = palette();
 //  setPalette(my_HilitePalette);
 //  update();
 #endif
 }
 
 void KODayMatrix::dragMoveEvent(QDragMoveEvent *e)
 {
 #ifndef KORG_NODND
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   e->accept();
 #endif
 }
 
 void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/)
 {
 #ifndef KORG_NODND
 //  setPalette(oldPalette);
 //  update();
 #endif
 }
 
 void KODayMatrix::dropEvent(QDropEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl;
 
   if (!mCalendar || !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   DndFactory factory( mCalendar );
   Event *event = factory.createDrop(e);
 
   if (event) {
     e->acceptAction();
 
     Event *existingEvent = mCalendar->event(event->uid());
 
     if(existingEvent) {
       // uniquify event
       event->recreate();
 /*
       KMessageBox::sorry(this,
               i18n("Event already exists in this calendar."),
               i18n("Drop Event"));
       delete event;
       return;
 */
     }
 //      kdDebug() << "Drop new Event" << endl;
     // Adjust date
     QDateTime start = event->dtStart();
     QDateTime end = event->dtEnd();
     int duration = start.daysTo(end);
     int idx = getDayIndexFrom(e->pos().x(), e->pos().y());
 
     start.setDate(days[idx]);
     end.setDate(days[idx].addDays(duration));
 
     event->setDtStart(start);
     event->setDtEnd(end);
     mCalendar->addEvent(event);
 
     emit eventDropped(event);
   } else {
 //    kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl;
     e->ignore();
   }
 #endif
 }
 
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
   
     if ( width() <= 0  || height() <= 0 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
 #if 0
     if ( myPix.width() != width() || myPix.height()!=height() ) {
         myPix.resize(size() );
         mRedrawNeeded = true;
     }
 #endif 
     if ( oldW != width() || oldH !=height() )
         mRedrawNeeded = true;
     
     oldH = height() ;
     oldW = width();
     if ( myPix.width() < width() || myPix.height() < height() ) {
         myPix.resize(size() );
         mRedrawNeeded = true;
         
     }
     
     if ( mRedrawNeeded ) {
         //qDebug("REDRAW ");
         QPainter p(&myPix);
         p.setFont(font());
 
 
         int dheight = daysize.height();
         int dwidth = daysize.width();
         int row,col;
         int selw, selh;
         int xyOff = frameWidth();
         int colModulo = (width()-2)  % 7;
         int rowModulo = (height()-2)  % 6;
         //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
         bool isRTL = KOGlobals::self()->reverseLayout();
 
         // draw background and topleft frame
         p.fillRect(0,0,width(),height(), mDefaultBackColor);
         //p.setPen(mDefaultTextColor);
         //p.drawRect(0, 0, width(), height());
         int mSelStartT = mSelStart;
         int mSelEndT = mSelEnd;
         if ( mSelEndT >=  NUMDAYS )
             mSelEndT = NUMDAYS-1;
         // draw selected days with highlighted background color
         if (mSelStart != NOSELECTION) {
             bool skip = false;
             if ( ! mouseDown ) {
                 int mo = days[20].month();
                 //qDebug("--  %d %d ", mSelStartT, mSelEndT);
                 //qDebug("%d %d %d - d %d", mo,  days[mSelStartT].month() , days[mSelEndT].month(),  days[mSelEndT].day() );
                 int startMo = days[mSelStartT].month();
                 int endMo = days[mSelEndT].month();
                 if ( startMo == 12 && mo == 1 && endMo <= 2 )
                     startMo = 1;
                 if ( endMo == 1 && mo == 12 )
                     endMo = 12;
                 if ( mo == 12 && startMo == 1 )
                     startMo = 13;
                 if ( (startMo > mo || endMo < mo) ) {
                     skip = true;
                 } else {
                     if ( days[mSelStartT].month() != mo ) {
                         int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day();
                         mSelStartT += add +1;
                     }
                     if ( days[mSelEndT].month() != mo ) {
                         int sub = days[mSelEndT].day();
                         mSelEndT -= sub ;
                     }
                 }
             }
             //qDebug("SKIP %d ", skip);
             if ( ! skip ) {
                 row = mSelStartT/7;
                 col = mSelStartT -row*7;
                 QColor selcol = KOPrefs::instance()->mHighlightColor;
                 int addCol = 0;
                 int addRow = 0; 
                 int addRow2 = 0; 
                 int addCol2 = 0;
                 if (row == mSelEndT/7) { 
                     if ( rowModulo ) {
                         if ( row >= 6 - rowModulo )
                             addRow = row - 5 + rowModulo;
                     }  
                     if ( colModulo ) {
                         int colt1 = mSelEndT%7;
                         //qDebug("colt1 %d ", colt1 );
                         if ( colt1 >= 7 - colModulo )
                             addCol =  colt1 - 7 + colModulo+1; 
                         int colt = mSelStartT%7;
                         if ( colt >= 7 - colModulo )
                             addCol2 =  colt - 7 + colModulo;
                         addCol -= addCol2;
                         //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
                     }
                     // Single row selection
                     //if ( row == 0)
                     //  addRow = 1;
                     p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
                                row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
                 } else {
                     // draw first row to the right
                     if ( colModulo ) {
                         if ( col >= 7 - colModulo )
                             addCol2 =  col - 7 + colModulo;
                     }
                     if ( rowModulo ) {
                         if ( row >= 6 - rowModulo )
                             addRow = row - 5 + rowModulo;
                     }  
                     //if ( row == 0)
                     //  addRow = 1; 
                     int drawWid = width()-(col*dwidth+1+addCol2)-1;
                     p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid,
                                dheight+1, selcol);
                     // draw full block till last line
                     selh = mSelEndT/7-row; 
                     addRow = 0;
                     if ( rowModulo ) {
                         if ( mSelEndT/7 >= 6 - rowModulo )
                             addRow = mSelEndT/7 - 5 + rowModulo;
                     }  
                     //qDebug("%d %d %d ",selh, row, addRow );
                     int addrow2 = addRow-selh+1;
                     if ( addrow2 < 0 )
                          addrow2 = 0;
                     if (selh > 1) {
                         p.fillRect(1, (row+1)*dheight+addrow2, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
                     }
                     // draw last block from left to mSelEndT
                     selw = mSelEndT-7*(mSelEndT/7)+1;
                     //qDebug("esl %d ",selw );
                     int add = 0;
                     if ( colModulo ) {
                         add = 7 - colModulo;
                         if ( selw > add )
                             add = selw - add;
                         else
                             add = 0;
                     }
                     //qDebug("add %d ", add);
                     p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight+addRow,
                                selw*dwidth+add, dheight+1, selcol);
                 }
             }
         }
 
         // iterate over all days in the matrix and draw the day label in appropriate colors
         QColor actcol = mDefaultTextColorShaded;
         p.setPen(actcol);
         QPen tmppen;
         for(int i = 0; i < NUMDAYS; i++) {
             row = i/7;
             col = isRTL ? 6-(i-row*7) : i-row*7;
 
             // if it is the first day of a month switch color from normal to shaded and vice versa
             if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) {
                 if (actcol == mDefaultTextColorShaded) {
                     actcol = mDefaultTextColor;
                 } else {
                     actcol = mDefaultTextColorShaded;
                 }
                 p.setPen(actcol);
             }
             if (actcol == mDefaultTextColorShaded) { 
                 if ( ! mouseDown ) {
                     continue;
                 }
             }
             //Reset pen color after selected days block
             if (i == mSelEndT+1) {
                 p.setPen(actcol);
             }
 
             // if today then draw rectangle around day
             if (today == i) {
                 tmppen = p.pen();
                 QPen mTodayPen(p.pen());
                 if ( daysize.width() < 20 )
                     mTodayPen.setWidth(1);
                 else
                     mTodayPen.setWidth(mTodayMarginWidth);
                 //draw red rectangle for holidays
                 if (pDays.testBit(i)) {
                     if (actcol == mDefaultTextColor) {
                         mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
                     } else {
                         mTodayPen.setColor(mHolidayColorShaded);
                     }
                 }
                 //draw gray rectangle for today if in selection
                 if (i >= mSelStartT && i <= mSelEndT) {
                     QColor grey("grey");
                     mTodayPen.setColor(grey);
                 }
                 p.setPen(mTodayPen);
 
 
                 int addCol = 0;
                 int addRow = 0;
                 if (rowModulo) { 
                     if ( row >= 6 - rowModulo )
                         addRow = row - 5 + rowModulo;
                 }  
                 if ( colModulo ) {
                     if ( col >= 7 - colModulo )
                         addCol = col - 6 + colModulo-1;
                 }
          
                 addCol += 1;
                 if ( row == 0 )
                     addRow = 1;
                 p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1);
                 p.setPen(tmppen);
             }
 
             // if any events are on that day then draw it using a bold font
             if ( eDays.testBit(i) ) {
                 QFont myFont = font();
                 myFont.setBold(true);
                 p.setFont(myFont);
             }
 
             // if it is a holiday then use the default holiday color
             if ( pDays.testBit(i)) {
                 if (  bDays.testBit(i) ) {
                     if ( hDays.testBit(i) )
                         p.setPen(QColor(0,200,0));
                     else
                         p.setPen(QColor(Qt::blue));
                 } else {
                     if (actcol == mDefaultTextColor ) { 
                         p.setPen(KOPrefs::instance()->mHolidayColor);
                     } else {
                         p.setPen(mHolidayColorShaded);
                     }
                 }
             }
 
             // draw selected days with special color
             // DO NOT specially highlight holidays in selection !
             if (i >= mSelStartT && i <= mSelEndT) {
                 ;//p.setPen(mSelectedDaysColor);
             }
 
             int addCol = 0;
             int addRow = 0;
             if ( colModulo ) {
                 if ( col >= 7 - colModulo )
                     addCol = col - 7 + colModulo;
             }
             if ( rowModulo ) {
                 if ( row >= 6 - rowModulo )
                     addRow = row - 5 + rowModulo;
             }
             //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
             ++addCol;//++addCol;
             if ( row == 0)
                 addRow = 1;
             p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
                        Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
             // reset color to actual color
             if (pDays.testBit(i)) {
                 p.setPen(actcol);
             }
             // reset bold font to plain font
             if ( eDays.testBit(i)) {
                 QFont myFont = font();
                 myFont.setBold(false);
                 p.setFont(myFont);
             }
         }
         p.setPen(mDefaultTextColor);
         p.drawRect(0, 0, width(), height());
     } else {
         //qDebug("NO  redraw ");
     }
     
     bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP);
     mRedrawNeeded = false;
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent * e)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
   QFrame::resizeEvent( e );
 }
 
 QSize KODayMatrix::sizeHint() const
 {
 
   QFontMetrics fm ( font() );
   int wid = fm.width( "30") *7+3;
   int hei = fm.height() * 6+3;
   //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);
   return   QSize ( wid, hei );
 
 }
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index de4e4f7..89504db 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -132,989 +132,995 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
 
   topLayout->addStretch( );
 }
 
 void RecurWeekly::setDays( const QBitArray &days )
 {
   for ( int i = 0; i < 7; ++i ) {
     mDayBoxes[ i ]->setChecked( days.testBit( i ) );
   }
 }
 
 QBitArray RecurWeekly::days()
 {
   QBitArray days( 7 );
 
   for ( int i = 0; i < 7; ++i ) {
     days.setBit( i, mDayBoxes[ i ]->isChecked() );
   }
 
   return days;
 }
 
 /////////////////////////// RecurMonthly ///////////////////////////////
 
 RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
   QBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
 
   QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("every"), this );
   freqLayout->addWidget( preLabel );
 
   freqLayout->addWidget( frequencyEdit() );
 
   QLabel *postLabel = new QLabel( i18n("month(s)"), this );
   freqLayout->addWidget( postLabel );
 
 
   QButtonGroup *buttonGroup = new QButtonGroup( this );
   buttonGroup->setFrameStyle( QFrame::NoFrame );
   topLayout->addWidget( buttonGroup, 1, AlignVCenter );
 
   QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 );
   buttonLayout->setSpacing( KDialog::spacingHint() );
   buttonLayout->setMargin( KDialog::marginHintSmall() );
 
 
   QString recurOnText;
   if ( QApplication::desktop()->width() > 320 ) {
     recurOnText = i18n("Recur on the");
   }
 
   mByDayRadio = new QRadioButton( recurOnText, buttonGroup );
   buttonLayout->addWidget( mByDayRadio, 0, 0 );
 
   mByDayCombo = new QComboBox( buttonGroup );
   mByDayCombo->setSizeLimit( 7 );
   mByDayCombo->insertItem( i18n("1st") );
   mByDayCombo->insertItem( i18n("2nd") );
   mByDayCombo->insertItem( i18n("3rd") );
   mByDayCombo->insertItem( i18n("4th") );
   mByDayCombo->insertItem( i18n("5th") );
   mByDayCombo->insertItem( i18n("6th") );
   mByDayCombo->insertItem( i18n("7th") );
   mByDayCombo->insertItem( i18n("8th") );
   mByDayCombo->insertItem( i18n("9th") );
   mByDayCombo->insertItem( i18n("10th") );
   mByDayCombo->insertItem( i18n("11th") );
   mByDayCombo->insertItem( i18n("12th") );
   mByDayCombo->insertItem( i18n("13th") );
   mByDayCombo->insertItem( i18n("14th") );
   mByDayCombo->insertItem( i18n("15th") );
   mByDayCombo->insertItem( i18n("16th") );
   mByDayCombo->insertItem( i18n("17th") );
   mByDayCombo->insertItem( i18n("18th") );
   mByDayCombo->insertItem( i18n("19th") );
   mByDayCombo->insertItem( i18n("20th") );
   mByDayCombo->insertItem( i18n("21st") );
   mByDayCombo->insertItem( i18n("22nd") );
   mByDayCombo->insertItem( i18n("23rd") );
   mByDayCombo->insertItem( i18n("24th") );
   mByDayCombo->insertItem( i18n("25th") );
   mByDayCombo->insertItem( i18n("26th") );
   mByDayCombo->insertItem( i18n("27th") );
   mByDayCombo->insertItem( i18n("28th") );
   mByDayCombo->insertItem( i18n("29th") );
   mByDayCombo->insertItem( i18n("30th") );
   mByDayCombo->insertItem( i18n("31st") );
   buttonLayout->addWidget( mByDayCombo, 0, 1 );
 
   QLabel *byDayLabel = new QLabel( i18n("day"), buttonGroup );
   buttonLayout->addWidget( byDayLabel, 0, 2 );
 
 
   mByPosRadio = new QRadioButton( recurOnText, buttonGroup);
   buttonLayout->addWidget( mByPosRadio, 1, 0 );
 
   mByPosCountCombo = new QComboBox( buttonGroup );
   mByPosCountCombo->insertItem( i18n("1st") );
   mByPosCountCombo->insertItem( i18n("2nd") );
   mByPosCountCombo->insertItem( i18n("3rd") );
   mByPosCountCombo->insertItem( i18n("4th") );
   mByPosCountCombo->insertItem( i18n("5th") );
   buttonLayout->addWidget( mByPosCountCombo, 1, 1 );
 
   mByPosWeekdayCombo = new QComboBox( buttonGroup );
   mByPosWeekdayCombo->insertItem( i18n("Monday") );
   mByPosWeekdayCombo->insertItem( i18n("Tuesday") );
   mByPosWeekdayCombo->insertItem( i18n("Wednesday") );
   mByPosWeekdayCombo->insertItem( i18n("Thursday") );
   mByPosWeekdayCombo->insertItem( i18n("Friday") );
   mByPosWeekdayCombo->insertItem( i18n("Saturday") );
   mByPosWeekdayCombo->insertItem( i18n("Sunday") );
   buttonLayout->addWidget( mByPosWeekdayCombo, 1, 2 );
 }
 
 void RecurMonthly::setByDay( int day )
 {
   mByDayRadio->setChecked( true );
   mByDayCombo->setCurrentItem( day );
 }
 
 void RecurMonthly::setByPos( int count, int weekday )
 {
   mByPosRadio->setChecked( true );
   mByPosCountCombo->setCurrentItem( count );
   mByPosWeekdayCombo->setCurrentItem( weekday );
 }
 
 bool RecurMonthly::byDay()
 {
   return mByDayRadio->isChecked();
 }
 
 bool RecurMonthly::byPos()
 {
   return mByPosRadio->isChecked();
 }
 
 int RecurMonthly::day()
 {
   return mByDayCombo->currentItem() + 1;
 }
 
 int RecurMonthly::count()
 {
   return mByPosCountCombo->currentItem() + 1;
 }
 
 int RecurMonthly::weekday()
 {
   return mByPosWeekdayCombo->currentItem();
 }
 
 /////////////////////////// RecurYearly ///////////////////////////////
 
 RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
   QBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
 
   QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("every"), this );
   freqLayout->addWidget( preLabel );
 
   freqLayout->addWidget( frequencyEdit() );
 
   QLabel *postLabel = new QLabel( i18n("year(s)"), this );
   freqLayout->addWidget( postLabel );
 
 
   QButtonGroup *buttonGroup = new QButtonGroup( this );
   buttonGroup->setFrameStyle( QFrame::NoFrame );
   topLayout->addWidget( buttonGroup, 1, AlignVCenter );
 
   QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 );
 
   mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup);
   buttonLayout->addWidget( mByMonthRadio, 0, 0  , Qt::AlignRight);
   mByDayLabel = new QLabel( i18n("%1 of ").arg(1), buttonGroup );
  
   buttonLayout->addWidget( mByDayLabel, 0, 1 ); 
   mByMonthCombo = new QComboBox( buttonGroup );
   mByMonthCombo->insertItem( i18n("January") );
   mByMonthCombo->insertItem( i18n("February") );
   mByMonthCombo->insertItem( i18n("March") );
   mByMonthCombo->insertItem( i18n("April") );
   mByMonthCombo->insertItem( i18n("May") );
   mByMonthCombo->insertItem( i18n("June") );
   mByMonthCombo->insertItem( i18n("July") );
   mByMonthCombo->insertItem( i18n("August") );
   mByMonthCombo->insertItem( i18n("September") );
   mByMonthCombo->insertItem( i18n("October") );
   mByMonthCombo->insertItem( i18n("November") );
   mByMonthCombo->insertItem( i18n("December") );
   buttonLayout->addWidget( mByMonthCombo, 0, 2,Qt::AlignLeft );
   if ( QApplication::desktop()->width() <= 640 ) {
       mByMonthCombo->setSizeLimit( 6 );
   } 
 
   mByDayRadio = new QRadioButton( i18n("On day "), buttonGroup);
   buttonLayout->addWidget( mByDayRadio, 1, 0 , Qt::AlignRight);
   mDayOfLabel = new QLabel( i18n("%1 of the year").arg(1), buttonGroup );
   buttonLayout->addMultiCellWidget( mDayOfLabel, 1, 1, 1,3 );
  
 }
 
 void RecurYearly::setByDay( int doy )
 {
   mByDayRadio->setChecked( true );
   mDayOfLabel->setText(i18n("%1 of the year").arg( doy ) );
 }
 
 void RecurYearly::setByMonth( int month, int day )
 {
   mByMonthRadio->setChecked( true );
   mByMonthCombo->setCurrentItem( month - 1 );
   mByDayLabel->setText(i18n("%1 of ").arg( day ) );
   mDay = day;
 }
 
 bool RecurYearly::byMonth()
 {
   return mByMonthRadio->isChecked();
 }
 
 bool RecurYearly::byDay()
 {
   return mByDayRadio->isChecked();
 }
 
 int RecurYearly::month()
 {
   return mByMonthCombo->currentItem() + 1;
 }
 int RecurYearly::day()
 {
     return mDay;//mByDayCombo->currentItem() + 1;
 }
 
 //////////////////////////// ExceptionsWidget //////////////////////////
 
 ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
   QBoxLayout *topLayout = new QVBoxLayout( this );
 
   QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"),
                                        this );
   topLayout->addWidget( groupBox );
 
   QWidget *box = new QWidget( groupBox );
 
   QGridLayout *boxLayout = new QGridLayout( box );
 
   mExceptionDateEdit = new KDateEdit( box );
   boxLayout->addWidget( mExceptionDateEdit, 0, 0 );
 
   QPushButton *addExceptionButton = new QPushButton( i18n("Add"), box );
   boxLayout->addWidget( addExceptionButton, 1, 0 );
   QPushButton *changeExceptionButton = new QPushButton( i18n("Change"), box );
   boxLayout->addWidget( changeExceptionButton, 2, 0 );
   QPushButton *deleteExceptionButton = new QPushButton( i18n("Delete"), box );
   boxLayout->addWidget( deleteExceptionButton, 3, 0 );
 
   mExceptionList = new QListBox( box );
   boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 );
 
   boxLayout->setRowStretch( 4, 1 );
   boxLayout->setColStretch( 1, 3 );
 
   connect( addExceptionButton, SIGNAL( clicked() ),
 	   SLOT( addException() ) );
   connect( changeExceptionButton, SIGNAL( clicked() ),
 	   SLOT( changeException() ) );
   connect( deleteExceptionButton, SIGNAL( clicked() ),
 	   SLOT( deleteException() ) );
   if ( QApplication::desktop()->width() < 480 ) {
       setMinimumWidth( 220 ); 
   } else {
        setMinimumWidth( 440 ); 
        mExceptionDateEdit->setMinimumWidth( 200 ); 
   }
 }
 
 void ExceptionsWidget::setDefaults( const QDateTime &from )
 {
   mExceptionDateEdit->setDate( from.date() );
 }
 
 void ExceptionsWidget::addException()
 {
   QDate date = mExceptionDateEdit->date();
   QString dateStr = KGlobal::locale()->formatDate( date );
   if( !mExceptionList->findItem( dateStr ) ) {
     mExceptionDates.append( date );
     mExceptionList->insertItem( dateStr );
   }
 }
 
 void ExceptionsWidget::changeException()
 {
   int pos = mExceptionList->currentItem();
   if ( pos < 0 ) return;
 
   QDate date = mExceptionDateEdit->date();
   mExceptionDates[ pos ] = date;
   mExceptionList->changeItem( KGlobal::locale()->formatDate( date ), pos );
 }
 
 void ExceptionsWidget::deleteException()
 {
   int pos = mExceptionList->currentItem();
   if ( pos < 0 ) return;
 
   mExceptionDates.remove( mExceptionDates.at( pos ) );
   mExceptionList->removeItem( pos );
 }
 
 void ExceptionsWidget::setDates( const DateList &dates )
 {
   mExceptionList->clear();
   mExceptionDates.clear();
   DateList::ConstIterator dit;
   for ( dit = dates.begin(); dit != dates.end(); ++dit ) {
     mExceptionList->insertItem( KGlobal::locale()->formatDate(* dit ) );
     mExceptionDates.append( *dit );
   }
 }
 
 DateList ExceptionsWidget::dates()
 {
   return mExceptionDates;
 }
 
 ///////////////////////// ExceptionsDialog ///////////////////////////
 
 ExceptionsDialog::ExceptionsDialog( QWidget *parent, const char *name ) :
   KDialogBase( parent, name, true, i18n("Edit exceptions"), Ok|Cancel )
 {
   mExceptions = new ExceptionsWidget( this );
   setMainWidget( mExceptions );
   resize(220,10);
 }
 
 void ExceptionsDialog::setDefaults( const QDateTime &from )
 {
   mExceptions->setDefaults( from );
 }
 
 void ExceptionsDialog::setDates( const DateList &dates )
 {
   mExceptions->setDates( dates );
 }
 
 DateList ExceptionsDialog::dates()
 {
   return mExceptions->dates();
 }
 
 ///////////////////////// RecurrenceRangeWidget ///////////////////////////
 
 RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
                                               const char *name )
   : QWidget( parent, name )
 {
   QBoxLayout *topLayout = new QVBoxLayout( this );
 
   mRangeGroupBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Range"),
                                   this );
   topLayout->addWidget( mRangeGroupBox );
 
   QWidget *rangeBox = new QWidget( mRangeGroupBox );
   QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox );
   rangeLayout->setSpacing( KDialog::spacingHint() );
   rangeLayout->setMargin( KDialog::marginHintSmall() );
 
   mStartDateLabel = new QLabel( i18n("Begin on:"), rangeBox );
   rangeLayout->addWidget( mStartDateLabel );
 
   QButtonGroup *rangeButtonGroup = new QButtonGroup;
 
   mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox );
   rangeButtonGroup->insert( mNoEndDateButton );
   rangeLayout->addWidget( mNoEndDateButton );
 
   QBoxLayout *durationLayout = new QHBoxLayout( rangeLayout );
   durationLayout->setSpacing( KDialog::spacingHint() );
 
   mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox );
   rangeButtonGroup->insert( mEndDurationButton );
   durationLayout->addWidget( mEndDurationButton );
 
   mEndDurationEdit = new QSpinBox( 1, 9999, 1, rangeBox );
   durationLayout->addWidget( mEndDurationEdit );
 
   QLabel *endDurationLabel = new QLabel( i18n("occurrence(s)"), rangeBox );
   durationLayout ->addWidget( endDurationLabel );
 
   QBoxLayout *endDateLayout = new QHBoxLayout( rangeLayout );
   endDateLayout->setSpacing( KDialog::spacingHint() );
 
   mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox );
   rangeButtonGroup->insert( mEndDateButton );
   endDateLayout->addWidget( mEndDateButton );
 
   mEndDateEdit = new KDateEdit( rangeBox );
   endDateLayout->addWidget( mEndDateEdit );
 
   //endDateLayout->addStretch( 1 );
 
   connect( mNoEndDateButton, SIGNAL( toggled( bool ) ),
            SLOT( showCurrentRange() ) );
   connect( mEndDurationButton, SIGNAL( toggled( bool ) ),
            SLOT( showCurrentRange() ) );
   connect( mEndDateButton, SIGNAL( toggled( bool ) ),
            SLOT( showCurrentRange() ) );
 }
 
 void RecurrenceRangeWidget::setDefaults( const QDateTime &from  )
 {
   mNoEndDateButton->setChecked( true );
 
   setDateTimes( from );
   mEndDateEdit->setDate( from.date() );
 }
 
 void RecurrenceRangeWidget::setDuration( int duration )
 {
   if ( duration == -1 ) {
     mNoEndDateButton->setChecked( true );
   } else if ( duration == 0 ) {
     mEndDateButton->setChecked( true );
   } else {
     mEndDurationButton->setChecked( true );
     mEndDurationEdit->setValue( duration );
   }
 }
 
 int RecurrenceRangeWidget::duration()
 {
   if ( mNoEndDateButton->isChecked() ) {
     return -1;
   } else if ( mEndDurationButton->isChecked() ) {
     return mEndDurationEdit->value();
   } else {
     return 0;
   }
 }
 
 void RecurrenceRangeWidget::setEndDate( const QDate &date )
 {
   mEndDateEdit->setDate( date );
 }
 
 QDate RecurrenceRangeWidget::endDate()
 {
   return mEndDateEdit->date();
 }
 
 void RecurrenceRangeWidget::showCurrentRange()
 {
   mEndDurationEdit->setEnabled( mEndDurationButton->isChecked() );
   mEndDateEdit->setEnabled( mEndDateButton->isChecked() );
 }
  
 void RecurrenceRangeWidget::setDateTimes( const QDateTime &start,
                                           const QDateTime & )
 {
   mStartDateLabel->setText( i18n("Start date: %1")
       .arg( KGlobal::locale()->formatDate( start.date() ) ) );
   
   if(!mEndDateButton->isChecked())
     mEndDateEdit->setDate( start.date() );
 }
 
 ///////////////////////// RecurrenceRangeDialog ///////////////////////////
 
 RecurrenceRangeDialog::RecurrenceRangeDialog( QWidget *parent,
                                               const char *name ) :
   KDialogBase( parent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel )
 {
   mRecurrenceRangeWidget = new RecurrenceRangeWidget( this );
   setMainWidget( mRecurrenceRangeWidget );
 }
 
 void RecurrenceRangeDialog::setDefaults( const QDateTime &from )
 {
   mRecurrenceRangeWidget->setDefaults( from );
 }
 
 void RecurrenceRangeDialog::setDuration( int duration )
 {
   mRecurrenceRangeWidget->setDuration( duration );
 }
 
 int RecurrenceRangeDialog::duration()
 {
   return mRecurrenceRangeWidget->duration();
 }
 
 void RecurrenceRangeDialog::setEndDate( const QDate &date )
 {
   mRecurrenceRangeWidget->setEndDate( date );
 }
 
 QDate RecurrenceRangeDialog::endDate()
 {
   return mRecurrenceRangeWidget->endDate();
 }
 
 void RecurrenceRangeDialog::setDateTimes( const QDateTime &start,
                                           const QDateTime &end )
 {
   mRecurrenceRangeWidget->setDateTimes( start, end );
 }
 
 //////////////////////////// RecurrenceChooser ////////////////////////
 
 RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
     QBoxLayout *topLayout = new QVBoxLayout( this );
 
     mTypeCombo = new QComboBox( this );
     mTypeCombo->insertItem( i18n("Daily") );
     mTypeCombo->insertItem( i18n("Weekly") );
     mTypeCombo->insertItem( i18n("Monthly") );
     mTypeCombo->insertItem( i18n("Yearly") );
 
     topLayout->addWidget( mTypeCombo );
 
     connect( mTypeCombo, SIGNAL( activated( int ) ), SLOT( emitChoice() ) );
  
 }
 
 int RecurrenceChooser::type()
 {
   if ( mTypeCombo ) {
     return mTypeCombo->currentItem();
   } else {
     if ( mDailyButton->isChecked() ) return Daily;
     else if ( mWeeklyButton->isChecked() ) return Weekly;
     else if ( mMonthlyButton->isChecked() ) return Monthly;
     else return Yearly;
   }
 }
 
 void RecurrenceChooser::setType( int type )
 {
   if ( mTypeCombo ) {
     mTypeCombo->setCurrentItem( type );
   } else {
     switch ( type ) {
       case Daily:
         mDailyButton->setChecked( true );
         break;
       case Weekly:
         mWeeklyButton->setChecked( true );
         break;
       case Monthly:
         mMonthlyButton->setChecked( true );
         break;
       case Yearly:
       default:
         mYearlyButton->setChecked( true );
         break;
     }
   }
 }
 
 void RecurrenceChooser::emitChoice()
 {
   emit chosen ( type() );
 }
 
 /////////////////////////////// Main Widget /////////////////////////////
 
 KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   QWidget( parent, name )
 {
   QGridLayout *topLayout = new QGridLayout( this, 2,2 );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
   mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this );
   connect( mEnabledCheck, SIGNAL( toggled( bool ) ),
            SLOT( setEnabled( bool ) ) );
   topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 );
 
 
   mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
                                  this );
   topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 );
 
   if ( QApplication::desktop()->width() <= 640 ) {
     mTimeGroupBox->hide();
   }
 
 //  QFrame *timeFrame = new QFrame( mTimeGroupBox );
 //  QBoxLayout *layoutTimeFrame = new QHBoxLayout( timeFrame );
 //  layoutTimeFrame->setSpacing( KDialog::spacingHint() );
 
   mDateTimeLabel = new QLabel( mTimeGroupBox );
 //  mDateTimeLabel = new QLabel( timeFrame );
 //  layoutTimeFrame->addWidget( mDateTimeLabel );
   //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) );
   //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) );
   mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
   topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
   mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
   connect( mRecurrenceChooser, SIGNAL( chosen( int ) ),
            SLOT( showCurrentRule( int ) ) );
 
 
   mRuleStack = new QWidgetStack( mRuleBox );
 
   mDaily = new RecurDaily( mRuleStack );
   mRuleStack->addWidget( mDaily, 0 );
 
   mWeekly = new RecurWeekly( mRuleStack );
   mRuleStack->addWidget( mWeekly, 0 );
 
   mMonthly = new RecurMonthly( mRuleStack );
   mRuleStack->addWidget( mMonthly, 0 );
 
   mYearly = new RecurYearly( mRuleStack );
   mRuleStack->addWidget( mYearly, 0 );
 
   showCurrentRule( mRecurrenceChooser->type() );
     mRecurrenceRangeWidget = 0;
     mRecurrenceRangeDialog = new RecurrenceRangeDialog( this );
     mRecurrenceRange = mRecurrenceRangeDialog;
     mRecurrenceRangeButton = new QPushButton( i18n("Recurrence Range..."),
                                               this );
 
     connect( mRecurrenceRangeButton, SIGNAL( clicked() ),
              SLOT( showRecurrenceRangeDialog() ) );
 
     mExceptionsWidget = 0;
     mExceptionsDialog = new ExceptionsDialog( this );
     mExceptions = mExceptionsDialog;
     mExceptionsButton = new QPushButton( i18n("Exceptions..."), this );
     if ( QApplication::desktop()->width() < 320 ) {
         topLayout->addMultiCellWidget( mRecurrenceRangeButton, 3, 3, 0, 1 );
         topLayout->addMultiCellWidget( mExceptionsButton, 4, 4, 0, 1 );
        } else {
             topLayout->addWidget( mRecurrenceRangeButton, 3, 0 );
             topLayout->addWidget( mExceptionsButton, 3, 1 );
         }
     connect( mExceptionsButton, SIGNAL( clicked() ),
              SLOT( showExceptionsDialog() ) );
 }
 
 KOEditorRecurrence::~KOEditorRecurrence()
 {
 }
 
 void KOEditorRecurrence::setEnabled( bool enabled )
 {
 //  kdDebug() << "KOEditorRecurrence::setEnabled(): " << (enabled ? "on" : "off") << endl;
 
   mTimeGroupBox->setEnabled( enabled );
   if ( mRecurrenceRangeWidget ) mRecurrenceRangeWidget->setEnabled( enabled );
   if ( mRecurrenceRangeButton ) mRecurrenceRangeButton->setEnabled( enabled );
   if ( mExceptionsWidget ) mExceptionsWidget->setEnabled( enabled );
   if ( mExceptionsButton ) mExceptionsButton->setEnabled( enabled );
   mRuleBox->setEnabled( enabled );
 }
 
 void KOEditorRecurrence::showCurrentRule( int current )
 {
   switch ( current ) {
     case Daily:
       mRuleStack->raiseWidget( mDaily );
       break;
     case Weekly:
       mRuleStack->raiseWidget( mWeekly );
       break;
     case Monthly:
       mRuleStack->raiseWidget( mMonthly );
       break;
     default:
     case Yearly:
       mRuleStack->raiseWidget( mYearly );
       break;
   }
 }
 
 void KOEditorRecurrence::setDateTimes( QDateTime start, QDateTime end )
 {
 //  kdDebug() << "KOEditorRecurrence::setDateTimes" << endl;
 
   mRecurrenceRange->setDateTimes( start, end );
   mExceptions->setDefaults( end );
 
 }
 void KOEditorRecurrence::setDefaultsDates( QDateTime from, QDateTime to )
 {
     setDateTimes( from, to );
     QBitArray days( 7 );
     days.fill( 0 );
     days.setBit( from.date().dayOfWeek()- 1);
     mWeekly->setDays( days );
     bool byPos = mMonthly->byPos();
     if ( byPos )
         mMonthly->setByDay( from.date().day()-1 );
     mMonthly->setByPos((from.date().day()/7), from.date().dayOfWeek()-1 );
     if ( ! byPos)
         mMonthly->setByDay( from.date().day()-1 );
 
     bool byDay = mYearly->byDay();
     if ( ! byDay )
         mYearly->setByDay( from.date().dayOfYear() );
     mYearly->setByMonth( from.date().month(), from.date().day() );
     if ( byDay )
         mYearly->setByDay( from.date().dayOfYear() );
 }
 void KOEditorRecurrence::setDefaults( QDateTime from, QDateTime to )
 {
 
     // qDebug("KOEditorRecurrence::setDefaults %s %s ",from.toString().latin1(),to.toString().latin1() );
     //setDateTimes( from, to );
 
   bool enabled = false;
   mEnabledCheck->setChecked( enabled );
   setEnabled( enabled );
 
   mExceptions->setDefaults( to );
   mRecurrenceRange->setDefaults( to );
 
   mRecurrenceChooser->setType( RecurrenceChooser::Weekly );
   showCurrentRule( mRecurrenceChooser->type() );
 
   mDaily->setFrequency( 1 );
   mWeekly->setFrequency( 1 );
   mMonthly->setFrequency( 1 );
   mYearly->setFrequency( 1 );
   setDefaultsDates( from, to );
 }
 
 void KOEditorRecurrence::readEvent(Incidence *event)
 {
 
     QDateTime dtEnd;
     if ( event->typeID() == eventID )
         dtEnd = ((Event*)event)->dtEnd();
     else
         dtEnd = ((Todo*)event)->dtDue();
         
     setDefaults( event->dtStart(), dtEnd );
   QBitArray rDays( 7 );
   QPtrList<Recurrence::rMonthPos> rmp;
   QPtrList<int> rmd;
   int day = 0;
   int count = 0;
   int month = 0;
   setDateTimes( event->dtStart(), dtEnd );
 
-  Recurrence *r = event->recurrence();
-  int f = r->frequency();
 
-  int recurs = r->doesRecur();
+
+  int recurs = event->doesRecur();
 
   mEnabledCheck->setChecked( recurs );
   setEnabled( recurs );
 
   int recurrenceType = RecurrenceChooser::Weekly;
-
+  if ( recurs ) {
+      Recurrence *r = event->recurrence();
+      int f = r->frequency();
   switch ( recurs ) {
     case Recurrence::rNone:
         setDefaults( event->dtStart(), dtEnd );
       break;
     case Recurrence::rDaily:
       recurrenceType = RecurrenceChooser::Daily;
       mDaily->setFrequency( f );
       break;
     case Recurrence::rWeekly:
       recurrenceType = RecurrenceChooser::Weekly;
       mWeekly->setFrequency( f );
       mWeekly->setDays( r->days() );
       break;
     case Recurrence::rMonthlyPos:
       // we only handle one possibility in the list right now,
       // so I have hardcoded calls with first().  If we make the GUI
       // more extended, this can be changed.
       recurrenceType = RecurrenceChooser::Monthly;
 
       rmp = r->monthPositions();
       if ( rmp.first()->negative )
         count = 5 - rmp.first()->rPos - 1;
       else
         count = rmp.first()->rPos - 1;
       day = 0;
       while ( !rmp.first()->rDays.testBit( day ) ) ++day;
       mMonthly->setByPos( count, day );
 
       mMonthly->setFrequency( f );
 
       break;
     case Recurrence::rMonthlyDay:
       recurrenceType = RecurrenceChooser::Monthly;
 
       rmd = r->monthDays();
       day = *rmd.first() - 1;
       mMonthly->setByDay( day );
 
       mMonthly->setFrequency( f );
 
       break;
     case Recurrence::rYearlyMonth:
         {
         recurrenceType = RecurrenceChooser::Yearly;
         //qDebug("Recurrence::rYearlyMonth: ");
             day = event->dtStart().date().day(); 
             rmd = r->yearNums();
             if ( rmd.count() > 0 )
                 month = *rmd.first();
             else
                 month = event->dtStart().date().month() ;
             mYearly->setByMonth( month, day );
 #if 0
             //qDebug("2day = %d ",day );
             QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
             int month;
             if ( !monthlist.isEmpty() ) {
                 month =  monthlist.first()->rPos ;
             } else {
                 month = event->dtStart().date().month() ;
             }
             mYearly->setByMonth( day, month );
 #endif
             mYearly->setFrequency( f );
         }
 
       break;
     case Recurrence::rYearlyDay:
         //qDebug("Recurrence::rYearlyDay: ");
         recurrenceType = RecurrenceChooser::Yearly;
         mYearly->setByDay( event->dtStart().date().dayOfYear() );
         mYearly->setFrequency( f );
         break;
     default:
         setDefaults( event->dtStart(), dtEnd );
       break;
   }
-
+  }
   mRecurrenceChooser->setType( recurrenceType );
   showCurrentRule( recurrenceType );
 
   mRecurrenceRange->setDateTimes( event->dtStart() );
 
-  if ( r->doesRecur() ) {
+  if ( event->doesRecur() ) {
+      Recurrence *r = event->recurrence();
     mRecurrenceRange->setDuration( r->duration() );
     if ( r->duration() == 0 ) 
         {
         if ( r->endDate() < event->dtStart().date() )
             mRecurrenceRange->setEndDate( event->dtStart().date() );
         else
             mRecurrenceRange->setEndDate( r->endDate() );
         } else
             mRecurrenceRange->setEndDate( event->dtStart().date() );
   }
 
   mExceptions->setDates( event->exDates() );
 }
 
 void KOEditorRecurrence::writeEvent( Incidence *event )
 {
+  
+
+  if ( !mEnabledCheck->isChecked() ) {
+      if ( event->doesRecur() )
+          event->recurrence()->unsetRecurs();
+  } else {
   Recurrence *r = event->recurrence();
 
   // clear out any old settings;
   r->unsetRecurs();
-
-  if ( mEnabledCheck->isChecked() ) {
     int duration = mRecurrenceRange->duration();
     QDate endDate;
     if ( duration == 0 ) endDate = mRecurrenceRange->endDate();
 
     int recurrenceType = mRecurrenceChooser->type();
 
     if ( recurrenceType == RecurrenceChooser::Daily ) {
       int freq = mDaily->frequency();
       if ( duration != 0 ) r->setDaily( freq, duration );
       else  r->setDaily( freq, endDate );
     } else if ( recurrenceType == RecurrenceChooser::Weekly ) {
       int freq = mWeekly->frequency();
       QBitArray days = mWeekly->days();
       int j;
       bool found = false;
       for (j = 0; j < 7 ; ++j ) {
           found |=days.at(j);
       }
       if ( !found ) {
           days.setBit( event->dtStart().date().dayOfWeek()-1);
           //qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
       }
       if ( duration != 0 ) r->setWeekly( freq, days, duration );
       else r->setWeekly( freq, days, endDate );
     } else if ( recurrenceType == RecurrenceChooser::Monthly ) {
       int freq = mMonthly->frequency();
       if ( mMonthly->byPos() ) {
         int pos = mMonthly->count();
 
         QBitArray days( 7 );
         days.fill( false );
 
         days.setBit( mMonthly->weekday() );
         if ( duration != 0 )
 	  r->setMonthly( Recurrence::rMonthlyPos, freq, duration );
 	else
 	  r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
         r->addMonthlyPos( pos, days );
       } else {
 	// it's by day
         int day = mMonthly->day();
 
         if ( duration != 0 ) {
           r->setMonthly( Recurrence::rMonthlyDay, freq, duration );
         } else {
           r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
         }
         r->addMonthlyDay( day );
       }
     } else if ( recurrenceType == RecurrenceChooser::Yearly ) {
         //qDebug("RecurrenceChooser::Yearly ");
       int freq = mYearly->frequency();
       if ( mYearly->byDay() ) {
           if ( duration != 0 ) {
               r->setYearly( Recurrence::rYearlyDay, freq, duration );
           } else {
               r->setYearly( Recurrence::rYearlyDay, freq, endDate );
           }
           r->addYearlyNum( event->dtStart().date().dayOfYear() );
       } else {
           if ( duration != 0 ) {
               r->setYearly( Recurrence::rYearlyMonth, freq, duration );
           } else {
               r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
           }
           r->addYearlyNum( mYearly->month() ); 
       }
 
     }
 
     event->setExDates( mExceptions->dates() );
   }
 }
 
 void KOEditorRecurrence::setDateTimeStr( const QString &str )
 {
   mDateTimeLabel->setText( str );
 }
 
 bool KOEditorRecurrence::validateInput()
 {
   // Check input here
 
   return true;
 }
 
 void KOEditorRecurrence::showExceptionsDialog()
 {
   DateList dates = mExceptions->dates();
   int result = mExceptionsDialog->exec();
   if ( result == QDialog::Rejected ) mExceptions->setDates( dates );
 }
 
 void KOEditorRecurrence::showRecurrenceRangeDialog()
 {
   int duration = mRecurrenceRange->duration();
   QDate endDate = mRecurrenceRange->endDate();
 
   int result = mRecurrenceRangeDialog->exec();
   if ( result == QDialog::Rejected ) {
     mRecurrenceRange->setDuration( duration );
     mRecurrenceRange->setEndDate( endDate );
   }
 
 }
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index a690ab1..db695f5 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -1,831 +1,831 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <qcstring.h>
 #include <qwhatsthis.h>
 #include <qdialog.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include <klocale.h>
 #include <kapplication.h>
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <krun.h>
 #include <kglobal.h>
 #include <kprocess.h>
 #include "koprefs.h"
 
 #include <kabc/stdaddressbook.h>
 
 #ifndef KORG_NODCOP
 #include <dcopclient.h>
 #include "korganizer.h"
 #include "koprefs.h"
 #include "actionmanager.h"
 #endif
 
 #include "koeventviewer.h"
 //#ifndef KORG_NOKABC
 //#include <kabc/stdaddressbook.h>
 //#define size count
 //#endif
 
 #ifdef DESKTOP_VERSION
 #include <kabc/addresseedialog.h>
 #include <kabc/addresseeview.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #include <qpaintdevicemetrics.h>
 #else //DESKTOP_VERSION
 #include <externalapphandler.h>
 #include <qtopia/qcopenvelope_qws.h> 
 #endif //DESKTOP_VERSION
 
 KOEventViewer::KOEventViewer(QWidget *parent,const char *name)
   : QTextBrowser(parent,name)
 {
     mSyncMode = false;
     mColorMode = 0;
 }
 
 KOEventViewer::~KOEventViewer()
 {
 }
 
 void KOEventViewer::printMe()
 {
 #ifdef DESKTOP_VERSION 
 
     KOPrintPrefs pp ( this );
     if (!pp.exec() )
         return;
     int scaleval = pp.printMode() ;
 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
     QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
     if ( dx < dy )
         scale = dx;
     else
         scale = dy;
 
     p.translate( m.width()/10,0 );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
         p.scale( scale, scale );
     }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 
 }
 void KOEventViewer::setSource(const QString& n)
 {
 
     if ( n.left(8) == "todo_uid" ) {
         int midstr = 9;
 #ifdef DESKTOP_VERSION
         midstr = 11;
 #endif        
         //qDebug("-%s- ", n.mid(midstr).latin1());
         emit showIncidence(  n.mid(midstr) );
         return;
     }
 
     if ( n.left(3) == "uid" ) 
 #ifdef DESKTOP_VERSION
         {
         KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
         KABC::AddressBook::Iterator it;
         for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) {
             // LR I do not understand, why the uid string is different on zaurus and desktop
             QString uid = "uid://"+(*it).uid();
 
             //qDebug("for *%s*          +%s+ ", n.latin1(), uid.latin1());
             if (n == uid ) {
                 //qDebug("found %s ",(*it).mobileHomePhone().latin1() );
                 QDialog dia( this,"dia123", true );
                 dia.setCaption( i18n("Details of attendee") );
                 QVBoxLayout lay ( &dia );
                 KABC::AddresseeView av ( &dia );
                 av.setAddressee( (*it) );
                 lay.addWidget( &av );
                 if ( QApplication::desktop()->width() < 480 )
                     dia.resize( 220, 240);
                 else {
                     dia.resize( 400,400);
                 }
                 dia.exec();
                 break;
             } 
         }
         return;
     }
 #else  
     {
         if (  "uid:organizer" == n ) {
             ExternalAppHandler::instance()->requestDetailsFromKAPI("", mCurrentIncidence->organizer(),"");
             return;
         } 
         QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
         if (attendees.count()) {  
             Attendee *a;
             for(a=attendees.first();a;a=attendees.next()) {
                 if ( "uid:"+a->uid() == n ) {
                     bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid());
                     return;
                 }
             }
         }
         return;
     }
     //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
   // the result should now arrive through method insertAttendees
     //QString uid = "uid:"+(*it).uid();
 #endif
     if ( n.left(6) == "mailto" ) {
         // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1());
 #ifndef DESKTOP_VERSION
         if ( n.mid(7,3) == "ALL" ) {
             mailToAttendees( true );
         } else if ( n.mid(7,4) == "RSVP"  ) {
             mailToAttendees( false );
         } else {
         QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
         e << n.mid(7);
         }
 #endif
 
     }
 
 
 #ifndef KORG_NODCOP
     kdDebug() << "KOEventViewer::setSource(): " << n << endl;
     QString tmpStr;
     if (n.startsWith("mailto:")) {
         KApplication::kApplication()->invokeMailer(n.mid(7),QString::null);
         //emit showIncidence(n);
         return;
     } else if (n.startsWith("uid:")) {
         DCOPClient *client = KApplication::kApplication()->dcopClient();
         const QByteArray noParamData;
         const QByteArray paramData;
         QByteArray replyData;
         QCString replyTypeStr;
 #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()",  noParamData, replyTypeStr, replyData))
         bool foundAbbrowser = PING_ABBROWSER;
 
         if (foundAbbrowser) {
             //KAddressbook is already running, so just DCOP to it to bring up the contact editor
             //client->send("kaddressbook","KAddressBookIface",
             QDataStream arg(paramData, IO_WriteOnly);
             arg << n.mid(6);
             client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )",  paramData);
             return;
         } else {
             /*
               KaddressBook is not already running.  Pass it the UID of the contact via the command line while starting it - its neater.
               We start it without its main interface
             */
             KIconLoader* iconLoader = new KIconLoader();
             QString iconPath = iconLoader->iconPath("go",KIcon::Small);
             ActionManager::setStartedKAddressBook(true);
             tmpStr = "kaddressbook --editor-only --uid ";
             tmpStr += KProcess::quote(n.mid(6));
             KRun::runCommand(tmpStr,"KAddressBook",iconPath);
             return;
         }
     } else {
         //QTextBrowser::setSource(n);
     }
 #endif
 }
 void KOEventViewer::mailToAttendees( bool all )
 {
     QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
     if (attendees.count() == 0) return;
     QStringList nameList;
     QStringList emailList;
     QStringList uidList;
     Attendee* a;
     for(a=attendees.first();a;a=attendees.next()) {
         if ( !all && !a->RSVP() ) continue;
         if (!a->email().isEmpty()) {
             nameList.append (a->name() );
             emailList.append (a->email() );
             uidList.append (a->uid() );
         }
     }
     QString uid = "ComposeMailUIpick2"+mMailSubject;
 #ifndef DESKTOP_VERSION
     bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
 #endif
 
 }
 void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
     int number=text.contains("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1) 
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
             mText.append(str);
         }
 }
 
 void KOEventViewer::setColorMode( int m )
 {
     mColorMode = m;
 }
 void KOEventViewer::appendEvent(Event *event, int mode )
 {  
     mMailSubject = "";
     mCurrentIncidence = event;
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     bool wideScreen = ( QApplication::desktop()->width() >= 640 );
     topLevelWidget()->setCaption(i18n("Event Viewer"));
     if ( mode == 0 ) {
         addTag("h2",deTag(event->summary()));
         formatReadOnly(event);
     }
     else {
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#C00000\">";
         }
         // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
         } else {
             addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
         } 
         formatReadOnly(event);
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Meeting " )+ event->summary();
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This event has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
     if (event->doesFloat()) {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
                          .arg(event->dtStartDateStr(shortDate))
                          .arg(event->dtEndDateStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate )));
         }
     } else {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1</p> ")
                          .arg(event->dtStartStr( shortDate)));
             mText.append(i18n("<p><b>To:</b> %1</p>")
                          .arg(event->dtEndStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
                          .arg(event->dtStartTimeStr())
                          .arg(event->dtEndTimeStr()));
             mText.append(i18n("<p><b>On:</b> %1</p> ")
                          .arg(event->dtStartDateStr( shortDate )));
         }
     }
     if (!event->location().isEmpty()) {
         addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         mMailSubject += i18n(" at ") + event->location();
     }
-    if (event->recurrence()->doesRecur()) {
+    if (event->doesRecur()) {
 
-        QString recurText = event->recurrence()->recurrenceText();
+        QString recurText = event->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
         bool ok;
         QDate start = QDate::currentDate();
         QDateTime next;
         next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
         if ( ok ) {
             if ( wideScreen ){
                 addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) );
             } else {
                 addTag("p",i18n("<b>Next recurrence is on:</b>")  );
                 addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
             }
             mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );
 
         } else {
             bool last;
             QDate nextd;
             nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last );
             if ( last ) {
                 if ( wideScreen ){
                     addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate ));
                 } else{
                     addTag("p",i18n("<b>Last recurrence was on:</b>")  );
                     addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
                 }
             }
         }
     } else {
         mMailSubject += i18n(" - " )+event->dtStartStr( true );
 
     }
 
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         if(wideScreen ){
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
         }else{
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         }
         //addTag("p",s);
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
   
     formatCategories(event);
 
     formatAttendees(event);
   
     if ( KOPrefs::instance()->mEVshowCreated ) {
         if(wideScreen ){
             addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }else{
             addTag("p",i18n("<b>Created: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }
 
         
     }
     if ( KOPrefs::instance()->mEVshowChanged ) {
         if(wideScreen ){
             addTag("p",i18n("<b>Last modified: ")  +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
         }else{
             addTag("p",i18n("<b>Last modified: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
         }
         
     }   
     if ( KOPrefs::instance()->mEVshowDetails ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
             addTag("p",deTag(event->description()));
         }
     }
     setText(mText);
     //QWhatsThis::add(this,mText);
 
 }
 
 void KOEventViewer::appendTodo(Todo *event, int mode )
 {
     mMailSubject = "";
     mCurrentIncidence = event;
     topLevelWidget()->setCaption(i18n("Todo Viewer"));
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     bool wideScreen = ( QApplication::desktop()->width() >= 640 );
     if (mode == 0 ) {
         addTag("h2",deTag(event->summary()));
         formatReadOnly(event);
     }
     else { 
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#B00000\">";
         }
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
         } else {
             addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
         }
         formatReadOnly(event);
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Todo " )+ event->summary();
 
      if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
         mText +="<font color=\"#B00000\">";
         addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) );
         mText += "</font>";
     } else {
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
 
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
    
 
-    if (event->recurrence()->doesRecur()) {
+    if (event->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
             
     }
     if (event->hasStartDate()) {
         mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
     }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
         mMailSubject += i18n(" - " )+event->dtDueStr(  true );
     }
     if (!event->location().isEmpty()) { 
         addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         mMailSubject += i18n(" at ") + event->location();
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         QString s =i18n("( %1 before )").arg( alarm->offsetText() ); 
         if ( wideScreen ) {
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
         } else {
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         }
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
 
     formatCategories(event);
 
     formatAttendees(event);
     
     if ( KOPrefs::instance()->mEVshowCreated ) {
         if(wideScreen ){
 
             addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
 
         } else {
             addTag("p",i18n("<b>Created: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }  
     }
     if ( KOPrefs::instance()->mEVshowChanged ) {
         if(wideScreen ){
             addTag("p",i18n("<b>Last modified: ")  +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
 
         } else {
             addTag("p",i18n("<b>Last modified: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
         }
     } 
     if ( event->relatedTo() ) {
         addTag("b",i18n("Parent todo:<br>"));
 
         QString t_name = "[" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] ";// +event->relatedTo()->summary());
 
         mText += t_name;
         mText += "<a href=\"todo_uid:" + event->relatedTo()->uid() + "\">";
         mText += deTag(event->relatedTo()->summary());
         mText += "</a><br>";
 
         //        mText.append(deTag("[" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] " +event->relatedTo()->summary()) +"<br>");
     }
     QPtrList<Incidence> Relations = event->relations();
     Incidence *to;
     if ( Relations.first() )
         addTag("b",i18n("Sub todos:<br>"));
     for (to=Relations.first();to;to=Relations.next()) {
         QString t_name = "[" +QString::number(((Todo*)to)->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%] ";// +to->relatedTo()->summary());
         mText += t_name;
         mText += "<a href=\"todo_uid:" + to->uid() + "\">";
         mText += deTag(to->summary());
         mText += "</a><br>";
         
     }  
 
     if ( KOPrefs::instance()->mEVshowDetails ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
             addTag("p",deTag(event->description()));
         }
     }
     setText(mText);
 }
 
 void KOEventViewer::formatCategories(Incidence *event)
 {
     if (!event->categoriesStr().isEmpty()) {
         if (event->categories().count() == 1) {
             addTag("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace());
         } else {
             addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ;
         }
     }
 }
 void KOEventViewer::formatAttendees(Incidence *event)
 {
     QPtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
         
   
         QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small);
         QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small);
         addTag("h3",i18n("Organizer"));
         mText.append("<ul><li>");
 #ifndef KORG_NOKABC
        
 #ifdef DESKTOP_VERSION
         KABC::AddressBook *add_book = KABC::StdAddressBook::self();
         KABC::Addressee::List addressList;
         addressList = add_book->findByEmail(event->organizer());
         KABC::Addressee o = addressList.first();
         if (!o.isEmpty() && addressList.size()<2) {
             mText += "<a href=\"uid:" + o.uid() + "\">";
             mText += o.formattedName();
             mText += "</a>\n";
         } else {
             mText.append(event->organizer());
         }
 #else //DESKTOP_VERSION
                     mText += "<a href=\"uid:organizer\">";
                     mText += event->organizer();
                     mText += "</a>\n";
 #endif //DESKTOP_VERSION
 
 
 #else
         mText.append(event->organizer());
 #endif
        
         if (iconPath) {
             mText += " <a href=\"mailto:" + event->organizer() + "\">";
             mText += "<IMG src=\"" + iconPath + "\">";
             mText += "</a>\n";
         }
         mText.append("</li></ul>");
 
         addTag("h3",i18n("Attendees"));
         Attendee *a;
         mText.append("<ul>");
         int a_count = 0;
         int a_count_nr = 0;
 
         for(a=attendees.first();a;a=attendees.next()) {
 #ifndef KORG_NOKABC
 #ifdef DESKTOP_VERSION
             if (a->name().isEmpty()) {
                 addressList = add_book->findByEmail(a->email());
                 KABC::Addressee o = addressList.first();
                 if (!o.isEmpty() && addressList.size()<2) {
                     mText += "<a href=\"uid:" + o.uid() + "\">";
                     mText += o.formattedName();
                     mText += "</a>\n";
                 } else {
                     mText += "<li>";
                     mText.append(a->email());
                     mText += "\n";
                 }
             } else {
                 mText += "<li><a href=\"uid:" + a->uid() + "\">";
                 if (!a->name().isEmpty()) mText += a->name();
                 else mText += a->email();
                 mText += "</a>\n";
             }
 #else //DESKTOP_VERSION
                 mText += "<li><a href=\"uid:" + a->uid() + "\">";
                 if (!a->name().isEmpty()) mText += a->name();
                 else mText += a->email();
                 mText += "</a>\n";
 #endif //DESKTOP_VERSION
 #else
             //qDebug("nokabc ");
             mText += "<li><a href=\"uid:" + a->uid() + "\">";
             if (!a->name().isEmpty()) mText += a->name();
             else mText += a->email();
             mText += "</a>\n";
 #endif
 
           
             if (!a->email().isEmpty()) {
                 if (iconPath) {
                     mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">";
                     if ( a->RSVP() ) {
                         ++a_count_nr;
                         mText += "<IMG src=\"" + iconPath + "\">";
                     }
                     else {
                         ++a_count;
                         mText += "<IMG src=\"" + NOiconPath + "\">";
                     }
                     mText += "</a>\n";
                 }
             }
             if (a->status() != Attendee::NeedsAction )
                 mText +="[" + a->statusStr() + "] ";
             if (a->role() == Attendee::Chair )
                 mText +="(" + a->roleStr().left(1) + ".)";
         }
         mText.append("</li></ul>");
         if ( (a_count+a_count_nr) > 1 ) {
                 mText += "<a href=\"mailto:ALL\">";
                 mText += i18n( "Mail to all" );
                 mText += "</a> ( ";
                 mText += "<IMG src=\"" + iconPath + "\">";
                 mText += i18n( " and " );
                 mText += "<IMG src=\"" + NOiconPath + "\"> )";
                 mText += "<br>\n";
 
 
         }
         if ( a_count_nr > 1 ) {
                 mText += "<a href=\"mailto:RSVP\">";
                 mText += i18n( "Mail to selected" );
                 mText += "</a> ( ";
                 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
                 mText += "<br>\n";
         }
     }
 
 }
 void KOEventViewer::appendJournal(Journal *jour, int mode )
 { 
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     QString text_d = i18n("Journal from: ");
     if ( !jour->summary().isEmpty() )
         text_d = jour->summary();
     if (mode == 0 ) {
         addTag("h2", text_d );
     }
     else {
         if ( mode == 1 ) {
             addTag("h3",i18n( "Local: " ) + text_d );
         } else {
             addTag("h3",i18n( "Remote: " ) + text_d ); 
         } 
     }
     topLevelWidget()->setCaption(i18n("Journal viewer"));
     mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); 
     formatReadOnly(jour);
     addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
    
     if (!jour->description().isEmpty()) {
         addTag("p",deTag(jour->description()));
     }
     setText(mText);
 }
 
 void KOEventViewer::formatReadOnly(Incidence *event)
 {
     int id = event->calID();
     if ( id > 1 ) {
         addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>");
     }
     if (event->isReadOnly()) {
         addTag("p","<em>(" + i18n("read-only") + ")</em>");
     }
 }
 void KOEventViewer::setSyncMode( bool b )
 {
     mSyncMode = b;
 }
 
 void KOEventViewer::setTodo(Todo *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
             appendTodo(event,1 );
         else
             appendTodo(event,2);
     } else
         appendTodo(event);
 }
 void KOEventViewer::setJournal(Journal *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
             appendJournal(event, 1); 
         else
             appendJournal(event, 2); 
     } else
         appendJournal(event);
 }
 
 void KOEventViewer::setEvent(Event *event)
 {
     clearEvents();
     if ( mSyncMode )
         appendEvent(event, 1);
     else
         appendEvent(event);
 }
 
 void KOEventViewer::addEvent(Event *event)
 {  
     if ( mSyncMode )
         appendEvent(event, 2);
     else
         appendEvent(event);
 }
 
 void KOEventViewer::clearEvents(bool now)
 {
     mText = "";
     if (now) setText(mText);
 }
 
 void KOEventViewer::addText(QString text)
 {
     mText.append(text);
     setText(mText);
 }
 QString KOEventViewer::deTag(QString text)
 {
 #if QT_VERSION >= 0x030000
     text.replace( '<' , "&lt;" );
     text.replace( '>' , "&gt;" );
 #else
     if ( text.find ('<') >= 0 ) {
         text.replace( QRegExp("<") , "&lt;" );
     }
     if ( text.find ('>') >= 0 ) {
         text.replace( QRegExp(">") , "&gt;" );
     }
 #endif
     return text;
 }
 void KOEventViewer::keyPressEvent ( QKeyEvent * e )
 { 
     switch ( e->key() ) {
     case Qt::Key_Return:
     case Qt::Key_Enter :
         e->ignore();
         break;
     default:
         QTextBrowser::keyPressEvent ( e );
         break; 
     }
 }
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d25f671..e7a5e0e 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1,955 +1,955 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 1999 Preston Brown
     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.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlistview.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qdir.h>
 #include <qwhatsthis.h>
 #include <qregexp.h>
 #include <qpainter.h>
 #include <qpaintdevicemetrics.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
 #include <libkdepim/kpimglobalprefs.h>
 #include <libkcal/calendar.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/vcalformat.h>
 #include <libkcal/recurrence.h>
 #include <libkcal/filestorage.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <libkcal/kincidenceformatter.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koglobals.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 
 #include "kolistview.h"
 #include "koeventviewer.h"
 
 extern QPixmap* sgListViewCompletedPix[6];
 extern QPixmap* sgListViewJournalPix;
 
 class KOListViewWhatsThis :public QWhatsThis
 {
 public:
   KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _view->getWhatsThisText(p) ;
   }
 private:
   QWidget* _wid;
   KOListView * _view;
 };
 
 
 ListItemVisitor::ListItemVisitor(KOListViewItem *item, QDate date )
 {
     mItem = item;
     mDate = date;
 }
 
 ListItemVisitor::~ListItemVisitor()
 {
 }
 
 bool ListItemVisitor::visit(Event *e)
 {
     bool ok = false;
     QString start, end;
     QDate ds, de;
     if ( e->doesRecur() ) {
         ds = e->getNextOccurence( QDateTime( mDate, QTime(0,0,0)), &ok ).date();
         if ( ok ) {
             int days = e->dtStart().date().daysTo(e->dtEnd().date() );
             start = KGlobal::locale()->formatDate(ds,true);
             de = ds.addDays( days);
             end = KGlobal::locale()->formatDate(de,true);
         }
 
     } 
     if ( ! ok ) {
         start =e->dtStartDateStr();
         end = e->dtEndDateStr();
         ds = e->dtStart().date();
         de = e->dtEnd().date();
     }
     mItem->setText(0,e->summary());
     mItem->setText(1,start);
     if ( e->doesFloat() )
         mItem->setText(2,"---");
     else
         mItem->setText(2,e->dtStartTimeStr());
     mItem->setText(3,end);
     if ( e->doesFloat() )
         mItem->setText(4,"---");
     else
         mItem->setText(4,e->dtEndTimeStr());
     if ( e->isAlarmEnabled() ) {
         mItem->setText(5,e->alarms().first()->offsetText() );
     } else {
         mItem->setText(5, i18n("No"));
     }
-    mItem->setText(6, e->recurrence()->recurrenceText());
+    mItem->setText(6, e->recurrenceText());
     if( ! e->doesRecur() )
         mItem->setSortKey( 6, "-" );
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,e->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( e->calID() ));
     mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
 
     QString key; 
     QDate d = e->lastModified().date();
     QTime t = e->lastModified().time();
     key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
     mItem->setSortKey(12,key);
     t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
     key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
     mItem->setSortKey(1,key);
 
     t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
     key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
     mItem->setSortKey(3,key);
     return true;
 }
 
 bool ListItemVisitor::visit(Todo *t)
 {
     mItem->setText(0,t->summary());
     if ( t->isCompleted() ) {
         mItem->setSortKey(0,"99"+ t->summary().left(10));
     } else 
         mItem->setSortKey(0,QString::number( t->percentComplete()+1 )+ t->summary().left(10));
     mItem->setPixmap( 0, *(sgListViewCompletedPix[t->percentComplete()/20]));
     if (t->hasStartDate()) {
         mItem->setText(1,t->dtStartDateStr());
         if (t->doesFloat()) {
             mItem->setText(2,"---");
         } else {
             mItem->setText(2,t->dtStartTimeStr());
         }
     } else {
         mItem->setText(1,"---");
         mItem->setText(2,"---");
     }
     mItem->setText(3,"---");
     mItem->setText(4,"---");  
     if ( t->isAlarmEnabled() ) {
         mItem->setText(5,t->alarms().first()->offsetText() );
     } else {
         mItem->setText(5, i18n("No"));
     }
-    mItem->setText(6, t->recurrence()->recurrenceText());
+    mItem->setText(6, t->recurrenceText());
     if( ! t->doesRecur() )
         mItem->setSortKey( 6, "-" );
     if (t->hasDueDate()) {
         mItem->setText(7,t->dtDueDateStr());
         if (t->doesFloat()) {
             mItem->setText(8,"---");
         } else {
             mItem->setText(8,t->dtDueTimeStr());
         }
     } else {
         mItem->setText(7,"---");
         mItem->setText(8,"---");
     }
     mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,t->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( t->calID() ));
     mItem->setText(12, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
     QString key;
     QDate d = t->lastModified().date();
     QTime tm = t->lastModified().time();
     key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
     mItem->setSortKey(12,key);
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(7,key);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
         tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
 { 
     
     QString des;
     mItem->setPixmap( 0, *sgListViewJournalPix);
     if ( !j->summary().isEmpty() ) {
         des = j->summary();
     } else {
         des = j->description().left(30);
         des = des.simplifyWhiteSpace ();
         des.replace (QRegExp ("\\n"),"" );
         des.replace (QRegExp ("\\r"),"" );
     }
     mItem->setText(0,des.left(25));
     mItem->setSortKey(0,"0"+ des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
     mItem->setText(10,j->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
     mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
 
     QString key; 
     QDate d = j->lastModified().date();
     QTime tm = j->lastModified().time();
     key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
     mItem->setSortKey(12,key);
     d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
     
     mActiveItem = 0;
     mForceShowCompletedTodos = false;
     mListView = new KOListViewListView(this);
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
     mListView->addColumn(i18n("End Date"));
     mListView->addColumn(i18n("End Time"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Due Date"));
     mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
     mListView->addColumn(i18n("Calendar"));
     mListView->addColumn(i18n("Last Modified"));
 
     mListView->setColumnAlignment(0,AlignLeft);
     mListView->setColumnAlignment(1,AlignLeft);
     mListView->setColumnAlignment(2,AlignHCenter);
     mListView->setColumnAlignment(3,AlignLeft);
     mListView->setColumnAlignment(4,AlignHCenter);
     mListView->setColumnAlignment(5,AlignLeft);
     mListView->setColumnAlignment(6,AlignLeft);
     mListView->setColumnAlignment(7,AlignLeft);
     mListView->setColumnAlignment(8,AlignLeft);
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
     mListView->setColumnAlignment(11,AlignLeft);
     mListView->setColumnAlignment(12,AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
     for ( iii = 0; iii< 13 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
     QPopupMenu* selPopup = new QPopupMenu ( this );
     mPopupMenu->insertSeparator();
     
     selPopup->insertItem(i18n("All"),this,
                                   SLOT(allSelection()));
     selPopup->insertItem(i18n("None"),this,
                                   SLOT(clearSelection()));
     selPopup->insertItem(i18n("Delete selected..."),this,
                                   SLOT(deleteAll()));
     mPopupMenu->insertItem(i18n("Selection"), selPopup );
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Hide all selected"),this,
                                   SLOT(hideAll()),true);
 
     selPopup->insertSeparator();
     QPopupMenu * exportPO = new QPopupMenu ( this );
     selPopup->insertItem( i18n("Export"),  exportPO );
 #ifdef DESKTOP_VERSION
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Print complete list..."),this,
                                   SLOT(printList()),true);
 #endif
     mCalPopup = new QPopupMenu ( this );
     selPopup->insertItem( i18n("Set Calendar"),  mCalPopup );
 
     selPopup->insertItem(i18n("Set categories")+"...",this,
                          SLOT(setCat()) );
     selPopup->insertItem( i18n("Set alarm..."),this,
                           SLOT(setAlarm()));
 #if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Set categories")+"...",this,
                                   SLOT(setCat()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Set alarm..."),this,
                                   SLOT(setAlarm()),true); 
 #endif
     QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this,
                      SLOT( populateCalPopup() ));
     QObject::connect(mCalPopup,SIGNAL(activated( int )),this,
                      SLOT( setCalendar( int ) ));
     QObject::connect(mPopupMenu,SIGNAL(categoryChanged( Incidence * )),this,
                      SLOT( catChanged( Incidence * ) ));
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
                                   SLOT(saveToFile()));
     exportPO->insertItem( i18n("As vCal (vcs) file..."),this,
                                   SLOT(saveToFileVCS()));
     exportPO->insertItem( i18n("Journal/Details..."),this,
                                   SLOT(saveDescriptionToFile()));
     // mPopupMenu->insertSeparator();
     // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
     //                            i18n("Add Categ. to selected..."),this,
     //                            SLOT(addCat()),true);
     //mPopupMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
     selPopup->insertSeparator();
     selPopup->insertItem( i18n("Beam via IR..."),this,
                           SLOT(beamSelected()));
 #if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Beam via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
 #endif
     /*
       mPopupMenu = new QPopupMenu;
       mPopupMenu->insertItem(i18n("Edit Event"), this,
       SLOT (editEvent()));
       mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this,
       SLOT (deleteEvent()));
       mPopupMenu->insertSeparator();
       mPopupMenu->insertItem(i18n("Show Dates"), this,
       SLOT(showDates()));
       mPopupMenu->insertItem(i18n("Hide Dates"), this,
       SLOT(hideDates()));
     */
     QObject::connect(mListView,SIGNAL( newEvent()),
                      this,SIGNAL(signalNewEvent()));
     QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
                      this,SLOT(defaultItemAction(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
                                                            const QPoint &, int )),
                      this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
     QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
                      SLOT(processSelectionChange(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 #if QT_VERSION >= 0x030000
 
 #else
     delete mKOListViewWhatsThis;
 #endif 
 }
 
 void KOListView::catChanged( Incidence* inc)
 {
     KOListViewItem* item = getItemForEvent(inc);
     if (item) { 
         ListItemVisitor v(item, mStartDate );
         inc->accept(v);
     }
 }
 QString KOListView::getWhatsThisText(QPoint p)
 {
     KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p );
     if ( item )
         return KIncidenceFormatter::instance()->getFormattedText( item->data(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
     return i18n("That is the list view" );
 
 }
 
 void KOListView::setCalendar( int c )
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
                                        i18n("This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!").arg( KOPrefs::instance()->calName( c ) ),
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
     
     QPtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
     if ( icount ) {
         Incidence *incidence = delSel.first();
         while ( incidence ) {
             incidence->setCalID( c );
             KOListViewItem * item = getItemForEvent( incidence );
             if ( item ) {
                 ListItemVisitor v(item, mStartDate );
                 incidence->accept(v);
             }
             incidence = delSel.next();
         }
     }
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
         mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
         mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
         if ( cal->isStandard )
             mCalendar->setDefaultCalendar( cal->mCalNumber );
         cal = calendars.next();
     }
     mCalendar->setSyncEventsReadOnly();
     mCalendar->reInitAlarmSettings();
 
 }
 void KOListView::populateCalPopup()
 {
     mCalPopup->clear();
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         int index = mCalPopup->insertItem( kkf->mName+"...", kkf->mCalNumber);
         if ( kkf->mErrorOnLoad || kkf->isReadOnly )
         mCalPopup->setItemEnabled( index, false );
         kkf = KOPrefs::instance()->mCalendars.next();
     }
 }
 void KOListView::updateList()
 {
     // qDebug(" KOListView::updateList() ");
 
 }
 
 void KOListView::clearList()
 {
     clear ();
 }
 
 void KOListView::setCat()
 {
 
     bool set = true;
     int result = KMessageBox::warningYesNoCancel(this, 
                                                  i18n("Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?"),
                                                  i18n("Set categories"),
                                                  i18n("Add"),
                                                  i18n("Reset"));
     if (result == KMessageBox::Cancel) return;
     if (result == KMessageBox::Yes) set = false;
     setCategories( set );
 }
 
 void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
         return;
     QPtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
     Incidence* inc = delSel.first();
     int count = 0;
     while ( inc ) {
         ++count;
         if (kap.mAlarmButton->isChecked()) {
             if (inc->alarms().count() == 0) 
                 inc->newAlarm();
             Alarm *alarm = inc->alarms().first();
             alarm->setEnabled(true);
             int j = kap.mAlarmTimeEdit->value()* -60;
             if (kap.mAlarmIncrCombo->currentItem() == 1)
                 j = j * 60;
             else if (kap.mAlarmIncrCombo->currentItem() == 2)
                 j = j * (60 * 24);
             alarm->setStartOffset( j );
 
             if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
                 alarm->setProcedureAlarm(kap.mAlarmProgram);
             }
             else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
                 alarm->setAudioAlarm(kap.mAlarmSound);
             else
                 alarm->setType(Alarm::Invalid);
         } else {
             QPtrList<Alarm> alarms = inc->alarms();
             Alarm *alarm;
             for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                 alarm->setEnabled(false);
                 alarm->setType(Alarm::Invalid);
             }
         }
         KOListViewItem* item = getItemForEvent(inc);
         if (item) { 
             ListItemVisitor v(item, mStartDate );
             inc->accept(v);
         }
         inc = delSel.next();   
     }
     topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count )  );
     qDebug("KO: Set alarm for %d items", count);
     calendar()->reInitAlarmSettings();
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::setCategories( bool removeOld )
 {
    
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     csd->setColorEnabled();
     if (! csd->exec()) { 
         delete csd;
         return;
     }
     QStringList catList = csd->selectedCategories();
     delete csd;
     QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
     Incidence* inc = delSel.first();
     while ( inc ) {
         if ( removeOld ) {
             inc->setCategories( catList, false );
         } else {
             inc->addCategories( catList, false );
         } 
         KOListViewItem* item = getItemForEvent(inc);
         if (item) { 
             ListItemVisitor v(item, mStartDate );
             inc->accept(v);
         }
         inc = delSel.next();
     }
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 
 void KOListView::beamSelected()
 {
     QPtrList<Incidence> delSel = getSelectedIncidences() ;
     if ( delSel.count() )
         emit beamIncidenceList( delSel );
 }
 
 void KOListView::saveDescriptionToFile()
 {
 
     int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
                                        i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."),
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
     QPtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
     if ( icount ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
     
         if ( fn == "" )
             return;
         QFileInfo info;
         info.setFile( fn );
         QString mes;
         bool createbup = true;
         if ( info. exists() ) { 
             mes =  i18n("File already exists!\nOld file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false )  );
             int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                                i18n("Overwrite!"), i18n("Cancel"), 0,
                                                0, 1 );
             if ( result != 0 ) {
                 createbup = false;
             }
         }
         if ( createbup ) {
             QString text = i18n("KO/Pi Description/Journal save file.\nSave date: ") + 
                 KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false);
             Incidence *incidence = delSel.first();
             icount = 0;
             while ( incidence ) {
                 if ( incidence->typeID()  == journalID ) {
                     text += "\n************************************\n";
                     if ( !incidence->summary().isEmpty() )
                         text += i18n("Journal: %1 from ").arg( incidence->summary() )  +incidence->dtStartDateStr( false );
                     else
                         text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
                     if ( !incidence->location().isEmpty() )
                         text +="\n(" +  i18n("Location: ") + incidence->location()+ ")";
                     text +="\n" +  i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                     text +="\n" +  i18n("Description: ") + "\n"+ incidence->description();
                     ++icount;
 
                 } else {
                     if ( !incidence->description().isEmpty() ) {
                         text += "\n************************************\n";
                         if ( incidence->typeID()  == todoID )
                             text += i18n("To-Do: ");
                         text += incidence->summary();
                         if ( !incidence->location().isEmpty() )
                             text +="\n(" +  i18n("Location: ") + incidence->location()+ ")";
                         if ( incidence->hasStartDate() )
                             text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false );
                         text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                         text += "\n" + i18n("Description: ") + "\n" + incidence->description();
                         ++icount;
 
                     }
                 }
                 incidence = delSel.next();
             }
             QFile file( fn );
             if (!file.open( IO_WriteOnly ) ) {
                 topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); 
                 return;
             }  
             QTextStream ts( &file );
             ts << text;
             file.close();
             //qDebug("%s ", text.latin1());
             mes = i18n("KO/Pi:Saved %1 descriptions/journals").arg(icount );
             KOPrefs::instance()->mLastSaveFile = fn;
             topLevelWidget()->setCaption(mes); 
         }
     }
 }
 void KOListView::saveToFileVCS()
 {
     writeToFile( false );
 }
 void KOListView::saveToFile()
 {
     writeToFile( true );
 }
 QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
 {
     QPtrList<Incidence> delSel ;
     bool addSubTodos = false;
     bool askSubTodos = true;
     QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             Incidence* inc = ((KOListViewItem *)item)->data();
             if ( ( addSubTodos && delSel.findRef( inc ) == -1) || !addSubTodos   ) {
                 if ( (inc->typeID() == todoID && includeTodos) || 
                      (inc->typeID() == eventID && includeEvents) || 
                      (inc->typeID() == journalID && includeJournals) ) {
                     if ( inc->typeID() == todoID && onlyDueTodos ) {
                         if ( ((Todo*)inc)->hasDueDate() )
                             delSel.append( inc );
                     } else
                         delSel.append( inc );
                     
                 }
             }
             if ( inc->typeID() == todoID ) {
                 Todo * todo = (Todo*) inc; 
                 if ( todo->relations().count() ) {
                     if ( askSubTodos ) {
                         int result = KMessageBox::warningYesNoCancel(this, 
                                                                      i18n("One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?"),
                                                                      i18n("Todo has subtodos"),
                                                                      i18n("Yes"),
                                                                      i18n("No"));
                         if ( result == KMessageBox::Cancel ) {
                             delSel.clear();
                             return delSel;
                         }
                         if (result == KMessageBox::Yes) 
                             addSubTodos = true;
                         askSubTodos = false;
                     }
                     if ( addSubTodos ) {
                         QPtrList<Incidence> tempSel ;
                         inc->addRelationsToList( &tempSel );
                         Incidence* tempinc = tempSel.first();
                         while ( tempinc ) {
                             if ( delSel.findRef( tempinc ) == -1 ) {
                                 if ( tempinc->typeID() == todoID && onlyDueTodos ) {
                                     if ( ((Todo*)tempinc)->hasDueDate() )
                                         delSel.append( tempinc );
                                 } else
                                     delSel.append( tempinc );
                             }
                             tempinc = tempSel.next();
                         }
                     }
                 }
             }
         }
         item = item->nextSibling();
     }
     return delSel;
 }
 
 void KOListView::writeToFile( bool iCal )
 {
     QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
     if ( !iCal ) {
         bool journal = false;
         Incidence *incidence = delSel.first();
         while ( incidence ) {
             if ( incidence->typeID() == journalID ) {
                 journal = true;
                 break;
             }
             incidence = delSel.next();
         }
         if ( journal ) {
             int result = KMessageBox::warningContinueCancel(this,
                                                             i18n("The journal entries can not be\nexported to a vCalendar file."),
                                                             i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"),
                                                             true);
             if (result != KMessageBox::Continue) return;
         }
     }
     if ( delSel.count() ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         QString extension;
         if ( iCal ) {
             if ( fn.right( 4 ).lower() == ".vcs" ) {
                 fn = fn.left( fn.length() -3) + "ics";
             }
         } else {
             if ( fn.right( 4 ).lower() == ".ics" ) {
                 fn = fn.left( fn.length() -3) + "vcs";
             }
         }
         fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
     
         if ( fn == "" )
             return;
         QFileInfo info;
         info.setFile( fn );
         QString mes;
         bool createbup = true;
         if ( info. exists() ) { 
             mes =  i18n("File already exists!\nOld file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false )  );
             int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                                i18n("Overwrite!"), i18n("Cancel"), 0,
                                                0, 1 );
             if ( result != 0 ) {
                 createbup = false;
             }
         }
         if ( createbup ) {
             CalendarLocal cal;
             cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
             Incidence *incidence = delSel.first();
             while ( incidence ) {
                 cal.addIncidence( incidence->clone() );
                 incidence = delSel.next();
             }
             if ( iCal ) {
                 ICalFormat format;
                 format.save( &cal, fn );
             } else {
                 
                 VCalFormat format;
                 format.save( &cal, fn );
             }
             mes = i18n("KO/Pi:Saved %1").arg(fn );
             KOPrefs::instance()->mLastSaveFile = fn;
             topLevelWidget()->setCaption(mes); 
         }
     }
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void  KOListView::hideAll()
 {
     QPtrList<QListViewItem> delSel ;
     QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             delSel.append(item);
         }
         item = item->nextSibling();
     }
     item = delSel.first() ;
     while ( item ) {
         QListViewItem * del = item;
         item = delSel.next();
         delete del;
     }
 }
 void  KOListView::printList()
 {
     mListView->printList();
 }
 void KOListView::deleteAll()
 {
     QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
     if ( delSel.count() ) {
         int icount = delSel.count();
         Incidence *incidence = delSel.first();
         Incidence *toDelete;   
         KOPrefs *p = KOPrefs::instance();
         bool confirm = p->mConfirm;
         QString mess;
         mess = mess.sprintf( i18n("You have %d item(s) selected.\n"), icount );
         if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, mess + i18n("All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n"), i18n("KO/Pi Confirmation"),i18n("Delete")) ) {
             p->mConfirm = false;
             int delCounter = 0;
             QDialog dia ( this, "p-dialog", true ); 
             QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); 
             QVBoxLayout lay( &dia );
             lay.setMargin(7); 
             lay.setSpacing(7); 
             lay.addWidget( &lab);
             QProgressBar bar( icount, &dia );
             lay.addWidget( &bar);
             int w = 220;
             int h = 50;
             int dw = QApplication::desktop()->width();
             int dh = QApplication::desktop()->height();
             dia.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
             //dia.resize( 240,50 );
             dia.show();
             KOPrefs::instance()->mGlobalUpdateDisabled = true;
             while ( incidence ) {
                 bar.setProgress( delCounter );
                 mess = mess.sprintf( i18n("Deleting item %d ..."), ++delCounter );
                 dia.setCaption( mess );
                 qApp->processEvents();
                 toDelete =  (incidence);
                 incidence = delSel.next();
                 emit deleteIncidenceSignal(toDelete ); 
                 if (  dia.result() != 0 )
                     break;
                
             }
             KOPrefs::instance()->mGlobalUpdateDisabled = false;
             emit deleteIncidenceSignal( 0 ); 
             mess = mess.sprintf( i18n("%d items remaining in list."), count() );
             topLevelWidget ()->setCaption( mess );
             p->mConfirm = confirm;
         }    
     }  
         
 
 }
 int KOListView::maxDatesHint()
 {
     return 0;
 }
 
 int KOListView::currentDateCount()
 {
     return 0;
 }
 
 QPtrList<Incidence> KOListView::selectedIncidences()
 {
     QPtrList<Incidence> eventList;
     QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             eventList.append(((KOListViewItem *)item)->data());
         }
 
         item = item->nextSibling();
     }
 
     //  // QListViewItem *item = mListView->selectedItem();
     //if (item) eventList.append(((KOListViewItem *)item)->data());
 
     return eventList;
 }
 
 DateList KOListView::selectedDates()
 {
     DateList eventList;
     return eventList;
 }
 
 void KOListView::showDates(bool show)
 {
     // Shouldn't we set it to a value greater 0? When showDates is called with
     // show == true at first, then the columnwidths are set to zero.
     static int oldColWidth1 = 0;
     static int oldColWidth3 = 0;
 
     if (!show) {
         oldColWidth1 = mListView->columnWidth(1);
         oldColWidth3 = mListView->columnWidth(3);
         mListView->setColumnWidth(1, 0);
         mListView->setColumnWidth(3, 0);
     } else {
         mListView->setColumnWidth(1, oldColWidth1);
         mListView->setColumnWidth(3, oldColWidth3);
     }
     mListView->repaint();
 }
 
 void KOListView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                               const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Day, fd, td);
 #endif
 }
 
 void KOListView::showDates()
 {
     showDates(true);
 }
 
 void KOListView::hideDates()
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 498d9b0..eea9a4d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -22,1854 +22,1856 @@
 #include <qfontmetrics.h>
 #include <qkeycode.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qwidgetstack.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qtimer.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
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 
 #endif
 class KNOWhatsThis :public QWhatsThis
 {
 public:
     KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
     //~KNOWhatsThis( ) {qDebug("~KNOWhatsThis( ) "); };
 
 protected:
     virtual QString text( const QPoint& p)
     {
         return _wid->getWhatsThisText(p) ;
     };
 private:
     KNoScrollListBox* _wid;
   
 };
  
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
     : QListBox(parent, name, WRepaintNoErase)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     mWT = new KNOWhatsThis(this);
     resetOnFocusIn = true;
     setVScrollBarMode(QScrollView::AlwaysOff);
     setHScrollBarMode(QScrollView::AlwaysOff);
 }
 KNoScrollListBox::~KNoScrollListBox()
 {
 #if QT_VERSION >= 0x030000
 
 #else
     delete mWT;
 #endif 
 }
 
 
 void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
 {
     QListBox::focusInEvent ( e );
     if ( count() ){
         int ci = currentItem();
         if ( ci < 0 ) ci = 0;
     
         setCurrentItem( ci );
         setSelected ( ci, true ); 
         emit highlighted( item ( ci ) );
  
         resetOnFocusIn = true;
 
         if (  KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) {
             QListBoxItem *fi =  firstItem ();
             if (fi ) {
                 int ihei = fi->height( this );
                 int hei = numRows ()  * ihei;
                 if ( hei < height() - horizontalScrollBar()->height () ) {
                     setVScrollBarMode(QScrollView::AlwaysOff);
                 }
                 else 
                     setVScrollBarMode(QScrollView::Auto);
                 if ( ihei *3 > height() ) {
                     setHScrollBarMode(QScrollView::AlwaysOff);
                 }
                 else {
                     setHScrollBarMode(QScrollView::Auto);
                 }
             } else {
                 setVScrollBarMode(QScrollView::Auto);
                 setHScrollBarMode(QScrollView::Auto);
             }
         } 
     }
 }
 void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
 {
     int i =  currentItem ();
     if ( i >= 0 ) {
         setSelected ( i, false ); 
     }
     QListBox::focusOutEvent ( e ); 
     setVScrollBarMode(QScrollView::AlwaysOff);
     setHScrollBarMode(QScrollView::AlwaysOff);
     emit highlightIncidence( 0, (MonthViewCell*)this, 0 );
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
     //qDebug("KNoScrollListBox::keyPressEvent ");
     switch(e->key()) {
     case Key_Right:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
         }
         scrollBy(10,0);
         break;
     case Key_Left:
         if (e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
         {
             e->ignore();
             return;
         }
         scrollBy(-10,0);
         break;
     case Key_Up:
         if( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         if ( count() ) { 
             if ( currentItem() == 0 ) {
                 emit prevCell();
             } else {
                 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(e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         if ( count () ) { 
             if ( ((uint)currentItem()+1) == count () ) {
                 emit nextCell();
             } else {
                 setCurrentItem((currentItem()+1)%count());
                 if(!itemVisible(currentItem())) {
                     if(currentItem() == 0) {
                         setTopItem(0);
                     } else {
                         setTopItem(topItem()+1);
                     }
                 }
             }
         }
         break;
     case Key_I:
         QTimer::singleShot( 1, this, SLOT ( oneDown() ) );
         e->ignore();
         break; 
     case Key_Return:
     case Key_Enter:
         {
             if ( currentItem() >= 0 ) {
                 emit doubleClicked( item( currentItem() ) );
                 e->accept();
             } else {
                 e->ignore();
             }
         }
         break;
     case Key_Shift:
         emit shiftDown();
         break;
     default:
         e->ignore();
         break;
     }
 }
 
 void KNoScrollListBox::oneDown()
 {
     if ( count () ) {  
         if ( ((uint)currentItem()+1) == count () ) {
             emit nextCell();
         } else {
             resetOnFocusIn = false;
             setCurrentItem((currentItem()+1)%count());
             if(!itemVisible(currentItem())) {
                 if(currentItem() == 0) {
                     setTopItem(0);
                 } else {
                     setTopItem(topItem()+1);
                 }
             }
         }
     }
 }
 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, const QString & s)
     : QListBoxItem()
 {
     mblockRepaint = true;
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
     recycle( incidence, s );
 }
 void MonthViewItem::recycle( Incidence *incidence,  const QString & s)
 { 
     mDisplayHighlighted = false;
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false; 
     mdayPos = 0;
 }
 
 bool MonthViewItem::setHighlightedFalse()
 {
     if ( !mDisplayHighlighted )
         return false;
     mDisplayHighlighted = false;
     return true;
 }
 
 bool MonthViewItem::setHighlighted( Incidence * inc )
 {
     if ( inc == mIncidence ) {
         if ( mDisplayHighlighted )
             return false;
         mDisplayHighlighted = true;
         return true;
     } else {
         if ( !mDisplayHighlighted )
             return false;
         mDisplayHighlighted = false;
         return true;
     }
     return false;
 }
 void MonthViewItem::paint(QPainter *p)
 {
     if ( mblockRepaint || !mIncidence ) {
         return;
     }
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
 #endif 
     int heihei = height( listBox () );
     int x = 1;
     if (KOPrefs::instance()->mMonthViewUsesCategoryColor || mDisplayHighlighted || sel )
         {
            
             p->setBackgroundColor( palette().color( QPalette::Normal,  \
                                                     sel ||mDisplayHighlighted  ? QColorGroup::Highlight : QColorGroup::Background ) );
             p->eraseRect( 0, 0, listBox()->maxItemWidth(), heihei );
         }
    
     //int y = 3;//(height() - mRecurPixmap.height()) /2; 
     int size = PIXMAP_SIZE;
     if ( QApplication::desktop()->width() < 300 )
         size = 3;
     int y = (heihei - size -1 ) /2; 
 
     if ( mIncidence->calID() > 1 ) {
         p->fillRect ( x, y-2,size,size+4, KOPrefs::instance()->defaultColor( mIncidence->calID() ) );
         p->drawRect ( x, y-2,size,size+4);
         x += size + 1;
     }
     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 ( sel ) p->setPen( Qt::white );
     else p->setPen( palette().color( QPalette::Normal,QColorGroup::Foreground ) ); 
 
 #if 0
         p->setPen( palette().color( QPalette::Normal, sel ?                 \
                                QColorGroup::HighlightedText : QColorGroup::Foreground ) ); 
 #endif
     QColor textColor = p->pen().color();
 
 
     if ( mMultiday ) { 
         int yyy = y+(size/2);
         int sizeM = size+2;
         p->setBrush( QBrush( textColor ) );
         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->typeID() == todoID ){
         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-2, val ,size+4,textColor );
             p->drawRect ( x, y-2,7,size+4);
             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();
   
     if ( KOPrefs::instance()->mMonthShowTimes || isWeekItem) {
         p->drawText( x, yPos, text() );
         if ( mIncidence->cancelled() ) {
             int wid = fm.width( text() );
             p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
         }
     } else {
         QString pText = text();
         if( pText.mid(2,1) == ":" )
             pText =  pText.mid( 6 );
         p->drawText( x, yPos,  pText );
         if ( mIncidence->cancelled() ) {
             int wid = fm.width( pText );
             p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
         }
     }  
 }
 
 int MonthViewItem::height(const QListBox *lb) const
 {
     int ret = 10;
     if ( lb )
         ret = lb->fontMetrics().lineSpacing()+1;
     return ret;
 }
 
 int MonthViewItem::width(const QListBox *lb) const
 { 
     if( KOPrefs::instance()->mEnableMonthScroll || isWeekItem ) {
         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 );
     }
     if ( ! lb )
         return 10;
     return lb->width();
 }
 
 
 MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     : KNoScrollListBox( par ),
       mMonthView( parent )
 {
     //QVBoxLayout *topLayout = new QVBoxLayout( this );
     currentPalette = 0; 
     // 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 );
     setMinimumSize( 10, 10 );
     setFrameStyle( QFrame::Panel | QFrame::Plain );
     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( this , SIGNAL( doubleClicked( QListBoxItem *) ),
              SLOT( defaultAction( QListBoxItem * ) ) );
     connect( this, SIGNAL( rightButtonPressed( QListBoxItem *,
                                                     const QPoint &) ),
              SLOT( contextMenu( QListBoxItem * ) ) );
     connect( this, SIGNAL( highlighted( QListBoxItem *) ),
              SLOT( selection( QListBoxItem * ) ) );
    
     /* 
     connect( this, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( selection( QListBoxItem * ) ) ); 
     */
 }
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
     if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
     return mToolTipGroup;
 }
 #endif
  
 void MonthViewCell::setDate( const QDate &date )
 {
     //  kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl;
     mDate = date;
 
  
 
     //resizeEvent( 0 );
 }
 
 QDate MonthViewCell::date() const
 {
     return mDate;
 }
 
 void MonthViewCell::setPrimary( bool primary )
 {
     mPrimary = primary;
     //setMyPalette();
 }
 void MonthViewCell::setMyPalette()
 {
    
     if ( mHoliday) {
         if ( currentPalette == 1 ) return;
         mLabel->setPalette( QPalette ( mHolidayPalette.color( QPalette::Normal,QColorGroup::Base),mHolidayPalette.color(QPalette::Normal,QColorGroup::Base )  ));
         setPalette( mHolidayPalette );
         //mLabel->setPalette( mHolidayPalette );
         currentPalette = 1;
 
     } else {
         if ( mPrimary ) {
             if ( currentPalette == 2 ) return;
             mLabel->setPalette( QPalette ( mPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mPrimaryPalette.color(QPalette::Normal,QColorGroup::Base )  ));
             //mLabel->setPalette( mPrimaryPalette );
             setPalette( mPrimaryPalette );
             currentPalette = 2;
 
         } else {
             if ( currentPalette == 3 ) return;
             setPalette( mNonPrimaryPalette );
              mLabel->setPalette( QPalette ( mNonPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mNonPrimaryPalette.color(QPalette::Normal,QColorGroup::Base )  ));
              //mLabel->setPalette( mNonPrimaryPalette );;
              currentPalette = 3;
         }
     }
     //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::startUpdateCell()
 {
     blockSignals( true );
     mdayCount = 0;
     setFocusPolicy(NoFocus); 
     if ( !mMonthView->isUpdatePossible() )
         return;
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
     }
     if ( mAvailItemList.count() > 20 ) {
         mAvailItemList.setAutoDelete( true );
         mAvailItemList.clear();
         mAvailItemList.setAutoDelete( false );
         clear();
     }
    
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         setLineWidth( 3 );
     } else {
         setLineWidth( 1 );
     }
     MonthViewItem* CurrentAvailItem = (MonthViewItem*) firstItem ();
     //clear(); 
     while ( CurrentAvailItem ) {
             MonthViewItem *item = CurrentAvailItem;
             //item->setHighlightedFalse();
             item->recycle( 0, "");
             CurrentAvailItem = (MonthViewItem *)item->next();
             mAvailItemList.append( item ); 
             takeItem ( item );
     }
 
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
 #endif 
     mToolTip.clear(); 
     //qApp->processEvents();
 #if 0
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         insertItem( item );
         mToolTip.append ( mHolidayString ); 
     }
 #endif
 }
 
 int MonthViewCell::insertEvent(Event *event)
 {
     bool useToolTips = true;
 #ifndef DESKTOP_VERSION
     useToolTips = false;
 #endif    
     QString mToolTipText;
     setFocusPolicy(WheelFocus); 
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 return mdayCount;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return mdayCount;
         }
         
         if ( event->isHoliday()) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 setLineWidth( 3 );
         }
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             if ( useToolTips )
                 mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 if ( useToolTips )
                     mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 if ( useToolTips )
                     mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( useToolTips && ! event->location().isEmpty() ) {
             mToolTipText += " (" + event->location() +")";
         }
         MonthViewItem *item ;
         
         if ( mAvailItemList.count() ) {
             item = mAvailItemList.first();
             mAvailItemList.remove( item );
             item->recycle( event, text );
         } else {
             item = new MonthViewItem( event, 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);
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->defaultColor( event->calID() ));
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     //pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                     pal = QPalette( KOPrefs::instance()->defaultColor( event->calID() ), KOPrefs::instance()->defaultColor( event->calID() ));
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         pal.setColor(QColorGroup::Highlight, KOPrefs::instance()->mHighlightColor);
         item->setPalette( pal );
-        item->setRecur( event->recurrence()->doesRecur() );
+        item->setRecur( event->doesRecur() );
         item->setAlarm( event->isAlarmEnabled() && multiday < 2 && event->alarmEnabled() );
         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 );
         if ( multiday ) {
             insertItem( item ,mdayCount);
             ++mdayCount;
         } else {
             uint i = mdayCount;
             uint pos = mdayCount;
             uint itcount = count();
             if ( itcount > 1000 ) {
                 qDebug("KO: Bug in MonthViewCell::insertEvent %u ", itcount);
                 itcount = 0;
             }
             for ( i = pos; i < itcount;++i ) {
                 // qDebug("i %d mday %u count %d ",i,itcount,mdayCount );
                 QListBoxItem* it = this->item ( i );
                 if ( it && text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
             insertItem( item ,pos);
         }
         if ( useToolTips ) {
             mToolTip.append( mToolTipText );
         }
         return mdayCount;
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
         text += todo->summary();
         MonthViewItem *item ;
         if ( mAvailItemList.count() ) {
             item = mAvailItemList.first();
             mAvailItemList.remove( item );
             item->recycle( todo, text );
         } else {
             item = new MonthViewItem( todo, text );
         }
         //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);
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->defaultColor( todo->calID() ));
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     //pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                     pal = QPalette(KOPrefs::instance()->defaultColor( todo->calID() ), KOPrefs::instance()->defaultColor( todo->calID() ));
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         pal.setColor(QColorGroup::Highlight, KOPrefs::instance()->mHighlightColor);
         item->setPalette( pal );
-        item->setRecur( todo->recurrence()->doesRecur() );
+        item->setRecur( todo->doesRecur() );
         item->setAlarm( todo->isAlarmEnabled() && todo->alarmEnabled() );
         item->setMoreInfo( todo->description().length() > 0  );
         insertItem( item , count());
 #ifdef DESKTOP_VERSION
         mToolTip.append( text ); 
 #endif
 }
 void MonthViewCell::repaintfinishUpdateCell()
 {
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( false );
         updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();
     }
     blockSignals( false );
 }
 void MonthViewCell::finishUpdateCell()
 {
    
     
 
 #ifdef DESKTOP_VERSION
     if (mToolTip.count() > 0 ) {
         mToolTip.sort();
         QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
     }
 #endif
     //sort();
     //setMyPalette(); 
     setMyPalette();
   
     resizeEvent( 0 ); 
 
 }
 void 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 )
 {
     
     return;
     if ( enabled ) {
         QListBoxItem *fi =  firstItem ();
         if (fi ) {
             int ihei = fi->height( this );
             int hei = numRows ()  * ihei;
             if ( hei < height() - horizontalScrollBar()->height () ) {
                 setVScrollBarMode(QScrollView::AlwaysOff);
             }
             else 
                 setVScrollBarMode(QScrollView::Auto);
             if ( ihei *3 > height() ) {
                 setHScrollBarMode(QScrollView::AlwaysOff);
             }
             else {
                 setHScrollBarMode(QScrollView::Auto);
             }
         } else {
             setVScrollBarMode(QScrollView::Auto);
             setHScrollBarMode(QScrollView::Auto);
         }
     } else {
         setVScrollBarMode(QScrollView::AlwaysOff);
         setHScrollBarMode(QScrollView::AlwaysOff);
     }
 }
 
 Incidence *MonthViewCell::selectedIncidence()
 {
     int index = currentItem();
     if ( index < 0 ) return 0;
   
     MonthViewItem *mitem =
         static_cast<MonthViewItem *>( item( index ) );
 
     if ( !mitem ) return 0;
   
     return mitem->incidence();
 }
 
 QDate MonthViewCell::selectedIncidenceDate()
 {
     QDate qd;
     int index = currentItem();
     if ( index < 0 ) return qd;
     return mDate;
 }
 
 void MonthViewCell::deselect()
 {
     clearSelection();
     enableScrollBars( false );
     // updateCell();
 }
 void MonthViewCell::select()
 {
     ;// updateCell();
 }
 
 void MonthViewCell::resizeEvent ( QResizeEvent * e )
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
     //qDebug("++++++++++++++MonthViewCell::resizeEvent %d %d ", width(), height());
     deselect();
     mLabel->setMaximumHeight( height() - lineWidth()*2 );
     
     QString text;
     //mLabel->setText( 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 ) + " " + QString::number( mDate.day() );
         mLabel->resize( mLabelBigSize  );
     } else {
         mLabel->resize( mLabelSize );
         text = QString::number( mDate.day() );
     }
     mLabel->setText( text );
 
     int size = height() - mLabel->height() - lineWidth()-1;
     //qDebug("LW %d ", lineWidth());
     if ( size > 0 )
         verticalScrollBar()->setMaximumHeight( size );
     size = width() - mLabel->width() -lineWidth()-1;
     if ( size > 0 )
         horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-lineWidth() - mLabel->width(), height()-lineWidth() - mLabel->height() );
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     // mItemList->resize ( width(), height () ); 
     if ( e )
         KNoScrollListBox::resizeEvent (  e );
 }
 
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
   
     if ( !item ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->defaultAction( incidence );
 }
 void MonthViewCell::showDay()
 {
     emit showDaySignal( date() );
 }
 void MonthViewCell::newEvent()
 {
     QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
     emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
     mMonthView->setSelectedCell( this );
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     mMonthView->setPopupCell( this );
     if ( !item )  {
         mMonthView->showContextMenu( 0 );
         return;
     }
+    //selection( item );
+    //qApp->processEvents();
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) {
         emit highlightIncidence( 0 , this, 0 );
         return;
     }
     MonthViewItem * it = (static_cast<MonthViewItem *>( item ));
     emit highlightIncidence( it->incidence(), this, it->multiDay() );
     mMonthView->setSelectedCell( this );
 }
 
 void  MonthViewCell::deHighLight()
 {
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         if ( mitem->setHighlightedFalse() )
             updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();
     }
 }
 // returns true if no inc found
 bool MonthViewCell::doHighLight( Incidence * inc )
 {
  
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         if ( mitem->incidence() == inc ) {
             if ( mitem->setHighlighted( inc ) )
                 updateItem ( mitem );
             return false;
         }
         mitem = (MonthViewItem *)mitem->next();
     }
     return true;
 }    
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
     mFlagKeyPressed = false;
     mShortDayLabelsM = false;
     mShortDayLabelsW = false;
     skipResize = false;
     clPending = true;
     mPopupCell = 0;
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
     mWidStack = new QWidgetStack( this );
     QVBoxLayout* hb = new QVBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
     mWidStack->addWidget(mWeekView  );
 #else
     mWidStack->addWidget( mMonthView, 1 );
     mWidStack->addWidget( mWeekView , 1 );
 #endif
     hb->addWidget( mNavigatorBar );
     hb->addWidget( mWidStack );
     mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
     updatePossible = false;
     //updatePossible = true;
     mCells.setAutoDelete( true );
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.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( mMonthView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabels.insert( i, label );
         label = new QLabel( mWeekView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabelsW.insert( i, label );
     }
 
     bfont.setBold( false );
     mWeekLabels.resize( mNumWeeks+1 );
     mWeekLabelsW.resize( 2 );
     for( i = 0; i < mNumWeeks+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mMonthView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
     mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus);
     QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
     }
     mWeekLabelsW[1]->setText( i18n("W"));
     mWeekLabelsW[1]->setFocusPolicy(WheelFocus); 
 
 
     int row, col;
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
             MonthViewCell *cell = new MonthViewCell( this, mMonthView );
             mCells.insert( row * mDaysPerWeek + col, cell );
 
             connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                      SLOT( defaultAction( Incidence * ) ) );
             connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                      SIGNAL( newEventSignal( QDateTime ) ) );
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
             connect( cell, SIGNAL( nextCell() ),
                      SLOT( nextCell() ) );
             connect( cell, SIGNAL( prevCell() ),
                      SLOT( prevCell() ) );
             connect( cell, SIGNAL(  highlightIncidence( Incidence * , MonthViewCell *, int ) ),
                      SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
 
         connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                  SLOT( defaultAction( Incidence * ) ) );
         connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                  SIGNAL( newEventSignal( QDateTime ) ) );
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         connect( cell, SIGNAL( nextCell() ),
                  SLOT( nextCell() ) );
         connect( cell, SIGNAL( prevCell() ),
                  SLOT( prevCell() ) );
         connect( cell, SIGNAL(  highlightIncidence( Incidence * , MonthViewCell *, int ) ),
                  SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("New Event..."),this,
                                   SLOT(slotNewEvent()),false);
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("New Todo..."),this,
                                   SLOT(slotNewTodo()),false);
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Journal"),this,
                                   SLOT(slotEditJournal()),false);
 
     connect (mContextMenu ,SIGNAL(categoryChanged( Incidence * )),this,
                      SLOT( catChanged( Incidence * ) ));
 
 
     QString pathString = "";
     if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 )
             pathString += "icons16/";
     } else
         pathString += "iconsmini/";
     mNewItemMenu = new QPopupMenu( this );
     mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent()));
     mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false);
     mNewItemMenu->insertItem( SmallIcon( pathString +"journal" ),i18n("Journal"),this,SLOT(slotEditJournal()),false);
 
     // updateConfig(); //useless here...
     // ... but we need mWidthLongDayLabel computed
     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;
     }
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 
 #if 0
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 #endif
 
     emit incidenceSelected( 0 );
 
     mComputeLayoutTimer = new QTimer( this );
     connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout()));
 
 
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
 #else
     resize(640, 480 );
     updatePossible = true;
 #endif
     computeLayout();
 
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::catChanged( Incidence * )
 {
     updateView();
 }
 void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday )
 {
     static Incidence * lastInc = 0;
     static MonthViewCell * lastCell = 0;
     
     if ( lastInc == inc && lastCell == mc )
         return;
     lastInc = inc;
     lastCell = mc;
     //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
 
     bool weekview = false;
     uint index = 0;
     for (uint i = 0; i < mCellsW.count(); ++i) {
         if ( mCellsW[i] == mc ) {
             weekview = true;
             index = i;
             break;
         }
     }
     QPtrVector<MonthViewCell> *cells;
     if ( weekview ) 
         cells = &mCellsW;
     else {
         for (uint i = 0; i < mCells.count(); ++i) {
             if ( mCells[i] == mc ) {
                 index = i;
                 break;
             }
         }
         cells = &mCells;
     }
     for (uint i = 0; i < (*cells).count(); ++i) {
         (*cells)[i]->deHighLight();
     }
     if ( ! inc ) 
         return;
     
     uint count = (*cells).count();
     bool goLeft = (mday > 1 && index > 0);
     bool goRight = (mday < 3 && mday > 0 && index < count -1);
     for (uint iii = 1; iii < count; ++iii) {
         if ( goLeft ) {
             int left = index - iii;
             if ( left >= 0 ) {
                 if ( (*cells)[(uint)left]->doHighLight(inc) )
                     goLeft = false;
             } else 
                 goLeft = false;
         } 
         if ( goRight ) {
             uint right = index + iii;
             if ( right < count ) {
                 if ( (*cells)[right]->doHighLight(inc) )
                     goRight = false; 
 
             } else  
                 goRight = false; 
         }
 
     }
 #if 0
     if ( mday > 1 && index > 0 )
         for (int i = index-1; i >= 0; --i) {
             //qDebug("index %d iii %d ", index, i);
             if ( (*cells)[(uint)i]->doHighLight(inc) )
                 break;
         }
     if ( mday < 3 && mday > 0 && index < (*cells).count()-1)
         for (uint i = index+1; i < (*cells).count(); ++i) {
             if ( (*cells)[i]->doHighLight(inc) )
                 break;
         }
 #endif
     
 }
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();  
     if ( !KOPrefs::instance()->mMonthViewWeek )
         emit selectMonth ();
     else
         emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
         return mWeekLabelsW[0]->getWeekNum();
     return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView ); 
     clPending = false;
 }
 
 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;
 }
 #if 0
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 #endif
 void KOMonthView::updateConfig()
 {
  
     int mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) {
         mWeekStartsMonday = true;
     } 
     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 ( !  mShowWeekView ) {
         if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
             computeLayout();
     } else 
         doComputeLayoutWeek();
     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();
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     QPtrVector<QLabel> *mDayLabelsT;
 
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
        {
             bool show = mShortDayLabelsW;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (KGlobal::locale()->weekStartsMonday() || KOPrefs::instance()->mMonthViewSatSunTog ) {
             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::clearList()
 {
     unsigned int i;
     for( i = 0; i < mCells.size(); ++i ) {
         mCells[i]->clear();
     }  
     for( i = 0; i < mCellsW.size(); ++i ) {
         mCellsW[i]->clear();
     }
 }
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
     QPtrVector<MonthViewCell> *cells;
     QPtrVector<QLabel> *dayLabels;
     QPtrVector<KOWeekButton> *weekLabels;
     uint weekNum = 6;
     mStartDate = start;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
         weekLabels = &mWeekLabelsW;
         if ( !KGlobal::locale()->weekStartsMonday() ) {
             mStartDate = mStartDate.addDays( 1 );
         }
     } else {
         cells = &mCells;
         dayLabels = &mDayLabels;
         weekLabels = &mWeekLabels;
     }
 
     int mWeekStartsMonday =  KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) {
         mWeekStartsMonday = true;
     } 
     int startWeekDay = mWeekStartsMonday ? 1 : 7;
 
     while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
         mStartDate = mStartDate.addDays( -1 );
     }
     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.
     //qDebug("KOMonthView::changeEventDisplay ");
     updateView();
 }
 
 void KOMonthView::updateView()
 { 
 
     if ( !updatePossible )
         return;
     //qDebug("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU ");
     //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;
     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 
             if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
                 if ( event->uid().left(15) == QString("last-syncEvent-")  )
                     continue;
             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();
     //qApp->processEvents();
      for( i = 0; i < timeSpan+1; ++i ) {
          //(*cells)[i]->repaintfinishUpdateCell();
          QTimer::singleShot( 0, (*cells)[i], SLOT ( repaintfinishUpdateCell() ) );
     }
      setKeyBFocus();
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < (*cells).count(); ++i ) {
         (*cells)[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::setKeyBoardFocus()
 {
     //qDebug("KOMonthView::setKeyBoardFocus() ");
     bool shootAgain = false;
     if ( mShowWeekView ) {
         shootAgain = !mWeekLabelsW[1]->hasFocus();
          mWeekLabelsW[1]->setFocus();
     }
     else {
         shootAgain = !mWeekLabels[mNumWeeks]->hasFocus();
          mWeekLabels[mNumWeeks]->setFocus();
     }
     --mKBFcounter;
     if ( shootAgain && mKBFcounter > 0 ) {
       QTimer::singleShot( 50, this, SLOT ( setKeyBoardFocus() ) );
     }
 }
 void KOMonthView::setKeyBFocus()
 {
     //qDebug("KOMonthView::setKeyBFocus() ");
     mKBFcounter = 10;
     QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
 }
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( isVisible() ) {
         //qDebug("KOMonthView::isVisible ");
         slotComputeLayout();
     } else
         mComputeLayoutTimer->start( 100 );
     if ( e )
         KOEventView::resizeEvent( e );
 }
 
 void KOMonthView::slotComputeLayout()
 {
     mComputeLayoutTimer->stop();
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
     clPending = true;
     setKeyBFocus();
 }
 
 void KOMonthView::doComputeLayoutWeek()
 {
 
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 #ifdef DESKTOP_VERSION
     if ( !KOPrefs::instance()->mMonthViewWeekRowlayout ) {
         daysToShow = 2;
     } else 
 #endif
         {
         if ( wid < hei + 40 )
             daysToShow = 2;
         else
             daysToShow = 3;
     }
     bool landscape = (daysToShow == 3);
     mShowSatSunComp = true;
     combinedSatSun  = true;
         
     //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //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++) {
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 100a81b..682f83b 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -1,453 +1,454 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 1997, 1998 Preston Brown
     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.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qdir.h>
 #include <qdatetime.h>
 #include <qapplication.h>
 #include <qtabwidget.h>
 
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <libkcal/icalformat.h>
 #include <kresources/resourceselectdialog.h>
 #include <libkdepim/kdateedit.h>
 
 #include "koprefs.h"
 #include "kolocationbox.h"
 
 #include "kotodoeditor.h"
 extern int globalFlagBlockAgenda;
 
 KOTodoEditor::KOTodoEditor( Calendar *calendar, QWidget *parent ) :
   KOIncidenceEditor( i18n("Edit To-Do"), calendar, parent )
 {
   mTodo = 0;
   mRelatedTodo = 0;
   findButton(User1)->hide();
   init();
   if ( QApplication::desktop()->height() <= 240 )
       hideButtons();
 }
 
 KOTodoEditor::~KOTodoEditor()
 {
   emit dialogClose( mTodo );
 }
 
 void KOTodoEditor::init()
 {
   setupGeneral();
   setupAttendeesTab();
   setupRecurrence();
   connect(mGeneral,SIGNAL(datesChecked()),this ,SLOT(checkRecurrence()));
   mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>")  );
   connect(mGeneral,SIGNAL(dateTimesChanged(QDateTime,QDateTime)),
           mRecurrence,SLOT(setDefaultsDates(QDateTime,QDateTime)));
 }
 void KOTodoEditor::setupRecurrence()
 {
   QFrame *topFrame = addPage( i18n("Recurrence") );
   QBoxLayout *topLayout = new QVBoxLayout( topFrame );
 
   mRecurrence = new KOEditorRecurrence( topFrame );
   topLayout->addWidget( mRecurrence );
 }
 
 void  KOTodoEditor::setCategories( QString s )
 {
    mGeneral->setCategories(s);
 }
 void KOTodoEditor::setSecrecy( int sec )
 {
     mGeneral->setSecrecy( sec );
 }
 void KOTodoEditor::reload()
 {
   if ( mTodo ) readTodo( mTodo );
 }
 
 void KOTodoEditor::setupGeneral()
 {
   mGeneral = new KOEditorGeneralTodo(this);
   connect ( mGeneral, SIGNAL ( allAccepted() ), this, SLOT ( slotOk () ) );
 
   // connect(mGeneral,SIGNAL(openCategoryDialog()),mCategoryDialog,SLOT(show()));
   //connect(mCategoryDialog, SIGNAL(categoriesSelected(const QString &)),
   //      mGeneral,SLOT(setCategories(const QString &)));
 
   if (KOPrefs::instance()->mCompactDialogs) {
     QFrame *topFrame = addPage(i18n("General"));
 
     QBoxLayout *topLayout = new QVBoxLayout(topFrame);  
     if ( QApplication::desktop()->width() < 480 ) {
         topLayout->setMargin(marginHintSmall());
         topLayout->setSpacing(spacingHintSmall());
     } else {
         topLayout->setMargin(marginHint());
         topLayout->setSpacing(spacingHint());
     }
     topLayout->addStretch( 1 );
    mGeneral->initHeader(topFrame,topLayout);
     topLayout->addStretch( 1 );
     mGeneral->initTime(topFrame,topLayout); 
     topLayout->addStretch( 1 );
    mGeneral->initAlarm(topFrame,topLayout);
     topLayout->addStretch( 1 );
     mGeneral->enableAlarm( false );
     
   
     QBoxLayout *priorityLayout;
     if ( QApplication::desktop()->width() < 500 ) 
         priorityLayout = new QVBoxLayout( topLayout );
     else
         priorityLayout = new QHBoxLayout( topLayout );
     QWidget* prioWidget = new QWidget (topFrame);
     priorityLayout->addWidget(  prioWidget );
     QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget);
 
 
     QIconSet icon; 
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
         icon = SmallIcon("fileimport");
     QPushButton * loadTemplate = new QPushButton(  prioWidget);
     loadTemplate->setIconSet (icon ) ;
     int size = loadTemplate->sizeHint().height();
     loadTemplate->setFixedSize(  size, size );
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileexport16");
     else
         icon = SmallIcon("fileexport");
     QPushButton * saveTemplate = new QPushButton( prioWidget);
     saveTemplate->setIconSet (icon ) ;
     saveTemplate->setFixedSize(  size, size );
 
     priorityLayout2->addWidget(loadTemplate);
     priorityLayout2->addWidget(saveTemplate);
     mGeneral->initPriority(prioWidget,priorityLayout2);
     mGeneral->initCategories( topFrame, priorityLayout );
     topLayout->addStretch(1);
 
     QFrame *topFrame2 = addPage(i18n("Details"));
 
     QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
     topLayout2->setMargin(marginHint());
     topLayout2->setSpacing(spacingHint());
 
     QHBoxLayout *completionLayout = new QHBoxLayout( topLayout2 );
     mGeneral->initCompletion(topFrame2,completionLayout);
     
  
     mGeneral->initSecrecy( topFrame2, topLayout2 );
     mGeneral->initDescription(topFrame2,topLayout2); 
 
     // QHBox * hb = new QHBox ( topFrame2 );
     // topLayout2->addWidget(hb);
     // hb->setSpacing( 3 );
    
     connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
 
   } else {
     QFrame *topFrame = addPage(i18n("General"));
     
     QBoxLayout *topLayout = new QVBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint());
 
     mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout);
     mGeneral->initStatus(topFrame,topLayout);    
     QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,alarmLineLayout); 
     mGeneral->initDescription(topFrame,topLayout);
     QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
     mGeneral->initCategories( topFrame, detailsLayout );
     mGeneral->initSecrecy( topFrame, detailsLayout );
   }
   mGeneral->finishSetup();
   
 }
 
 void KOTodoEditor::editTodo(Todo *todo, bool editDescription)
 {
     //init();
 
   mTodo = todo;
   readTodo(mTodo);
   if ( editDescription ) {
       showPage( 1 );
       mGeneral->setFocusOn( 1 );
   } else {
       showPage( 0 );
       mGeneral->setFocusOn( 2 );
   }
   checkRecurrence();
 }
 
 void KOTodoEditor::newTodo(QDateTime due,Todo *relatedTodo,bool allDay)
 {
     //init();
 
   mTodo = 0;
   setDefaults(due,relatedTodo,allDay);
 }
 
 void KOTodoEditor::loadDefaults()
 {
   setDefaults(QDateTime::currentDateTime().addDays(7),0,false);
 }
 
 bool KOTodoEditor::processInput( bool emitTime )
 {
   if (!validateInput()) return false;
 
   Todo *todo = 0;
 
   if (mTodo) todo = mTodo;
   else {
     todo = new Todo;
     todo->setOrganizer(KOPrefs::instance()->email());
   }
 
   writeTodo(todo);
   if ( emitTime ) {
       globalFlagBlockAgenda = 1;
       emit showAgendaView( false );
       if ( todo->hasDueDate() )
           emit jumpToTime( todo->dtDue().date() );
       globalFlagBlockAgenda = 2;
   }
   if (mTodo) {
     todo->setRevision(todo->revision()+1);
     emit todoChanged(todo);
   } else {
     mCalendar->addTodo(todo);
     mTodo = todo;
     emit todoAdded(todo);
   }
  
   return true;
 }
 
 void KOTodoEditor::deleteTodo()
 {
   if (mTodo) {
     if (KOPrefs::instance()->mConfirm) {
       switch (msgItemDelete()) {
         case KMessageBox::Continue: // OK
           emit todoToBeDeleted(mTodo);
           emit dialogClose(mTodo);
           mCalendar->deleteTodo(mTodo);
           emit todoDeleted();
           reject();
           break;
       }
     }
     else {
       emit todoToBeDeleted(mTodo);
       emit dialogClose(mTodo);
       mCalendar->deleteTodo(mTodo);
       emit todoDeleted();
       reject();
     }
   } else {
     reject();
   }
 }
 
 void KOTodoEditor::setDefaults(QDateTime due,Todo *relatedEvent,bool allDay)
 {
   mRelatedTodo = relatedEvent;
       
   mGeneral->setDefaults(due,allDay);
   mDetails->setDefaults(); 
   showPage( 0 );
   if ( mRelatedTodo ) {
       mGeneral->fillCalCombo(mRelatedTodo->calID() );
       mGeneral->setCategories (mRelatedTodo->categoriesStr ());
       mGeneral->setSecrecy (mRelatedTodo->secrecy ());
       if ( mRelatedTodo->priority() < 3 )
           mGeneral->mPriorityCombo->setCurrentItem(mRelatedTodo->priority()-1);
       mGeneral->mSummaryEdit->lineEdit()->setText(mRelatedTodo->summary()+": ");
       int len = mRelatedTodo->summary().length();
       mGeneral->mSummaryEdit->lineEdit()->setFocus();
       mGeneral->mSummaryEdit->lineEdit()->setCursorPosition ( len+2 ); 
       mGeneral->mSummaryEdit->lineEdit()->setSelection ( 0, len+2 );
       
   } else
       mGeneral->setFocusOn( 2 );
   tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), false );
   mRecurrence->setDefaults(QDateTime::currentDateTime(),QDateTime::currentDateTime().addSecs( 3600 ));
 }
 void KOTodoEditor::checkRecurrence()
 {
     if ( mGeneral->mDueCheck->isChecked() && mGeneral->mStartCheck->isChecked()) {
         tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), true );
 
         if ( mTodo )
             mRecurrence->readEvent( mTodo );
         else {
             bool time = mGeneral->mTimeButton->isChecked();
             QDateTime from,to;
             if ( time ) {
                 to = QDateTime( mGeneral->mDueDateEdit->date(), mGeneral->mDueTimeEdit->getTime() ) ;
                 from = QDateTime( mGeneral->mStartDateEdit->date(),mGeneral->mStartTimeEdit->getTime( )) ;
             } else {
                 to = QDateTime( mGeneral->mDueDateEdit->date(), QTime( 0,0,0) ) ;
                 from = QDateTime( mGeneral->mStartDateEdit->date(),QTime( 0,0,0) ) ;
             }
             if ( to < from )
                 to = from;
             mRecurrence->setDefaults(from,to);
         }
     } else {
         tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), false );
         mRecurrence->setDefaults(QDateTime::currentDateTime(),QDateTime::currentDateTime().addSecs( 3600 ));
     }
 }
 void KOTodoEditor::readTodo(Todo *todo)
 {
   mGeneral->readTodo(todo);
   mDetails->readEvent(todo);
   mRelatedTodo = 0;//todo->relatedTo();
   // categories
   // mCategoryDialog->setSelected(todo->categories());
 
   // We should handle read-only events here.
 }
 
 void KOTodoEditor::writeTodo(Todo *event)
 {
     bool maybeComputeRecurrenceTime = false;
     if( event->hasRecurrenceID() && event->percentComplete() < 100)
         maybeComputeRecurrenceTime = true;
     event->setHasRecurrenceID( false );
     mGeneral->writeTodo(event);
     mDetails->writeEvent(event);
 
     // set related event, i.e. parent to-do in this case.
     if (mRelatedTodo) {
         event->setRelatedTo(mRelatedTodo);
     }  
     if ( mGeneral->mDueCheck->isChecked() && mGeneral->mStartCheck->isChecked()) {
         mRecurrence->writeEvent(event);
         if ( event->doesRecur() ) {
             int addSec = -1 ;
             if ( maybeComputeRecurrenceTime && event->percentComplete() == 100 )
                 addSec = 1;
             event->setRecurrenceID( event->dtStart().addSecs( addSec ) );
             event->setRecurDates();
         } else {
             event->setHasRecurrenceID( false );
         }
     } else {
         event->setHasRecurrenceID( false );
+        if ( event->doesRecur() )
         event->recurrence()->unsetRecurs();
     }
 }
 
 bool KOTodoEditor::validateInput()
 {
   if (!mGeneral->validateInput()) return false;
   if (!mDetails->validateInput()) return false;
   return true;
 }
 
 int KOTodoEditor::msgItemDelete()
 {
   return KMessageBox::warningContinueCancel(this,
       i18n("This item will be permanently deleted."),
       i18n("KOrganizer Confirmation"),i18n("Delete"));
 }
 
 void KOTodoEditor::modified (int modification)
 {
   if (modification == KOGlobals::CATEGORY_MODIFIED || 
       KOGlobals::UNKNOWN_MODIFIED == modification )
       //  mCategoryDialog->setSelected (mTodo->categories ());
   mGeneral->modified (mTodo, modification);
 
 }
 
 void KOTodoEditor::slotLoadTemplate()
 {
 
   QString fileName =locateLocal( "templates", "todos" ); 
   QDir t_dir;
   if ( !t_dir.exists(fileName) )
       t_dir.mkdir ( fileName );
   fileName += "/todo";
   fileName = KFileDialog::getSaveFileName(  fileName , "Load Todo template", this );
     if ( fileName.length() == 0 )
         return;
     CalendarLocal cal;
     ICalFormat format;
     if ( !format.load( &cal, fileName ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return ;
     }
     QPtrList<Todo> todos = cal.todos();
     Todo * todo = todos.first();
     if ( !todo ) {
         KMessageBox::error( this,
                             i18n("Template does not\ncontain a valid Todo."));
     } else {
         readTodo( todo );
     }
   
 }
 
 void KOTodoEditor::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "todos" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/todo";
     fileName = KFileDialog::getSaveFileName(  fileName , "Save as Todo template", this );
     if ( fileName.length() > 0 )
         saveTemplate( fileName );
 }
 
 void KOTodoEditor::saveTemplate( const QString &templateName )
 {
   Todo *todo = new Todo;
   writeTodo( todo );
   saveAsTemplate( todo, templateName );
 }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index fafcb58..f88403c 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -1,803 +1,803 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <qlayout.h>
 #include <qtextbrowser.h>
 #include <qtextcodec.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 
 #include <qapplication.h>
 #ifdef DESKTOP_VERSION 
 #include <qpaintdevicemetrics.h>
 #endif
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include <libkcal/calendar.h>
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koglobals.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
 #include "koeventviewer.h"
 #include <qstylesheet.h> 
 #include "kowhatsnextview.h"
 using namespace KOrg;
 
 void WhatsNextTextBrowser::setSource(const QString& n)
 {
 
     if (n.startsWith("event:")) {
         emit showIncidence(n);
         return;
     } else if (n.startsWith("todo:")) {
         emit showIncidence(n);
         return;
     } else {
         QTextBrowser::setSource(n);
     }
 }
 void WhatsNextTextBrowser::printMe()
 {
 #ifdef DESKTOP_VERSION 
      KOPrintPrefs pp ( this );
     if (!pp.exec() )
         return;
     int scaleval = pp.printMode() ;
 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
     QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
     if ( dx < dy )
         scale = dx;
     else
         scale = dy;
     p.translate( m.width()/10,0 );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
         p.scale( scale, scale );
     }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 }
 
 KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
                                  const char *name)
     : KOrg::BaseView(calendar, parent, name)
 {
     //  mDateLabel =
     //       new QLabel(KGlobal::locale()->formatDate(QDate::currentDate()),this);
     //   mDateLabel->setMargin(2);
     //   mDateLabel->setAlignment(AlignCenter);
     setFont( KOPrefs::instance()->mWhatsNextFont );
     mView = new WhatsNextTextBrowser(this);
     connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
     QStyleSheet* stsh = mView->styleSheet();
     QStyleSheetItem * style ;
     style   = stsh->item ("h2" );
     if ( style ) {
         style->setMargin(QStyleSheetItem::MarginAll,0);  
     }
     style   = stsh->item ("h3" );
     if ( style ) {
         style->setMargin(QStyleSheetItem::MarginAll,0);  
     }
     mEventViewer = 0;
 
     QBoxLayout *topLayout = new QVBoxLayout(this);
     //  topLayout->addWidget(mDateLabel);
     topLayout->addWidget(mView);
     mTimer = new QTimer( this );
     connect(mTimer,SIGNAL( timeout() ),this, SLOT(updateView()));
 
     connect(mView->horizontalScrollBar (),SIGNAL( sliderReleased () ),this, SLOT(restartTimer()));
     connect(mView->verticalScrollBar (),SIGNAL( sliderReleased () ),this, SLOT(restartTimer()));
 }
 
 KOWhatsNextView::~KOWhatsNextView()
 {
 }
 
 int KOWhatsNextView::maxDatesHint()
 {
     return 0;
 }
 
 int KOWhatsNextView::currentDateCount()
 {
     return 0;
 }
 
 void KOWhatsNextView::clearList()
 {
     mTimer->stop();
     mView->setText(" ");
 }
 QPtrList<Incidence> KOWhatsNextView::selectedIncidences()
 {
     QPtrList<Incidence> eventList;
 
     return eventList;
 }
 
 void KOWhatsNextView::printMe()
 {
 #ifdef DESKTOP_VERSION 
     mView->printMe();
 #endif
 }
 void KOWhatsNextView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                    const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Day, fd, td);
 #endif
 }
 void KOWhatsNextView::updateConfig()
 {
     setFont( KOPrefs::instance()->mWhatsNextFont );
     updateView();
 
 }
 void KOWhatsNextView::showEvent ( QShowEvent * e )
 {
     //qDebug("KOWhatsNextView::showEvent ");
     restartTimer();
     QWidget::showEvent ( e );
 }
 void KOWhatsNextView::hideEvent ( QHideEvent * e)
 {
     //qDebug(" KOWhatsNextView::hideEvent");
     mTimer->stop();
     QWidget::hideEvent ( e );
 }
 void KOWhatsNextView::restartTimer()
 {
     //qDebug("KOWhatsNextView::restartTimer() ");
     mTimer->start( 300000  );
     //mTimer->start( 5000  );
 }
 void KOWhatsNextView::updateView()
 {
     //qDebug("KOWhatsNextView::updateView() ");
     if ( mTimer->isActive() )
          restartTimer();
     mCurrentMaxPrio = 5;
     //qDebug("KOWhatsNextView::updateView() ");
     //  mDateLabel->setText(KGlobal::locale()->formatDate(QDate::currentDate()));
     KIconLoader kil("korganizer");
     QString ipath;// = new QString();
     //  kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath);
     //<big><big><strong>" + date + "</strong></big></big>\n";
     mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h1>";
 #else
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>";
 #endif
     //  mText += "<img src=\"";
     //   mText += ipath;
     //   mText += "\">";
     mEventDate = QDate::currentDate();
 #ifdef DESKTOP_VERSION
     mText += "<font color=\"#FFFFFF\"> <em>" +  KGlobal::locale()->formatDate( mEventDate , false )+"</em></font></h1>";
 #else
     mText += "<font color=\"#FFFFFF\"> <em>" +  KGlobal::locale()->formatDate( mEventDate , false )+"</em></font></h2>";
 #endif
     mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
     int iii;
     mTodos.clear();
     QPtrList<Event> events;  
     QPtrList<Todo> todos = calendar()->todos(); 
     Todo * todo;
     //mText += "<h2>" + i18n("Events: ") + "</h2>\n";
     int daysToShow = KOPrefs::instance()->mWhatsNextDays ;
     bool itemAdded = false;
     for ( iii = 0; iii <  daysToShow; ++iii ) {
         QString date;
         itemAdded = false;
         events = calendar()->events( mEventDate, true );
       
         if ( iii == 0 ) { // today !!!
             todo = todos.first();
             while(todo) {
                 if ( !todo->isCompleted() &&todo->hasDueDate() && todo->dtDue().date() < mEventDate ) {
                     if ( ! itemAdded ) {
                         appendDay ( iii, mEventDate );
                         //itemAdded = true;
                       
                     } //bool reply=false, bool notRed = true, bool appendTable = false);
                     appendEvent(todo, false, false, !itemAdded );
                     itemAdded = true;
                 }
                 todo = todos.next();
             }
         }
       
       
         if (events.count() > 0) {
             //  mText += "<p></p>";
             // kil.loadIcon("month",KIcon::NoGroup,22,KIcon::DefaultState,&ipath);
             // mText += "<h2>";
             //mText += "   <img src=\"";
             //mText += ipath;
             //mText += "\">"; 
             if ( ! itemAdded ) {
                 appendDay ( iii, mEventDate );
               
             }
             // for first day (iii == 0)
             // we may have syncevents, or events in the past, which maybe should not be diaplayed
             // for that reason we cannot append <table> in appendDay () for iii == 0
             // we must append it in the first successful call of  appendEvent()
             Event *ev = events.first();
             while(ev) {
                 //qDebug("+++++event append %s", ev->summary().latin1());
                 if ( true /*!ev->recurrence()->doesRecur() || ev->recursOn( mEventDate)*/) {
                     if ( appendEvent(ev, false , iii!= 0,!itemAdded ) ) 
                          itemAdded = true;
                 }
                 ev = events.next();
             }
          
             //mText += "</table>\n";
         } 
       
         todo = todos.first();
         while(todo) {
             if ( !todo->isCompleted() &&todo->hasDueDate() && todo->dtDue().date() == mEventDate ) {
                 if ( ! itemAdded ) {
                     appendDay ( iii, mEventDate );
                     //itemAdded = true;
                 }
                 appendEvent(todo, false , iii!= 0,!itemAdded);
                 itemAdded = true;
             }
             todo = todos.next();
         }
         if ( !itemAdded && iii == 0 ) { 
             // appendDay ( iii, mEventDate );
             //mText += "<table>";
             // mText += "<b><font color=\"#000080\"><em>"+i18n("No event, nothing to do.") +"</em></font></b>\n";
             mText += "<h3 align=\"center\"><font color=\"#008000\"><em>"+i18n("No event, nothing to do.") +"</em></font></h3>\n";
             //mText +="</table>";
         }
         if ( itemAdded   )
             mText += "</table>\n";
         mEventDate = mEventDate.addDays( 1 );
     }
   
     int topmostPrios =  KOPrefs::instance()->mWhatsNextPrios;
     if (todos.count() > 0 && topmostPrios > 0 ) {
         //   kil.loadIcon("todo",KIcon::NoGroup,22,KIcon::DefaultState,&ipath);
         // mText += "<h2>";
         //<img src=\"";
         //     mText += ipath;
         //     mText += "\">";
         // mText += i18n("Overdue To-Do:") + "</h2>\n";
   
         //mText += "<ul>\n";
         bool gotone = false;
         int priority = 1; 
         int priosFound = 0;
 #ifdef DESKTOP_VERSION
         mText +="<p></p>";
 #endif
 
         mText +="<h2><em><font color=\"#000080\">" + i18n("Incomplete Todo:") + "</font></em></h2>\n";
         mText += "<ul>\n";
         while (!gotone && priority<6) {
             todo = todos.first();
             while(todo) {
                 if (!todo->isCompleted() && (todo->priority() == priority) ) {
                     mCurrentMaxPrio = priority - priosFound + topmostPrios -1;
                     if ( appendTodo(todo) )
                         gotone = true;
                 }
                 todo = todos.next();
             }
             if ( gotone ) {
                 gotone = false;
                 ++priosFound;
                 if ( priosFound == topmostPrios )
                     break;
             }
             priority++;
             // kdDebug() << "adding the todos..." << endl;
         }
         mText += "</ul>\n";
     }
 
     int replys = 0;
     events = calendar()->events(QDate::currentDate(), QDate(2975,12,6));
     if (events.count() > 0) {
         Event *ev = events.first();
         while(ev) {
             Attendee *me = ev->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
             if (me!=0) {
                 if (me->status()==Attendee::NeedsAction && me->RSVP()) {
                     if (replys == 0) {
                         mText += "<p></p>";
                         //    kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath);
                         //mText += "<h2>";
                         //<img src=\"";
                         //             mText += ipath;
                         //             mText += "\">";    
                         //mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n";  
                         mText +="<h2><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></h2>\n";
                         mText += "<table>\n";
                     }
                     replys++;
                     appendEvent(ev,true);
                 }
             }
             ev = events.next();
         }
     }
     todos = calendar()->todos();
     if (todos.count() > 0) {
         Todo *to = todos.first();
         while(to) {
             if ( !to->isCompleted() ){
                 Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
                 if (me!=0) {
                     if (me->status()==Attendee::NeedsAction && me->RSVP()) {
                         if (replys == 0) {
                             mText +="<h2><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></h2>\n";
                             mText += "<table>\n";
                         }
                         replys++;
                         appendEvent(to, true);
                     }
                 }
             }
             to = todos.next();
         }
     }
     if (replys > 0 ) mText += "</table>\n";
 
 
     mText += "</td></tr>\n</table>\n";
 
     mView->setText(mText);
     mView->setFocus();
 
     //  QPixmap bPix = SmallIcon( "back" );
     //   qDebug("xxxxxxxxxxxxxxxxxxxxx ");
     //   QWidget* test = new QWidget();
     //  test->setBackgroundMode(FixedPixmap  );
     //  test->setBackgroundPixmap ( bPix );
     //  test->resize( 300, 400 );
     //  test->show();
     //   mView->setBackgroundMode(FixedPixmap  );
     //   mView->setBackgroundPixmap ( bPix );
     // qDebug("%s ",mText.latin1());
 }
 
 void  KOWhatsNextView::appendDay( int i, QDate eventDate )
 {
     QString date;
     QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); 
     if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
         if ( i == 0 ) {
             //mText += "<table>\n";
             return;//date = "<em><font color=\"#008000\"><em>" +  day+"</font></em>";
         }
         else if ( i == 1 )
             date = "<em><font color=\"#000080\">" + day + "</font></em>" ;
         else date = "<em><font color=\"#000080\">" + day + "</font></em>";
         mText += "<h2>" + date + "</h2>\n";
         //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
         mText += "<table>\n";
 
 
 
     } else { 
         if ( i == 0 ) {
             //mText += "<table>\n";
             return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>";
         }
 
 #ifdef DESKTOP_VERSION
         else if ( i == 1 ) {
             date = "<h2><em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em></h2>" ;
         }
         else date = "<h2><em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em></h2>";
 #else
         else if ( i == 1 ) {
             date = "<em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em>" ;
         }
         else date = "<em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em>";
 
 #endif
         mText += "<h2>" + date + "</h2>\n";
         //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
         mText += "<table>\n";
     }
 }
 
 
 void KOWhatsNextView::showDates(const QDate &, const QDate &)
 {
     updateView();
 }
 
 void KOWhatsNextView::showEvents(QPtrList<Event>)
 {
 }
 
 void KOWhatsNextView::changeEventDisplay(Event *, int action)
 {
     switch(action) {
     case KOGlobals::EVENTADDED:
         updateView();
         break;
     case KOGlobals::EVENTEDITED:
         updateView();
         break;
     case KOGlobals::EVENTDELETED:
         updateView();
         break;
     default:
         updateView();
         kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl;
     }
 }
 
 bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool appendTable )
 {
     if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") )
         return false;
     QDateTime cdt =  QDateTime::currentDateTime();
     QDateTime noc;
     QString tempText;
     if ( appendTable && !notRed ) {
             tempText = "<table>";
     }
     bool ok = true; 
     if ( reply ) {
         noc = ev->getNextOccurence( cdt, &ok );
         if (! ok && ev->typeID() == eventID)
             return false;
     }
     bool bDay = false;
     if ( ev->isBirthday()  || ev->isAnniversary()  )
         bDay = true;
     tempText += "<tr><td><b>";
     if (ev->typeID() == eventID ) {
         if (reply)  {
             if (!ev->doesFloat())
                 tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
             else
                 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
                 
         } else {
             if (!ev->doesFloat()) {
                 Event *event = static_cast<Event *>(ev);
                 QDateTime st,end;
-                if ( event->recurrence()->doesRecur() ) {
+                if ( event->doesRecur() ) {
                     QDate  recDate= mEventDate;
                     int days =  event->dtStart().date().daysTo (event->dtEnd().date()  );
                     while ( ! event->recursOn(  recDate ) ) {
                         recDate = recDate.addDays( -1 );
 
                     }
                     st =  QDateTime ( recDate,  event->dtStart().time() );
                     end = QDateTime ( recDate.addDays( days ),  event->dtEnd().time() );
                 }
                 else {
                     st = event->dtStart();
                     end = event->dtEnd();
                 }
       
            
                 QString dateText;
                 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() );
                 if ( st.date() < mEventDate )
                     dateText = "++:++-";
                 else
                     dateText =  event->dtStartTimeStr() + "-";
                 if ( KOPrefs::instance()->mWhatsNextTime2Lines )
                     dateText += " "; 
                 if ( end.date() > mEventDate ) 
                     dateText += "++:++";
                 else
                     dateText += event->dtEndTimeStr();
                 if ( notRed ) 
                     tempText += dateText;
                 else {
                     if ( end < cdt  ) {
                         if ( !KOPrefs::instance()->mWNViewShowsPast )
                             return false;
                         tempText += "<font color=\"#F00000\">" + dateText + "</font>";
                     }
                     else if ( st < cdt )
                         tempText += "<font color=\"#008000\">" + dateText + "</font>";
                     else
                         tempText += dateText;
                 
                 }
     
             } else {
                 if ( bDay ) {
                     
                     if ( ev->isBirthday())
                         tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>";
                     else
                         tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>";
                 } else {
                     if ( ((Event*)ev)->isMultiDay() ) {
                         QString dfs = KGlobal::locale()->dateFormatShort();
                         KGlobal::locale()->setDateFormatShort("%d.%b");
                         tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtStart().date(), true, KLocale::Userdefined) + "-";
                         if ( KOPrefs::instance()->mWhatsNextTime2Lines )
                             tempText += " ";
                         tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtEnd().date(), true, KLocale::Userdefined);
                         KGlobal::locale()->setDateFormatShort(dfs);
                     } else {
                         tempText += " " ;//i18n("Allday:");
                     }
                 }
 
             }
         }
     } else {
         mTodos.append( ev );
         tempText += i18n("ToDo:"); 
         if ( KOPrefs::instance()->mWhatsNextTime2Lines )
             tempText += " "; 
         if (reply)  {
             tempText += " "; 
             if ( noc != cdt ) {
                 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
             }
         } else {
             if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
                 // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
                 QString dfs = KGlobal::locale()->dateFormatShort();
                 KGlobal::locale()->setDateFormatShort("%d.%b");
                 tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
                 KGlobal::locale()->setDateFormatShort(dfs);
             } else {
                 if (!ev->doesFloat() )
                     if( ( (Todo*)ev)->dtDue()  < cdt  ) {
                         tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
 
 
                     } else 
                         tempText +=((Todo*)ev)->dtDueTimeStr();
                 mTodos.append( ev );
             }
         }
     }
     tempText += "</b></td><td>";
     bool needClose = false;
     if ( ev->cancelled() ) {
         tempText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
     if ( ev->isAlarmEnabled() && ev->alarmEnabled()) { 
         if ( !needClose)
             tempText +="[";
         tempText += "a";
         needClose =true;
 
     }
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
             tempText +="[";
         tempText += "i";
         needClose =true;
     }
-    if ( ev->recurrence()->doesRecur() ) {
+    if ( ev->doesRecur() ) {
         if ( !needClose)
             tempText +="[";
         tempText += "r";
         needClose =true;
     }
     if ( needClose ) {
         tempText += "] ";
     }
     if ( ev->cancelled() ) 
         tempText += "</font>";
     tempText += "<a ";
     if (ev->typeID() == eventID ) tempText += "href=\"event:";
     if (ev->typeID() == todoID ) tempText += "href=\"todo:";
     tempText += ev->uid() + "\">";
     if ( ev->summary().length() > 0 )
         tempText += ev->summary();
     else
         tempText += i18n("-no summary-"); 
     if ( bDay  ) {
         noc = ev->getNextOccurence( cdt.addDays(-1), &ok );
         if ( ok ) {
             int years = 0;
             if ( ev->typeID() == todoID  ) {
                 years = noc.date().year() -((Todo*)ev)->dtDue().date().year();
             } else
                 years = noc.date().year() - ev->dtStart().date().year();
             tempText += i18n(" (%1 y.)"). arg( years );
         }
     } 
     
     tempText += "</a>";
     if ( KOPrefs::instance()->mWNViewShowLocation )
         if ( !ev->location().isEmpty() )
             tempText += " ("+ev->location() +")";
     if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents)
             tempText += " ["+ev->relatedTo()->summary() +"]";
     tempText += "</td></tr>\n";
     mText += tempText;
     return true;
 }
 
 bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
 {
     if ( mTodos.find( ev ) != mTodos.end() ) return false;
 
     mTodos.append( ev );
     if ( !isSub )
         mText += "<p>";
     else
         mText += "<li>";
     mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] ";
 
 
     mText += ind;
     bool needClose = false;
     if ( ev->cancelled() ) {
         mText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
     if ( ev->isAlarmEnabled() && ev->alarmEnabled() ) { 
         if ( !needClose)
             mText +="[";
         mText += "a";
         needClose =true;
 
     }
    
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
             mText +="[";
         mText += "i";
         needClose =true;
     }  
     if ( ev->doesRecur() ) {
         if ( !needClose)
             mText +="[";
         mText += "r";
         needClose =true;
     }
     //  if ( ev->recurrence()->doesRecur() ) {
     //       if ( !needClose)
     //           mText +="(";
     //       mText += "r";
     //       needClose =true;
     //   }
     if ( needClose )
         mText += "] ";
     if ( ev->cancelled() ) 
         mText += "</font>";
     mText += "<a href=\"todo:" + ev->uid() + "\">";
     if ( ev->summary().length() > 0 )
         mText += ev->summary();
     else
         mText += i18n("-no summary-"); 
     mText += "</a>"; 
     if ( ((Todo*)ev)->hasDueDate () ) {
         QString year = "";
         int ye = ((Todo*)ev)->dtDue().date().year();
         if ( QDateTime::currentDateTime().date().year() != ye )
             year = QString::number( ye );
         QString dfs = KGlobal::locale()->dateFormatShort();
         KGlobal::locale()->setDateFormatShort("%d.%b");
         mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>";
         KGlobal::locale()->setDateFormatShort(dfs);
     }
     if ( KOPrefs::instance()->mWNViewShowLocation )
         if ( !ev->location().isEmpty() )
             mText += " ("+ev->location() +")";
     if ( !isSub ) {
         if ( ((Todo*)ev)->relatedTo()&& KOPrefs::instance()->mWNViewShowsParents)
             mText += " ["+ev->relatedTo()->summary() +"]";
         mText += "</p>\n";
     }
     else {
         ind += "-";
         mText += "</li>\n";
     }
     QPtrList<Incidence> Relations = ev->relations();
     Incidence *to;
     for (to=Relations.first();to;to=Relations.next()) {
         if (!((Todo*)to)->isCompleted() && ((Todo*)to)->priority() <= mCurrentMaxPrio )
             appendTodo( to, ind , true );
     } 
     
     return true;
 }
 
 /*
   void KOWhatsNextView::createEventViewer()
   {
   if (!mEventViewer) {
       
   mEventViewer = new KOEventViewerDialog(this);
   }
   }
 */
 void KOWhatsNextView::setEventViewer(KOEventViewerDialog* v )
 {
     mEventViewer = v;
 }
 
 // TODO: Create this function in CalendarView and remove it from here
 void KOWhatsNextView::showIncidence(const QString &uid)
 {
  
     if ( !mEventViewer  ) {
         qDebug("KOWhatsNextView::showIncidence::sorry, no event viewer set ");
         return;
     }
     //kdDebug() << "KOWhatsNextView::showIncidence(): " << uid << endl;
     //qDebug("KOWhatsNextView::showIncidence %s ", uid.latin1());
     if (uid.startsWith("event:")) {
 #ifdef DESKTOP_VERSION
         Event *event = calendar()->event(uid.mid(8));
 #else
         Event *event = calendar()->event(uid.mid(6));
 #endif
         //qDebug("event %d uid %s ", event, uid.mid(6).latin1());
         if (!event) return;
         //createEventViewer();
         mEventViewer->setEvent(event);
     } else if (uid.startsWith("todo:")) {
 #ifdef DESKTOP_VERSION
         Todo *todo = calendar()->todo(uid.mid(7));
 #else
         Todo *todo = calendar()->todo(uid.mid(5));
 #endif
         if (!todo) return;
         //createEventViewer();
         mEventViewer->setTodo(todo);
     } else {
         return;
 
   }
   mEventViewer->showMe();
   mEventViewer->raise();
 }