6 files changed, 40 insertions, 25 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index b236c2d..4fc1194 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -1,643 +1,636 @@
 /*
    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());
    mItem->setText(5, e->durationText());
    if ( e->isAlarmEnabled() ) {
        mItem->setText(6,e->alarms().first()->offsetText() );
    } else {
        mItem->setText(6, i18n("No"));
    }
    mItem->setText(7, e->recurrenceText());
    if( ! e->doesRecur() )
        mItem->setSortKey( 7, "-" );
    mItem->setText(8, e->cancelled() ? i18n("Yes") : i18n("No"));
    mItem->setText(9,e->categoriesStr());
    mItem->setText(10, KOPrefs::instance()->calName( e->calID() ));
    mItem->setText(11, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
+    mItem->setSortKey(11,e->lastModifiedSortKey());
    QString key; 
-    QDate d = e->lastModified().date();
+    QTime t;
-    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,"---");
    }
    if ( t->isAlarmEnabled() ) {
        mItem->setText(6,t->alarms().first()->offsetText() );
    } else {
        mItem->setText(6, i18n("No"));
    }
    mItem->setText(7, t->recurrenceText());
    if( ! t->doesRecur() )
        mItem->setSortKey( 7, "-" );
    if (t->hasDueDate()) {
        mItem->setText(3,t->dtDueDateStr());
        if (t->doesFloat()) {
            mItem->setText(4,"---");
        } else {
            mItem->setText(4,t->dtDueTimeStr());
        }
    } else {
        mItem->setText(3,"---");
        mItem->setText(4,"---");
    }
    mItem->setText(5, t->durationText());
    mItem->setText(8, t->cancelled() ? i18n("Yes") : i18n("No"));
    mItem->setText(9,t->categoriesStr());
    mItem->setText(10, KOPrefs::instance()->calName( t->calID() ));
    mItem->setText(11, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
+    mItem->setSortKey(11,t->lastModifiedSortKey());
    QString key;
-    QDate d = t->lastModified().date();
+    QDate d;
-    QTime tm = t->lastModified().time();
+    QTime tm;
-    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
-    mItem->setSortKey(11,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(3,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,"---");
    mItem->setText(8,"---");
    mItem->setText(9,j->categoriesStr());
    mItem->setText(10, KOPrefs::instance()->calName( j->calID() ));
    mItem->setText(11, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
+    mItem->setSortKey(11,j->lastModifiedSortKey());
    QString key; 
-    QDate d = j->lastModified().date();
+    QDate d;
-    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/Due Date"));
    mListView->addColumn(i18n("End/Due Time"));
    mListView->addColumn(i18n("Duration"));
    mListView->addColumn(i18n("Alarm")); // alarm set?
    mListView->addColumn(i18n("Recurs")); // recurs?
    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);
    mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
    int iii = 0;
    for ( iii = 0; iii< 12 ; ++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()+ ")";
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index bdef94c..848e9e7 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -1,558 +1,552 @@
 /*
    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 <klocale.h>
 #include <kdebug.h>
 #include <qapp.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "kotodoviewitem.h"
 #include "kotodoview.h"
 #include "koprefs.h"
 KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotodo)
  : QCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {
  construct();
 }
 KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo )
  : QCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {  
  construct();
 }
 QString KOTodoViewItem::key(int column,bool) const
 {
  QMap<int,QString>::ConstIterator it = mKeyMap.find(column);
  if (it == mKeyMap.end()) {
      return text(column).lower();
  } else {
    return *it;
  }
 }
 void KOTodoViewItem:: setup()
 {
   
     int h = 20;
     if ( listView () ) {
         QFontMetrics fm ( listView ()->font () );
         h = fm.height();
     }
     setHeight( h );
 }
 void KOTodoViewItem::setSortKey(int column,const QString &key)
 {
  mKeyMap.insert(column,key);
 }
 #if QT_VERSION >= 0x030000
 void KOTodoViewItem::paintBranches(QPainter *p,const QColorGroup & cg,int w,
                                   int y,int h)
 {
  QListViewItem::paintBranches(p,cg,w,y,h);
 }
 #else
 #endif
 void KOTodoViewItem::construct()
 {
    //  qDebug("KOTodoViewItem::construct() ");
  m_init = true;
  QString keyd = "==";
  QString keyt = "==";
  QString skeyd = "==";
  QString skeyt = "==";
  setOn(mTodo->isCompleted());
  setText(0,mTodo->summary());
  setText(1,QString::number(mTodo->priority()));
  setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
  if (mTodo->percentComplete()<100) {
    if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
    else setSortKey(2,QString::number(mTodo->percentComplete()));
  }
  else {
    if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
    else setSortKey(2,QString::number(99));
  }
  if (mTodo->hasDueDate()) {
    setText(3, mTodo->dtDueDateStr());
    QDate d = mTodo->dtDue().date();
    keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
    // setSortKey(3,keyd);
    if (mTodo->doesFloat()) {
      setText(4,"");
    }
    else {
      setText(4,mTodo->dtDueTimeStr());
      QTime t = mTodo->dtDue().time();
      keyt.sprintf("%02d%02d",t.hour(),t.minute());
      //setSortKey(4,keyt);
    }
  } else {
    setText(3,"");
    setText(4,"");
  }
  setSortKey(3,keyd);
  setSortKey(4,keyt);
  if (mTodo->isCompleted()) setSortKey(1,"6" + QString::number(mTodo->priority())+keyd+keyt);
  else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
  keyd = "";
  keyt = "";
  if (mTodo->isRunning() ) {
      QDate d = mTodo->runStart().date();
      QTime t = mTodo->runStart().time();
      skeyt.sprintf("%02d%02d",t.hour(),t.minute());
      skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
      keyd = KGlobal::locale()->formatDate( d , true);
      keyt = KGlobal::locale()->formatTime( t );
  } else {
      if (mTodo->hasStartDate()) {
          keyd = mTodo->dtStartDateStr();
          QDate d = mTodo->dtStart().date();
          skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
    
          if ( !mTodo->doesFloat()) {
              keyt = mTodo->dtStartTimeStr();
              QTime t = mTodo->dtStart().time();
              skeyt.sprintf("%02d%02d",t.hour(),t.minute());
      
          }
      
      }
  }
  setText(5,keyd);
  setText(6,keyt);
  setSortKey(5,skeyd);
  setSortKey(6,skeyt);
  //setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
  setText(7,mTodo->categoriesStr());
  setText(8,KOPrefs::instance()->calName( mTodo->calID()));
  setText(9, KGlobal::locale()->formatDateTime( mTodo->lastModified(), true, true ));
  setText(10, KGlobal::locale()->formatDateTime( mTodo->created(), true, true ));
  setText(11, KGlobal::locale()->formatDateTime( mTodo->lastModifiedSub(), true, true ));
  QString key; 
-  QDate d = mTodo->lastModified().date();
+  QDate d;
-  QTime t = mTodo->lastModified().time();
+  QTime t;
-  key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
+  setSortKey(9,mTodo->lastModifiedSortKey());
-  setSortKey(9,key);
  d = mTodo->created().date();
  t = mTodo->created().time();
  key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
  setSortKey(10,key);
-  d = mTodo->lastModifiedSub().date();
+  setSortKey(11,mTodo->lastModifiedSubSortKey());
-  t = mTodo->lastModifiedSub().time();
-  key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
-  setSortKey(11,key);
  
 #if 0
  // Find sort id in description. It's the text behind the last '#' character
  // found in the description. White spaces are removed from beginning and end
  // of sort id.
  int pos = mTodo->description().findRev('#');
  if (pos < 0) {
    setText(6,"");
  } else {
    QString str = mTodo->description().mid(pos+1);
    str.stripWhiteSpace();
    setText(6,str);
  }
 #endif
  m_known = false;
  m_init = false; 
  setMyPixmap();
 }
 void KOTodoViewItem::setMyPixmap()
 {
  int size = 5;
  QPixmap pixi =  QPixmap( 1, 1 );
  // if ( !mTodo->isCompleted() &&  mTodo->hasDueDate() && mTodo->dtDue() < QDateTime::currentDateTime() ) {
 //       pixi = SmallIcon("redcross16"); 
 //   } else {
      QPainter p;
 
  int pixSize = 0;
  QPixmap pPix =  QPixmap(  size, size );
  if ( mTodo->description().length() > 0 ) {
      pixi.resize(size, pixSize+size);
      pPix.fill( Qt::darkGreen );
      p.begin( &pixi );
      p. drawPixmap ( 0, pixSize, pPix);
      p.end();
      pixSize += size;
  } 
  if ( mTodo->isAlarmEnabled() && mTodo->alarmEnabled()) {
      pixi.resize(size, pixSize+size);
      pPix.fill( Qt::red );
      p.begin( &pixi );
      p. drawPixmap ( 0, pixSize, pPix);
      p.end();
      pixSize += size;
  }  
  if ( mTodo->doesRecur() ) {
      pixi.resize(size, pixSize+size);
      pPix.fill( Qt::blue );
      p.begin( &pixi );
      p. drawPixmap ( 0, pixSize, pPix);
      p.end();
      pixSize += size;
  } 
  //   }
  if ( pixi.width() > 1 ) {
      setPixmap ( 0,pixi ) ; 
  } else {
      setPixmap ( 0,QPixmap() ) ; 
  }
 }
 void KOTodoViewItem::stateChange(bool state)
 {
    // qDebug("KOTodoViewItem::stateChange %d ", state);
  // do not change setting on startup
  if ( m_init ) return;
  if (isOn()!=state) {
      setOn(state);
      //qDebug("SETON ");
      return;
  }
  if ( mTodo->isCompleted() == state ) {
      //qDebug("STATECHANGE:nothing to do ");
      return;
  }
  QString keyd = "==";
  QString keyt = "==";
  //qDebug("KOTodoViewItem::stateChange %s ", text(0).latin1());
  if ( mTodo->doesRecur()  ){
      QDateTime start = mTodo->dtStart();
      mTodo->setCompleted(state);
      if ( start != mTodo->dtStart() ) {
          if ( state  && !mTodo->isCompleted() ) {
              setOn( false );
              state = false;
          }
      }
  } else
      mTodo->setCompleted(state);
  if (state) mTodo->setCompleted(QDateTime::currentDateTime());
  if (mTodo->hasDueDate()) {
    setText(3, mTodo->dtDueDateStr());
    QDate d = mTodo->dtDue().date();
    keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
    setSortKey(3,keyd);
    if (mTodo->doesFloat()) {
      setText(4,"");
    }
    else {
      setText(4,mTodo->dtDueTimeStr());
      QTime t = mTodo->dtDue().time();
      keyt.sprintf("%02d%02d",t.hour(),t.minute());
      setSortKey(4,keyt);
    }
  }
 if (mTodo->hasStartDate()) {
     QString skeyt = "==";
     QString skeyd = "==";
     setText(5, mTodo->dtStartDateStr());
     QDate d = mTodo->dtStart().date();
     skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     
     if (mTodo->doesFloat()) {
         setText(6,"");
     }
     else {
         setText(6,mTodo->dtStartTimeStr());
         QTime t = mTodo->dtStart().time();
         skeyt.sprintf("%02d%02d",t.hour(),t.minute());
         
     }
     setSortKey(5,skeyd);
     setSortKey(6,skeyt);
  } 
  if (mTodo->isCompleted()) setSortKey(1,QString::number(9)+keyd+keyt);
  else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
  
  setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
  if (mTodo->percentComplete()<100) {
    if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
    else setSortKey(2,QString::number(mTodo->percentComplete()));
  }
  else {
    if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
    else setSortKey(2,QString::number(99));
  }
  if ( state ) {
      QListViewItem * myChild = firstChild();
      KOTodoViewItem *item;
      while( myChild ) {
          //qDebug("stateCH ");
          item = static_cast<KOTodoViewItem*>(myChild);
          item->stateChange(state);
          myChild = myChild->nextSibling();
      }
  } else {
      QListViewItem * myChild = parent();
      if ( myChild )
          (static_cast<KOTodoViewItem*>(myChild))->stateChange(state);
  }
  mTodoView->modified(true);
  setMyPixmap();
  mTodoView->setTodoModified( mTodo );
 }
 bool KOTodoViewItem::isAlternate()
 {
 #if 0
    //if ( m_known ) return m_odd;
   //qDebug("test ");
    KOTodoViewItem *item = static_cast<KOTodoViewItem *>(itemAbove());
    if ( item ) {
        m_known = item->m_known;
        if ( m_known ) {
            m_odd = !item->m_odd ;
            return m_odd;
        }
    } else {
        item = static_cast<KOTodoViewItem *>(itemBelow());
        if ( item ) {
            m_known = item->m_known;
            if ( m_known ) {
                m_odd = !item->m_odd ;
                return m_odd;
            }
        }
    }
  KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
  item =  static_cast<KOTodoViewItem *>(lv->firstChild());
  bool previous = true;
  qDebug("WHILE ");
  while ( item ) {
      item->m_odd = !previous;
      item->m_known = true;
      previous = !previous;
      item = static_cast<KOTodoViewItem *>(item->itemBelow());
  }
  return m_odd;
  
 #else
  
  //KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
  //if (lv && lv->alternateBackground().isValid())
  {
    KOTodoViewItem *above = static_cast<KOTodoViewItem *>(itemAbove());
    m_known = above ? above->m_known : true;
    if (m_known)
    {
       m_odd = above ? !above->m_odd : false;
    }
    else
    {
       KOTodoViewItem *item;
       bool previous = true;
       if (QListViewItem::parent())
       {
          item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
          if (item)
             previous = item->m_odd;
          item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
       }
       else
       {
           KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
          item = static_cast<KOTodoViewItem *>(lv->firstChild());
       }
       while(item)
       {
          item->m_odd = previous = !previous;
          item->m_known = true;
          item = static_cast<KOTodoViewItem *>(item->nextSibling());
       }
    }
    return m_odd;
  }
  return false;
 #endif
 }
 void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
  QColorGroup _cg = cg;
  QColorGroup::ColorRole role; 
  if ( KOPrefs::instance()->mTodoViewUsesForegroundColor && !mTodo->isRunning())
      role = QColorGroup::Text;
  else
      role = QColorGroup::Base;
  //#ifndef KORG_NOLVALTERNATION
  if (isAlternate())
      _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
  bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors;
  QColor colorToSet;
  if (  column == 0 &&  mTodo->calID() > 1 ) {
      setColor = true;
      colorToSet = KOPrefs::instance()->defaultColor( mTodo->calID() );
  } else  if ( setColor ) {
      QStringList categories = mTodo->categories();
      QString cat = categories.first();
      if ( !cat.isEmpty()) {
          colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
      } else
          setColor = false;  
  }
   bool openMode = !isOpen();
   // maybe we are in flat-display-mode
   if ( !firstChild() )
       openMode = false;
   bool colorRunning = mTodo->isRunning();
   if ( ! colorRunning && openMode )
       colorRunning = mTodo->hasRunningSub();
   if ( colorRunning ) {
       setColor = true;
       colorToSet = KOPrefs::instance()->mTodoRunColor;     
   } else {
       int odue = mTodo->hasDueSubTodo( openMode );
       if (odue == 2) {
           colorToSet = KOPrefs::instance()->mTodoOverdueColor;
           setColor = true;
       } else if ( odue == 1 ) {
           colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
           setColor = true;
       }
   }
 
  if ( setColor ) {
      _cg.setColor(role,colorToSet );
      if ( role == QColorGroup::Base) {
          int rgb = colorToSet.red();
          rgb += colorToSet.blue()/2;
          rgb += colorToSet.green();
          if ( rgb < 200 )
              _cg.setColor(QColorGroup::Text,Qt::white );
      }
  }
  //#endif
  if ( column > 0 ){
      if ( column == 2 && !KOPrefs::instance()->mTodoViewShowsPercentage ) {
          p->save();
          int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5);
          
          p->fillRect( 0, 0, width, height(), _cg.base() ); // background
          // p->setPen(Qt::black );  //border
          // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() );  //filling
          QColor fc = KOPrefs::instance()->mHighlightColor;
          if ( mTodo->percentComplete() == 100 )
              fc = darkGreen;
          p->drawRect( 2, 2, width-4, height()-4);
          p->fillRect( 3, 3, progress, height()-6, 
                       fc );
          p->restore();
      } else {
          QCheckListItem::paintCell(p, _cg, column, width, alignment);
      }
      return;
  }
  int align = alignment;
   
    if ( !p )
        return;
    
    p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) );
    QListView *lv = listView();
    if ( !lv )
        return;
    int marg = 2;//lv->itemMargin();
    int r = 0;
    QCheckListItem::Type myType = QCheckListItem::CheckBox;
    int BoxSize = 20;
    int boxOffset = 2;
    int xOffset = 2;
    if (qApp->desktop()->width() < 300 ) {
         BoxSize = 14;
         boxOffset = -1;
         xOffset = 1;
         // marg = 0;
    }
    if ( height() < BoxSize ) {
        boxOffset = boxOffset - ((BoxSize -  height())/2) ;
        // qDebug("boxOffset %d  height %d", boxOffset, height() );
        BoxSize = height();
    }
    //bool winStyle = lv->style() == WindowsStyle;
    int lineStart = 5;
    if ( myType == Controller ) {
        if ( !pixmap( 0 ) )
            r += BoxSize + 4;
    } else {
        ASSERT( lv ); //###
                //QFontMetrics fm( lv->font() );
                //int d = fm.height();
        int x = 0;
        int y = (height() - BoxSize) / 2;
                //p->setPen( QPen( _cg.text(), winStyle ? 2 : 1 ) );
        if ( myType == CheckBox ) {
            if ( isEnabled() )
                p->setPen( QPen( _cg.text(), 1 ) );
            else
                p->setPen( QPen( listView()->palette().color( QPalette::Disabled, QColorGroup::Text ), 1 ) );
            p->drawRect( x+marg, y+2, BoxSize-4, BoxSize-4 );
            lineStart = x+marg;
            /////////////////////
                x++;
                y++;
                if ( isOn() ) {
                    QPointArray a( 7*2 );
                    int i, xx, yy;
                    xx = x+xOffset+marg+(boxOffset/2);
                    yy = y+5+boxOffset;
                    for ( i=0; i<3; i++ ) {
                        a.setPoint( 2*i,   xx, yy );
                        a.setPoint( 2*i+1, xx, yy+2 );
                        // qDebug(" ");
                        xx++; yy++;
                    }
                    yy -= 2;
                    for ( i=3; i<7; i++ ) {
                        a.setPoint( 2*i,   xx, yy );
                        a.setPoint( 2*i+1, xx, yy+2 );
                        xx++; yy--;
                    }
                    p->setPen( darkGreen );
                    p->drawLineSegments( a );
                }
                ////////////////////////
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 39c14f5..fe9f854 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -1,741 +1,754 @@
 /*
    This file is part of libkcal.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include "calformat.h"
 #include "incidence.h"
 #include "todo.h"
 using namespace KCal;
 Incidence::Incidence() :
  IncidenceBase(),
  mRelatedTo(0), mSecrecy(SecrecyPublic), mPriority(3)
 {
    mRecurrence = 0;//new Recurrence(this);
  mCancelled = false;
  recreate();
  mHasStartDate = true;
  mAlarms.setAutoDelete(true);
  mAttachments.setAutoDelete(true);
  mHasRecurrenceID = false;
  mHoliday = false;
  mBirthday = false;
  mAnniversary = false;
 }
 Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
 {
 // TODO: reenable attributes currently commented out.
  mRevision = i.mRevision;
  mCreated = i.mCreated;
  mDescription = i.mDescription;
  mSummary = i.mSummary;
  mCategories = i.mCategories;
 //  Incidence *mRelatedTo;          Incidence *mRelatedTo;
  mRelatedTo = 0;
  mRelatedToUid = i.mRelatedToUid; 
 //  QPtrList<Incidence> mRelations;    QPtrList<Incidence> mRelations;
  mExDates = i.mExDates;
  QPtrListIterator<Attachment> itat( i.mAttachments );
  Attachment *at;
  while( (at = itat.current()) ) {
      Attachment *a = new Attachment( *at );
      mAttachments.append( a );
      ++itat;
  }
  mAttachments.setAutoDelete( true );
  mResources = i.mResources;
  mSecrecy = i.mSecrecy;
  mPriority = i.mPriority;
  mLocation = i.mLocation;
  mCancelled = i.mCancelled;
  mHasStartDate = i.mHasStartDate;
  QPtrListIterator<Alarm> it( i.mAlarms );
  const Alarm *a;
  while( (a = it.current()) ) {
    Alarm *b = new Alarm( *a );
    b->setParent( this );
    mAlarms.append( b );
    ++it;
  }
  mAlarms.setAutoDelete(true);
  mHasRecurrenceID = i.mHasRecurrenceID;
  mRecurrenceID = i.mRecurrenceID;
  if ( i.mRecurrence )
      mRecurrence = new Recurrence( *(i.mRecurrence), this );
  else
      mRecurrence = 0;
  mHoliday = i.mHoliday ;
  mBirthday = i.mBirthday;
  mAnniversary = i.mAnniversary;
 }
 Incidence::~Incidence()
 {
   
  Incidence *ev;
   QPtrList<Incidence> Relations = relations();
  for (ev=Relations.first();ev;ev=Relations.next()) {
    if (ev->relatedTo() == this) ev->setRelatedTo(0);
  } 
  if (relatedTo()) relatedTo()->removeRelation(this);
  if ( mRecurrence ) 
      delete mRecurrence; 
 
 }
 QString Incidence::durationText()
 {
    return "---";
 }
 QString Incidence::durationText4Time( int offset )
 {
    int min = offset/60;
    int hours = min /60;
    min = min % 60;
    int days = hours /24;
    hours = hours % 24;
    if ( doesFloat() || ( min == 0 && hours == 0 )  ) {
        if ( days == 1 )
            return "1" + i18n(" day");
        else
            return QString::number( days )+   i18n(" days");
    }
    QString message = QString::number ( hours ) +":";
    if ( min < 10 ) message += "0";
    message += QString::number ( min );
    if ( days > 0 ) { 
        if ( days == 1 )
            message =  "1" + i18n(" day") + " "+message;
        else
            message =  QString::number( days )+   i18n(" days") + " "+message;
    }
    return message; 
 }
 bool Incidence::isHoliday() const
 {
    return mHoliday;
 }
 bool Incidence::isBirthday() const
 {
    return mBirthday ;
 }
 bool Incidence::isAnniversary() const
 {
    return mAnniversary ;
 }
 bool Incidence::hasRecurrenceID() const
 {
    return mHasRecurrenceID;
 }
 void Incidence::setHasRecurrenceID( bool b )
 {
    mHasRecurrenceID = b;
 }
   
 void Incidence::setRecurrenceID(QDateTime d)
 {
    mRecurrenceID = d;
    mHasRecurrenceID = true;
    updated(); 
 }
 QDateTime Incidence::recurrenceID () const
 {
    return mRecurrenceID;
 }
 bool Incidence::cancelled() const
 {
    return mCancelled;
 }
 void Incidence::setCancelled( bool b )
 {
    mCancelled = b;
    updated();
 }
 bool Incidence::hasStartDate() const
 {
  return mHasStartDate;
 }
 void Incidence::setHasStartDate(bool f)
 {
  if (mReadOnly) return;
  mHasStartDate = f;
  updated();
 }
 // A string comparison that considers that null and empty are the same
 static bool stringCompare( const QString& s1, const QString& s2 )
 {
    if ( s1.isEmpty() && s2.isEmpty() )
        return true;
    return s1 == s2;
 }
 bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
 {
  
    if( i1.alarms().count() != i2.alarms().count() ) {
        return false; // no need to check further
    }
    if ( i1.alarms().count() > 0 ) {
        if ( !( *(i1.alarms().first()) == *(i2.alarms().first())) ) 
            {
            qDebug("alarm not equal ");
            return false;
        }
    }
 #if 0
    QPtrListIterator<Alarm> a1( i1.alarms() );
    QPtrListIterator<Alarm> a2( i2.alarms() );
    for( ; a1.current() && a2.current(); ++a1, ++a2 ) {
        if( *a1.current() == *a2.current() ) {
            continue;
        }
        else {
            return false;
        }
    }
 #endif
  
    if ( i1.hasRecurrenceID() == i2.hasRecurrenceID() ) {
        if ( i1.hasRecurrenceID() ) {
            if ( i1.recurrenceID() != i2.recurrenceID() )
                return false;
        }
    } else {
        return false;
    }
    if ( ! operator==( (const IncidenceBase&)i1, (const IncidenceBase&)i2 ) )
        return false;
    if ( i1.hasStartDate() == i2.hasStartDate() ) {
        if ( i1.hasStartDate() ) {
            if ( i1.dtStart() != i2.dtStart() )
                return false;
        }
    } else {
        return false;
    }
    if ( i1.mRecurrence != 0 && i2.mRecurrence != 0 ) {
        if (!( *i1.mRecurrence == *i2.mRecurrence) ) {
            //qDebug("recurrence is NOT equal ");
            return false;
        }
    } else {
        // one ( or both ) recurrence is 0
        if ( i1.mRecurrence == 0 ) {
            if ( i2.mRecurrence != 0 && i2.mRecurrence->doesRecur() != Recurrence::rNone )
                return false;
        } else {
            // i1.mRecurrence != 0
            // i2.mRecurrence == 0
            if ( i1.mRecurrence->doesRecur() != Recurrence::rNone )
                return false;
        }
    }
   
    return
        //  i1.created() == i2.created() &&
        stringCompare( i1.description(), i2.description() ) &&
        stringCompare( i1.summary(), i2.summary() ) &&
        i1.categories() == i2.categories() &&
        // no need to compare mRelatedTo
        stringCompare( i1.relatedToUid(), i2.relatedToUid() ) &&
        //      i1.relations() == i2.relations() &&
        i1.exDates() == i2.exDates() &&
        i1.attachments() == i2.attachments() &&
        i1.resources() == i2.resources() &&
        i1.secrecy() == i2.secrecy() &&
        i1.priority() == i2.priority() &&
        i1.cancelled() == i2.cancelled() &&
        stringCompare( i1.location(), i2.location() );
 }
 Incidence* Incidence::recreateCloneException( QDate d  )
 {
    Incidence* newInc = clone();
    newInc->recreate();
    if ( doesRecur() ) {
        addExDate( d );
        newInc->recurrence()->unsetRecurs();
        if ( typeID() == eventID ) {
            int len = dtStart().secsTo( ((Event*)this)->dtEnd());
            QTime tim = dtStart().time();
            newInc->setDtStart( QDateTime(d, tim) );
            ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
        } else {
            int len = dtStart().secsTo( ((Todo*)this)->dtDue());
            QTime tim = ((Todo*)this)->dtDue().time();
            ((Todo*)newInc)->setDtDue( QDateTime(d, tim) );
            ((Todo*)newInc)->setDtStart( ((Todo*)newInc)->dtDue().addSecs( -len ) );
            ((Todo*)this)->setRecurDates();
        }
        newInc->setExDates( DateList () );
    }
    return newInc;
 }
 void Incidence::recreate()
 {
  setCreated(QDateTime::currentDateTime());
  setUid(CalFormat::createUniqueId());
  setRevision(0);
  setIDStr( ":" );
  setLastModified(QDateTime::currentDateTime());
 }
 void Incidence::cloneRelations( Incidence * newInc )
 {
    // newInc is already a clone of this incidence
    Incidence * inc;
    Incidence * cloneInc;
    QPtrList<Incidence> Relations = relations();
    for (inc=Relations.first();inc;inc=Relations.next()) {
        cloneInc = inc->clone();
        cloneInc->recreate();
        cloneInc->setRelatedTo( newInc );
        inc->cloneRelations( cloneInc );
    } 
 }
 void Incidence::setReadOnly( bool readOnly )
 {
  IncidenceBase::setReadOnly( readOnly );
  if ( mRecurrence )
      mRecurrence->setRecurReadOnly( readOnly);
 }
 void Incidence::setLastModifiedSubInvalid()
 {
    mLastModifiedSub = QDateTime();
    if ( mRelatedTo )
        mRelatedTo->setLastModifiedSubInvalid();
 }
+QString Incidence::lastModifiedSubSortKey() const
+{
+    if ( mLastModifiedSubSortKey.isEmpty() )
+        return lastModifiedSortKey();
+    return mLastModifiedSubSortKey;
+}
 QDateTime Incidence::lastModifiedSub()
 {
    if ( !mRelations.count() )
        return lastModified();
    if ( mLastModifiedSub.isValid() )
        return mLastModifiedSub;
    mLastModifiedSub = lastModified();
    Incidence * inc;
    QPtrList<Incidence> Relations = relations();
    for (inc=Relations.first();inc;inc=Relations.next()) {
        if ( inc->lastModifiedSub() > mLastModifiedSub )
            mLastModifiedSub = inc->lastModifiedSub();
    }
+    mLastModifiedSubSortKey.sprintf("%04d%02d%02d%02d%02d%02d",
+                                    mLastModifiedSub.date().year(),
+                                    mLastModifiedSub.date().month(),
+                                    mLastModifiedSub.date().day(),
+                                    mLastModifiedSub.time().hour(),
+                                    mLastModifiedSub.time().minute(),
+                                    mLastModifiedSub.time().second() );
    return mLastModifiedSub;
 }
 void Incidence::setCreated(QDateTime created)
 {
  if (mReadOnly) return;
  mCreated = getEvenTime(created);
 }
 QDateTime Incidence::created() const
 {
  return mCreated;
 }
 void Incidence::setRevision(int rev)
 {
  if (mReadOnly) return;
  mRevision = rev;
  updated();
 }
 int Incidence::revision() const
 {
  return mRevision;
 }
 void Incidence::setDtStart(const QDateTime &dtStart)
 {
  QDateTime  dt = getEvenTime(dtStart);
  if ( mRecurrence )
      mRecurrence->setRecurStart( dt);
  IncidenceBase::setDtStart( dt );
 }
 void Incidence::setDescription(const QString &description)
 {
  if (mReadOnly) return;
  mDescription = description;
  updated();
 }
 QString Incidence::description() const
 {
  return mDescription;
 }
 void Incidence::setSummary(const QString &summary)
 {
  if (mReadOnly) return;
  mSummary = summary;
  updated();
 }
 QString Incidence::summary() const
 {
  return mSummary;
 }
 void Incidence::checkCategories()
 {
    mHoliday =  mCategories.contains("Holiday") || mCategories.contains(i18n("Holiday"));
    mBirthday =  mCategories.contains("Birthday") || mCategories.contains(i18n("Birthday"));
    mAnniversary =  mCategories.contains("Anniversary") || mCategories.contains(i18n("Anniversary"));
 }
 void Incidence::addCategories(const QStringList &categories, bool addToRelations ) //addToRelations = false
 {
    if (mReadOnly) return;
    int i;
    for( i = 0; i < categories.count(); ++i ) {
        if (  !mCategories.contains (categories[i]))
            mCategories.append( categories[i] );
    }
    checkCategories();
    updated();
    if ( addToRelations ) {
        Incidence * inc;
        QPtrList<Incidence> Relations = relations();
        for (inc=Relations.first();inc;inc=Relations.next()) {
            inc->addCategories( categories, true );
        } 
    }
 }
 void Incidence::setCategories(const QStringList &categories, bool setForRelations ) //setForRelations = false
 {
  if (mReadOnly) return;
  mCategories = categories;
  checkCategories();
  updated();
  if ( setForRelations ) {
      Incidence * inc;
      QPtrList<Incidence> Relations = relations();
      for (inc=Relations.first();inc;inc=Relations.next()) {
          inc->setCategories( categories, true );
      } 
  }
 }
 // TODO: remove setCategories(QString) function
 void Incidence::setCategories(const QString &catStr)
 {
  if (mReadOnly) return;
  mCategories.clear();
  if (catStr.isEmpty()) return;
  mCategories = QStringList::split(",",catStr);
  QStringList::Iterator it;
  for(it = mCategories.begin();it != mCategories.end(); ++it) {
    *it = (*it).stripWhiteSpace();
  }
  checkCategories();
  updated();
 }
 // using this makes filtering 3 times faster
 QStringList* Incidence::categoriesP()
 {
  return &mCategories;
 }
 QStringList Incidence::categories() const
 {
  return mCategories;
 }
 QString Incidence::categoriesStr()
 {
  return mCategories.join(",");
 }
 QString Incidence::categoriesStrWithSpace()
 {
  return mCategories.join(", ");
 }
 void Incidence::setRelatedToUid(const QString &relatedToUid)
 {
  if (mReadOnly) return;
  mRelatedToUid = relatedToUid;
 }
 void Incidence::clearRelations()
 {
    mRelatedTo = 0;
    mRelations.clear();
 }
 QString Incidence::relatedToUid() const
 {
  return mRelatedToUid;
 }
 void Incidence::setRelatedTo(Incidence *relatedTo)
 {
    //qDebug("Incidence::setRelatedTo %d ", relatedTo);
    //qDebug("setRelatedTo(Incidence *relatedTo) %s %s", summary().latin1(), relatedTo->summary().latin1() );
  if (mReadOnly || mRelatedTo == relatedTo) return;
  if(mRelatedTo) {
      // updated();
    mRelatedTo->removeRelation(this);
  }
  mRelatedTo = relatedTo;
  if (mRelatedTo)  {
      mRelatedTo->addRelation(this);
      mRelatedToUid = mRelatedTo->uid();
  } else {
      mRelatedToUid = "";
  }
 }
 Incidence *Incidence::relatedTo() const
 {
  return mRelatedTo;
 }
 QPtrList<Incidence> Incidence::relations() const
 {
  return mRelations;
 }
 void Incidence::addRelationsToList(QPtrList<Incidence> *rel)
 {
    Incidence* inc;
    QPtrList<Incidence> Relations = relations();
    for (inc=Relations.first();inc;inc=Relations.next()) {
        inc->addRelationsToList( rel );
    } 
    if ( rel->findRef( this ) == -1 ) 
        rel->append( this );
 }
 void Incidence::addRelation(Incidence *event)
 {
    setLastModifiedSubInvalid();
  if( mRelations.findRef( event ) == -1 ) {
    mRelations.append(event);
    //updated();
  }
 }
 void Incidence::removeRelation(Incidence *event)
 {
    setLastModifiedSubInvalid();
  mRelations.removeRef(event);
 //  if (event->getRelatedTo() == this) event->setRelatedTo(0);
 }
 bool Incidence::recursOn(const QDate &qd) const
 {
  if (mRecurrence && mRecurrence->recursOnPure(qd) && !isException(qd)) return true;
  else return false;
 }
 void Incidence::setExDates(const DateList &exDates)
 {
  if (mReadOnly) return;
  mExDates = exDates;
  recurrence()->setRecurExDatesCount(mExDates.count());
  updated();
 }
 void Incidence::addExDate(const QDate &date)
 {
  if (mReadOnly) return;
  mExDates.append(date);
  recurrence()->setRecurExDatesCount(mExDates.count());
  updated();
 }
 DateList Incidence::exDates() const
 {
  return mExDates;
 }
 bool Incidence::isException(const QDate &date) const
 {
  DateList::ConstIterator it;
  for( it = mExDates.begin(); it != mExDates.end(); ++it ) {
    if ( (*it) == date ) {
      return true;
    }
  }
  return false;
 }
 void Incidence::addAttachment(Attachment *attachment)
 {
  if (mReadOnly || !attachment) return;
  mAttachments.append(attachment);
  updated();
 }
 void Incidence::deleteAttachment(Attachment *attachment)
 {
  mAttachments.removeRef(attachment);
 }
 void Incidence::deleteAttachments(const QString& mime)
 {
  Attachment *at = mAttachments.first();
  while (at) {
    if (at->mimeType() == mime)
      mAttachments.remove();
    else
      at = mAttachments.next();
  }
 }
 QPtrList<Attachment> Incidence::attachments() const
 {
  return mAttachments;
 }
 QPtrList<Attachment> Incidence::attachments(const QString& mime) const
 {
  QPtrList<Attachment> attachments;
  QPtrListIterator<Attachment> it( mAttachments );
  Attachment *at;
  while ( (at = it.current()) ) {
    if (at->mimeType() == mime)
      attachments.append(at);
    ++it;
  }
  return attachments;
 }
 void Incidence::setResources(const QStringList &resources)
 {
  if (mReadOnly) return;
  mResources = resources;
  updated();
 }
 QStringList Incidence::resources() const
 {
  return mResources;
 }
 void Incidence::setPriority(int priority)
 {
  if (mReadOnly) return;
  mPriority = priority;
  updated();
 }
 int Incidence::priority() const
 {
  return mPriority;
 }
 void Incidence::setSecrecy(int sec)
 {
  if (mReadOnly) return;
  mSecrecy = sec;
  updated();
 }
 int Incidence::secrecy() const
 {
  return mSecrecy;
 }
 QString Incidence::secrecyStr() const
 {
  return secrecyName(mSecrecy);
 }
 QString Incidence::secrecyName(int secrecy)
 {
  switch (secrecy) {
    case SecrecyPublic:
      return i18n("Public");
      break;
    case SecrecyPrivate:
      return i18n("Private");
      break;
    case SecrecyConfidential:
      return i18n("Confidential");
      break;
    default:
      return i18n("Undefined");
      break;
  }
 }
 QStringList Incidence::secrecyList()
 {
  QStringList list;
  list << secrecyName(SecrecyPublic);
  list << secrecyName(SecrecyPrivate);
  list << secrecyName(SecrecyConfidential);
  return list;
 }
 QPtrList<Alarm> Incidence::alarms() const
 {
  return mAlarms;
 }
 Alarm* Incidence::newAlarm()
 {
  Alarm* alarm = new Alarm(this);
  mAlarms.append(alarm);
 //  updated();
  return alarm;
 }
 void Incidence::addAlarm(Alarm *alarm)
 {
  mAlarms.append(alarm);
  updated();
 }
 void Incidence::removeAlarm(Alarm *alarm)
 {
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index eef9e64..dc49640 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -1,324 +1,326 @@
 /*
    This file is part of libkcal.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef INCIDENCE_H
 #define INCIDENCE_H
 //
 // Incidence - base class of calendaring components
 //
 #include <qdatetime.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 #include "recurrence.h"
 #include "alarm.h"
 #include "attachment.h"
 #include "listbase.h"
 #include "incidencebase.h"
 namespace KCal {
 class Event;
 class Todo;
 class Journal;
 /**
  This class provides the base class common to all calendar components.
 */
 class Incidence : public IncidenceBase
 {
  public:
    /**
      This class provides the interface for a visitor of calendar components. It
      serves as base class for concrete visitors, which implement certain actions on
      calendar components. It allows to add functions, which operate on the concrete
      types of calendar components, without changing the calendar component classes.
    */
    class Visitor
    {
      public:
        /** Destruct Incidence::Visitor */
        virtual ~Visitor() {}
        /**
          Reimplement this function in your concrete subclass of IncidenceVisitor to perform actions
          on an Event object.
        */
        virtual bool visit(Event *) { return false; }
        /**
          Reimplement this function in your concrete subclass of IncidenceVisitor to perform actions
          on an Todo object.
        */
        virtual bool visit(Todo *) { return false; }
        /**
          Reimplement this function in your concrete subclass of IncidenceVisitor to perform actions
          on an Journal object.
        */
        virtual bool visit(Journal *) { return false; }
      protected:
        /** Constructor is protected to prevent direct creation of visitor base class. */
        Visitor() {}
    };
    /**
      This class implements a visitor for adding an Incidence to a resource
      supporting addEvent(), addTodo() and addJournal() calls.
    */
    template<class T>
    class AddVisitor : public Visitor
    {
      public:
        AddVisitor( T *r ) : mResource( r ) {}
        bool visit( Event *e ) { return mResource->addEvent( e ); }
        bool visit( Todo *t ) { return mResource->addTodo( t ); }
        bool visit( Journal *j ) { return mResource->addJournal( j ); }
      private:
        T *mResource;
    };
    /** enumeration for describing an event's secrecy. */
    enum { SecrecyPublic = 0, SecrecyPrivate = 1, SecrecyConfidential = 2 };
    typedef ListBase<Incidence> List;
    Incidence();
    Incidence(const Incidence &);
    ~Incidence();
    /**
      Accept IncidenceVisitor. A class taking part in the visitor mechanism has to
      provide this implementation:
      <pre>
        bool accept(Visitor &v) { return v.visit(this); }
      </pre>
    */
    virtual bool accept(Visitor &) { return false; }
    virtual Incidence *clone() = 0;
    virtual void cloneRelations( Incidence * );
    void addRelationsToList(QPtrList<Incidence> *rel);
    void clearRelations();
    virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const = 0;
    void setReadOnly( bool );
    /**
      Recreate event. The event is made a new unique event, but already stored
      event information is preserved. Sets uniquie id, creation date, last
      modification date and revision number.
    */
    void recreate();
    Incidence*  recreateCloneException(QDate);
    /** set creation date */
    void setCreated(QDateTime);
    /** return time and date of creation. */
    QDateTime created() const;
    /** set the number of revisions this event has seen */
    void setRevision(int rev);
    /** return the number of revisions this event has seen */
    int revision() const;
    /** Set starting date/time. */
    virtual void setDtStart(const QDateTime &dtStart);
    /** Return the incidence's ending date/time as a QDateTime. */
    virtual QDateTime dtEnd() const  { return QDateTime(); }
    /** sets the event's lengthy description. */
    void setDescription(const QString &description);
    /** returns a reference to the event's description. */
    QString description() const;
    /** sets the event's short summary. */
    void setSummary(const QString &summary);
    /** returns a reference to the event's summary. */
    QString summary() const;
    /** set event's applicable categories */
    void setCategories(const QStringList &categories, bool setForRelations = false);
    void addCategories(const QStringList &categories, bool addToRelations = false);
    /** set event's categories based on a comma delimited string */
    void setCategories(const QString &catStr);
    /** return categories in a list */
    QStringList categories() const;
    QStringList* categoriesP();
    /** return categories as a comma separated string */
    QString categoriesStr();
    QString categoriesStrWithSpace();
    /** point at some other event to which the event relates. This function should
     *  only be used when constructing a calendar before the related Event
     *  exists. */
    void setRelatedToUid(const QString &);
    /** what event does this one relate to? This function should
     *  only be used when constructing a calendar before the related Event
     *  exists. */
    QString relatedToUid() const;
    /** point at some other event to which the event relates */
    void setRelatedTo(Incidence *relatedTo);
    /** what event does this one relate to? */
    Incidence *relatedTo() const;
    /** All events that are related to this event */
    QPtrList<Incidence> relations() const;
    /** Add an event which is related to this event */
    void addRelation(Incidence *);
    /** Remove event that is related to this event */
    void removeRelation(Incidence *);
    /** returns the list of dates which are exceptions to the recurrence rule */
    DateList exDates() const;
    /** sets the list of dates which are exceptions to the recurrence rule */
    void setExDates(const DateList &_exDates);
    void setExDates(const char *dates);
    /** Add a date to the list of exceptions of the recurrence rule. */
    void addExDate(const QDate &date);
    /** returns true if there is an exception for this date in the recurrence
     rule set, or false otherwise. */
    bool isException(const QDate &qd) const;
    /** add attachment to this event */
    void addAttachment(Attachment *attachment);
    /** remove and delete a specific attachment */
    void deleteAttachment(Attachment *attachment);
    /** remove and delete all attachments with this mime type */
    void deleteAttachments(const QString& mime);
    /** return list of all associated attachments */
    QPtrList<Attachment> attachments() const;
    /** find a list of attachments with this mime type */
    QPtrList<Attachment> attachments(const QString& mime) const;
    /** sets the event's status the value specified.  See the enumeration
     * above for possible values. */
    void setSecrecy(int);
    /** return the event's secrecy. */
    int secrecy() const;
    /** return the event's secrecy in string format. */
    QString secrecyStr() const;
    /** return list of all availbale secrecy classes */
    static QStringList secrecyList();
    /** return human-readable name of secrecy class */
    static QString secrecyName(int);
    /** returns TRUE if the date specified is one on which the event will
     * recur. */
    bool recursOn(const QDate &qd) const;
    // VEVENT and VTODO, but not VJOURNAL (move to EventBase class?):
    /** set resources used, such as Office, Car, etc. */
    void setResources(const QStringList &resources);
    /** return list of current resources */
    QStringList resources() const;
    /** set the event's priority, 0 is undefined, 1 highest (decreasing order) */
    void setPriority(int priority);
    /** get the event's priority */
    int priority() const;
    /** All alarms that are associated with this incidence */
    QPtrList<Alarm> alarms() const;
    /** Create a new alarm which is associated with this incidence */
    Alarm* newAlarm();
    /** Add an alarm which is associated with this incidence */
    void addAlarm(Alarm*);
    /** Remove an alarm that is associated with this incidence */
    void removeAlarm(Alarm*);
    /** Remove all alarms that are associated with this incidence */
    void clearAlarms();
    /** return whether any alarm associated with this incidence is enabled */
    bool isAlarmEnabled() const;
    /**
      Return the recurrence rule associated with this incidence. If there is
      none, returns an appropriate (non-0) object.
    */
    Recurrence *recurrence();
    void setRecurrence(Recurrence * r);
    /**
      Forward to Recurrence::doesRecur().
    */
    ushort doesRecur() const;
    /** set the event's/todo's location. Do _not_ use it with journal */
    void setLocation(const QString &location);
    /** return the event's/todo's location. Do _not_ use it with journal */
    QString location() const;  
   /** returns TRUE or FALSE depending on whether the todo has a start date */
    bool hasStartDate() const;
    /** sets the event's hasStartDate value. */
    void setHasStartDate(bool f);
    QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const;
    bool cancelled() const;
    void setCancelled( bool b );
    
    bool hasRecurrenceID() const;
    void setHasRecurrenceID( bool b );
    
    void setRecurrenceID(QDateTime);
    QDateTime recurrenceID () const;
    QDateTime dtStart() const;
    bool isHoliday() const;
    bool isBirthday() const;
    bool isAnniversary() const;
    QDateTime lastModifiedSub();
+    QString lastModifiedSubSortKey() const;
    QString recurrenceText() const;
    void setLastModifiedSubInvalid();
    
    virtual QString durationText();
    QString durationText4Time( int secs );
    Recurrence *mRecurrence;
 protected:
    QPtrList<Alarm> mAlarms;
    QPtrList<Incidence> mRelations;
    QDateTime mRecurrenceID;
    bool mHasRecurrenceID;
  private:
    void checkCategories();
+    QString mLastModifiedSubSortKey;
    bool mHoliday, mBirthday, mAnniversary;
    int mRevision;
    bool mCancelled;
    // base components of jounal, event and todo
    QDateTime mCreated;
    QDateTime mLastModifiedSub;
    QString mDescription;
    QString mSummary;
    QStringList mCategories;
    Incidence *mRelatedTo;
    QString mRelatedToUid;
    DateList mExDates;
    QPtrList<Attachment> mAttachments;
    QStringList mResources;
    bool mHasStartDate;                  // if todo has associated start date
    int mSecrecy;
    int mPriority;                        // 1 = highest, 2 = less, etc.
    //QPtrList<Alarm> mAlarms;
    
    QString mLocation;
 };
 bool operator==( const Incidence&, const Incidence& );
 }
 #endif
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 022dead..cfef973 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -1,482 +1,493 @@
 /*
    This file is part of libkcal.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kidmanager.h>
 #include "calformat.h"
 #include "syncdefines.h"
 #include "incidencebase.h"
 using namespace KCal;
 IncidenceBase::IncidenceBase() :
  mReadOnly(false), mFloats(true), mDuration(0), mHasDuration(false),
  mPilotId(0), mSyncStatus(SYNCMOD)
 {
  blockLastModified = false;
  setUid(CalFormat::createUniqueId());
  mOrganizer = "";
  mFloats = false;
  mDuration = 0;
  mHasDuration = false;
  mPilotId = 0;
  mExternalId = ":";
  mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
  mSyncStatus = 0;
  mAttendees.setAutoDelete( true );
  mCalEnabled = true;
  mAlarmEnabled = true;
  mCalID = 0;
 }
 IncidenceBase::IncidenceBase(const IncidenceBase &i) :
  CustomProperties( i )
 {
  blockLastModified = false;
  mReadOnly = i.mReadOnly;
  mDtStart = i.mDtStart;
  mDuration = i.mDuration;
  mHasDuration = i.mHasDuration;
  mOrganizer = i.mOrganizer;
  mUid = i.mUid;
  mCalEnabled = i.mCalEnabled;
  mAlarmEnabled = i.mAlarmEnabled;
  mCalID = i.mCalID;
  QPtrList<Attendee> attendees = i.attendees();
  for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
    mAttendees.append( new Attendee( *a ) );
  }
  mFloats = i.mFloats;
  mLastModified = i.mLastModified;
  mPilotId = i.mPilotId;
  mTempSyncStat = i.mTempSyncStat;
  mSyncStatus = i.mSyncStatus;
  mExternalId = i.mExternalId;
  // The copied object is a new one, so it isn't observed by the observer
  // of the original object.
  mObservers.clear();
  
  mAttendees.setAutoDelete( true );
 }
 IncidenceBase::~IncidenceBase()
 {
 }
 bool KCal::operator==( const IncidenceBase& i1, const IncidenceBase& i2 )
 {
    // do not compare mSyncStatus and mExternalId 
    if( i1.attendees().count() != i2.attendees().count() ) {
        return false; // no need to check further
    }
    if ( i1.attendees().count() > 0 ) {
        Attendee * a1 = i1.attendees().first(), *a2 =i2.attendees().first() ;
        while ( a1 ) {
            if ( !( (*a1) == (*a2)) ) 
                {
                    //qDebug("Attendee not equal ");
                    return false;
                }
            a1 = i1.attendees().next();
            a2 = i2.attendees().next();
        }
    }
    //if ( i1.dtStart() != i2.dtStart() )
    //  return false;
 #if 0
    qDebug("1 %d ",i1.doesFloat() == i2.doesFloat() );
    qDebug("1 %d ",i1.duration() == i2.duration() );
    qDebug("3 %d ",i1.hasDuration() == i2.hasDuration() );
    qDebug("1 %d ",i1.pilotId() == i2.pilotId() );
    qDebug("1 %d %d %d",i1.syncStatus() == i2.syncStatus() , i1.syncStatus(),i2.syncStatus() );
    qDebug("6 %d ",i1.organizer() == i2.organizer() );
  
 #endif
    if ( i1.hasDuration() == i2.hasDuration() ) {
        if ( i1.hasDuration() ) {
            if ( i1.duration() != i2.duration() )
                return false;
        }
    } else {
        return false;
    }
    return ( i1.organizer() == i2.organizer() &&
             // i1.uid() == i2.uid() &&
             // Don't compare lastModified, otherwise the operator is not
             // of much use. We are not comparing for identity, after all.
             i1.doesFloat() == i2.doesFloat() &&
             i1.pilotId() == i2.pilotId() );// &&  i1.syncStatus() == i2.syncStatus() );
    // no need to compare mObserver
 }
  
 QDateTime IncidenceBase::getEvenTime( QDateTime dt )
 {
    QTime t =  dt.time();
    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
    return dt;
 }     
 bool IncidenceBase::isTagged() const
 {
    return mIsTagged;
 }
 void IncidenceBase::setTagged( bool b)
 {
    mIsTagged = b;
 }
 void IncidenceBase::setCalID( int id )
 {
    if ( mCalID > 0 ) {
        blockLastModified = true;
        updated();
        blockLastModified = false;
    }
    mCalID = id;
 }
 int IncidenceBase::calID() const
 {
    return mCalID;
 }
 void IncidenceBase::setCalEnabled( bool b )
 {
    mCalEnabled = b;
 }
 bool IncidenceBase::calEnabled() const
 {
    return mCalEnabled;
 }
 void IncidenceBase::setAlarmEnabled( bool b )
 {
    mAlarmEnabled = b;
 }
 bool IncidenceBase::alarmEnabled() const
 {
    return mAlarmEnabled;
 }
 void IncidenceBase::setUid(const QString &uid)
 {
  mUid = uid;
  updated();
 }
 QString IncidenceBase::uid() const
 {
  return mUid;
 }
 void IncidenceBase::setLastModifiedSubInvalid()
 {
+    // virtual method
 }
 void IncidenceBase::setLastModified(const QDateTime &lm)
 {
    if ( blockLastModified ) return;
  // DON'T! updated() because we call this from
  // Calendar::updateEvent().
  mLastModified = getEvenTime(lm);
+  mLastModifiedKey.sprintf("%04d%02d%02d%02d%02d%02d",
+                           mLastModified.date().year(),
+                           mLastModified.date().month(),
+                           mLastModified.date().day(),
+                           mLastModified.time().hour(),
+                           mLastModified.time().minute(),
+                           mLastModified.time().second() );
  setLastModifiedSubInvalid();
  //qDebug("IncidenceBase::setLastModified %s ",lm.toString().latin1());
 }
+QString IncidenceBase::lastModifiedSortKey() const
+{  
+    return mLastModifiedKey;
+}
 QDateTime IncidenceBase::lastModified() const
 {
  return mLastModified;
 }
 void IncidenceBase::setOrganizer(const QString &o)
 {
  // we don't check for readonly here, because it is
  // possible that by setting the organizer we are changing
  // the event's readonly status...
  mOrganizer = o;
  if (mOrganizer.left(7).upper() == "MAILTO:")
    mOrganizer = mOrganizer.remove(0,7);
  updated();
 }
 QString IncidenceBase::organizer() const
 {
  return mOrganizer;
 }
 void IncidenceBase::setReadOnly( bool readOnly )
 {
  mReadOnly = readOnly;
 }
 void IncidenceBase::setDtStart(const QDateTime &dtStart)
 {
 //  if (mReadOnly) return;
  mDtStart = getEvenTime(dtStart);
  updated();
 }
 QDateTime IncidenceBase::dtStart() const
 {
  return mDtStart;
 }
 QString IncidenceBase::dtStartTimeStr() const
 {
  return KGlobal::locale()->formatTime(dtStart().time());
 }
 QString IncidenceBase::dtStartDateStr(bool shortfmt) const
 {
  return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
 }
 QString IncidenceBase::dtStartStr(bool shortfmt) const
 {
    if ( doesFloat() )
        return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
    return KGlobal::locale()->formatDateTime(dtStart(), shortfmt);
 }
 bool IncidenceBase::doesFloat() const
 {
  return mFloats;
 }
 void IncidenceBase::setFloats(bool f)
 {
  if (mReadOnly) return;
  mFloats = f;
  updated();
 }
 bool IncidenceBase::addAttendee(Attendee *a, bool doupdate)
 {
  if (mReadOnly) return false;
  if (a->name().left(7).upper() == "MAILTO:")
    a->setName(a->name().remove(0,7));
  QPtrListIterator<Attendee> qli(mAttendees);
  
  qli.toFirst();
  while (qli) {
      if (*qli.current() == *a)
          return false;
      ++qli;
  }
  mAttendees.append(a);
  if (doupdate) updated();
  return true;
 }
 #if 0
 void IncidenceBase::removeAttendee(Attendee *a)
 {
  if (mReadOnly) return;
  mAttendees.removeRef(a);
  updated();
 }
 void IncidenceBase::removeAttendee(const char *n)
 {
  Attendee *a;
  if (mReadOnly) return;
  for (a = mAttendees.first(); a; a = mAttendees.next())
    if (a->getName() == n) {
      mAttendees.remove();
      break;
    }
 }
 #endif
 void IncidenceBase::clearAttendees()
 {
  if (mReadOnly) return;
  mAttendees.clear();
 }
 #if 0
 Attendee *IncidenceBase::getAttendee(const char *n) const
 {
  QPtrListIterator<Attendee> qli(mAttendees);
  qli.toFirst();
  while (qli) {
    if (qli.current()->getName() == n)
      return qli.current();
    ++qli;
  }
  return 0L;
 }
 #endif
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
  QPtrListIterator<Attendee> qli(mAttendees);
  qli.toFirst();
  while (qli) {
      if (qli.current()->email().lower() == email.lower())
      return qli.current();
    ++qli;
  }
  return 0L;
 }
 Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QString& email)
 {
  QPtrListIterator<Attendee> qli(mAttendees);
  QStringList mails = emails;
  if (!email.isEmpty()) {
    mails.append(email);
  }
  qli.toFirst();
  while (qli) {
    for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) {
        if (qli.current()->email().lower() == (*it).lower())
        return qli.current();
     }
    ++qli;
  }
  return 0L;
 }
 void IncidenceBase::setDuration(int seconds)
 {
  mDuration = seconds;
  setHasDuration(true);
 }
 int IncidenceBase::duration() const
 {
  return mDuration;
 }
 void IncidenceBase::setHasDuration(bool b)
 {
  mHasDuration = b;
 }
 bool IncidenceBase::hasDuration() const
 {
  return mHasDuration;
 }
 void IncidenceBase::setSyncStatus(int stat)
 {
  if (mReadOnly) return;
  mSyncStatus = stat;
 }
 int IncidenceBase::syncStatus() const
 {
  return mSyncStatus;
 }
 void IncidenceBase::setPilotId( int id )
 {
  if (mReadOnly) return;
  mPilotId = id;
 }
 int IncidenceBase::pilotId() const
 {
  return mPilotId;
 }
 int IncidenceBase::tempSyncStat() const
 {
  return mTempSyncStat;
 }
 void IncidenceBase::setTempSyncStat( int id )
 {
  if (mReadOnly) return;
  mTempSyncStat = id;
 }
 void IncidenceBase::removeID(const QString &prof)
 {
    if ( prof.isEmpty() )
        mExternalId = ":";
    else
        mExternalId = KIdManager::removeId ( mExternalId, prof);
 }
 void IncidenceBase::setID( const QString & prof , const QString & id )
 {
    mExternalId = KIdManager::setId ( mExternalId, prof, id );
 }
 QString IncidenceBase::getID( const QString &  prof)
 {
    return KIdManager::getId ( mExternalId, prof ); 
 }
 // example  :Sharp_DTM;22;23566:TP;-1;8654:TPP;18;0:
 // format name;III;JJJ:  III >= 0, may be -1.  JJJ always >= 0  
 void IncidenceBase::setCsum( const QString & prof , const QString & id )
 {
    mExternalId = KIdManager::setCsum ( mExternalId, prof, id );
 }
 QString IncidenceBase::getCsum( const QString &  prof)
 {
    return KIdManager::getCsum ( mExternalId, prof ); 
 }
 void IncidenceBase::setIDStr( const QString & s )
 {
  if (mReadOnly) return;
  mExternalId = s;
 }
 QString IncidenceBase::IDStr() const
 {
    return mExternalId ;
 }
 void IncidenceBase::registerObserver( IncidenceBase::Observer *observer )
 {
  if( !mObservers.contains(observer) ) mObservers.append( observer );
 }
 void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
 {
  mObservers.remove( observer );
 }
 void IncidenceBase::updated()
 {
  QPtrListIterator<Observer> it(mObservers);
  while( it.current() ) {
    Observer *o = it.current();
    ++it;
    o->incidenceUpdated( this );
  }
 }
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 665c1f6..444d4c4 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -1,187 +1,189 @@
 /*
    This file is part of libkcal.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef KCAL_INCIDENCEBASE_H
 #define KCAL_INCIDENCEBASE_H
 //
 // Incidence - base class of calendaring components
 //
 #include <qdatetime.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 #include <qptrlist.h>
 #include "customproperties.h"
 #include "attendee.h"
 namespace KCal {
 typedef QValueList<QDate> DateList;
 enum IncTypeID { eventID,todoID,journalID,freebusyID };
 /**
  This class provides the base class common to all calendar components.
 */
 class IncidenceBase : public CustomProperties
 {
  public:
    class Observer {
      public:
        virtual void incidenceUpdated( IncidenceBase * ) = 0;
    };
    IncidenceBase();
    IncidenceBase(const IncidenceBase &);
    virtual ~IncidenceBase();
    virtual QCString type() const = 0;
    virtual  IncTypeID typeID() const = 0;
    /** Set the unique id for the event */
    void setUid(const QString &);
    /** Return the unique id for the event */
    QString uid() const;
    /** Sets the time the incidence was last modified. */
    void setLastModified(const QDateTime &lm);
    /** Return the time the incidence was last modified. */
    QDateTime lastModified() const;
+    QString lastModifiedSortKey() const;
    /** sets the organizer for the event */
    void setOrganizer(const QString &o);
    QString organizer() const;
    /** Set readonly status. */
    virtual void setReadOnly( bool );
    /** Return if the object is read-only. */
    bool isReadOnly() const { return mReadOnly; }
    /** for setting the event's starting date/time with a QDateTime. */
    virtual void setDtStart(const QDateTime &dtStart);
    /** returns an event's starting date/time as a QDateTime. */
    virtual QDateTime dtStart() const;
    /** returns an event's starting time as a string formatted according to the
     users locale settings */
    QString dtStartTimeStr() const;
    /** returns an event's starting date as a string formatted according to the
     users locale settings */
    QString dtStartDateStr(bool shortfmt=true) const;
    /** returns an event's starting date and time as a string formatted according
     to the users locale settings */
    QString dtStartStr(bool shortfmt=true) const;
    virtual void setDuration(int seconds);
    int duration() const;
    void setHasDuration(bool);
    bool hasDuration() const;
    /** Return true or false depending on whether the incidence "floats,"
     * i.e. has a date but no time attached to it. */
    bool doesFloat() const;
    /** Set whether the incidence floats, i.e. has a date but no time attached to it. */
    void setFloats(bool f);
    /**
      Add Attendee to this incidence. IncidenceBase takes ownership of the
      Attendee object.
    */
    bool addAttendee(Attendee *a, bool doupdate=true );
 //    void removeAttendee(Attendee *a);
 //    void removeAttendee(const char *n);
    /** Remove all Attendees. */
    void clearAttendees();
    /** Return list of attendees. */
    QPtrList<Attendee> attendees() const { return mAttendees; };
    /** Return number of attendees. */
    int attendeeCount() const { return mAttendees.count(); };
    /** Return the Attendee with this email */
    Attendee* attendeeByMail(const QString &);
    /** Return first Attendee with one of this emails */
    Attendee* attendeeByMails(const QStringList &, const QString& email = QString::null);
    /** pilot syncronization states */
    enum { SYNCNONE = 0, SYNCMOD = 1, SYNCDEL = 3 };
    /** Set synchronisation satus. */
    void setSyncStatus(int stat);
    /** Return synchronisation status. */
    int syncStatus() const;
    /** Set Pilot Id. */
    void setPilotId(int id);
    /** Return Pilot Id. */
    int pilotId() const;
    void setTempSyncStat(int id);
    int tempSyncStat() const;
    void setIDStr( const QString & );
    QString IDStr() const;
    void setID( const QString &, const QString & );
    QString  getID( const QString & );
    void setCsum( const QString &, const QString & );
    QString getCsum( const QString & );
    void removeID(const QString &);
    void registerObserver( Observer * );
    void unRegisterObserver( Observer * );
    void updated();
    void setCalID( int id );
    int calID() const;
    void setCalEnabled( bool );
    bool calEnabled() const; 
    void setAlarmEnabled( bool );
    bool alarmEnabled() const;
    bool isTagged() const;
    void setTagged( bool );
    virtual void setLastModifiedSubInvalid();
  protected:
    bool blockLastModified;
    bool mIsTagged;
    QDateTime mDtStart;
    bool mReadOnly;
    QDateTime getEvenTime( QDateTime );
  private:
    // base components
    QString mOrganizer;
+    QString mLastModifiedKey;
    QString mUid;
    int mCalID;
    bool mCalEnabled;
    bool mAlarmEnabled;
    QDateTime mLastModified;
    QPtrList<Attendee> mAttendees;
    bool mFloats;
    int mDuration;
    bool mHasDuration;
    QString  mExternalId;
    int mTempSyncStat;
    // PILOT SYNCHRONIZATION STUFF
    int mPilotId;                         // unique id for pilot sync
    int mSyncStatus;                      // status (for sync)
    QPtrList<Observer> mObservers;
 };
 bool operator==( const IncidenceBase&, const IncidenceBase& );
 }
 #endif