8 files changed, 332 insertions, 58 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0c39590..74aefb7 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1278,513 +1278,513 @@ bool CalendarView::syncCalendar(QString filename, int mode)
                storage->setSaveFormat( new ICalFormat() );
                storage->save();
            }
        }
        setModified( true );
    }
    delete storage;
    delete calendar;
    if ( syncOK )
        updateView();
    return syncOK;
 }
 void CalendarView::syncExternal( int mode  )
 {
    mGlobalSyncMode = SYNC_MODE_EXTERNAL;
   
    qApp->processEvents();
    CalendarLocal* calendar = new CalendarLocal();
    calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
    bool syncOK = false;
    bool loadSuccess = false;
    PhoneFormat* phoneFormat = 0;
    emit tempDisableBR(true);
 #ifndef DESKTOP_VERSION
    SharpFormat* sharpFormat = 0;
    if ( mode == 0 ) { // sharp
        sharpFormat = new SharpFormat () ;
        loadSuccess = sharpFormat->load( calendar, mCalendar ); 
    } else 
 #endif
        if ( mode == 1 ) { // phone 
        phoneFormat = new PhoneFormat (mCurrentSyncDevice,
                                         mSyncManager->mPhoneDevice,
                                         mSyncManager->mPhoneConnection,
                                         mSyncManager->mPhoneModel);
        loadSuccess = phoneFormat->load( calendar,mCalendar); 
        
        } else {
            emit tempDisableBR(false);
            return;
        }
    if ( loadSuccess ) {
        getEventViewerDialog()->setSyncMode( true );
        syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
        getEventViewerDialog()->setSyncMode( false );
        qApp->processEvents();
        if (  syncOK ) {
            if ( mSyncManager->mWriteBackFile )
            {
                QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                Incidence* inc = iL.first();
                if ( phoneFormat ) {
                    while ( inc ) {
                        inc->removeID(mCurrentSyncDevice);
                        inc =  iL.next();
                    }
                }
 #ifndef DESKTOP_VERSION
                if ( sharpFormat )
                    sharpFormat->save(calendar);
 #endif
                if ( phoneFormat )
                    phoneFormat->save(calendar);
                iL = calendar->rawIncidences(); 
                inc = iL.first();
                Incidence* loc;
                while ( inc ) {
                    if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) {
                        loc = mCalendar->incidence(inc->uid() );
                        if ( loc ) {
                            loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
                            loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) );
                        }
                    }
                    inc =  iL.next();
                }
                Incidence* lse = getLastSyncEvent();
                if ( lse ) {
                    lse->setReadOnly( false );
                    lse->setDescription( "" );
                    lse->setReadOnly( true );
                }
            }
        } else {
            topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
        }
        setModified( true );
    } else {
        QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
        QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                      question, i18n("Ok")) ;
    }
    delete calendar;
    updateView();
    emit tempDisableBR(false);
    return ;//syncOK;
 }
 bool CalendarView::importBday()
 {
 #ifndef KORG_NOKABC
 #ifdef DESKTOP_VERSION
    KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
    KABC::AddressBook::Iterator it;
    int count = 0;
    for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
        ++count;
    }
    QProgressBar bar(count,0 );
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
        w = 220;
    int h = bar.sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
    bar.show();
    bar.setCaption (i18n("Reading addressbook - close to abort!") );
    qApp->processEvents();
    count = 0;
    int addCount = 0;
    KCal::Attendee* a = 0;
    for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
        if ( ! bar.isVisible() )
            return false;
        bar.setProgress( count++ );
        qApp->processEvents();
        //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() );
        if ( (*it).birthday().date().isValid() ){
            a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
            if ( addAnniversary(  (*it).birthday().date(), (*it).assembledName(),  a, true ) )
            ++addCount;
        } 
        QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); 
        if ( anni.isValid() ){ 
            a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
            if ( addAnniversary(  anni, (*it).assembledName(),  a, false ) )
            ++addCount;
        }
    }
    updateView(); 
    topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 #else //DESKTOP_VERSION
  ExternalAppHandler::instance()->requestBirthdayListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
  // the result should now arrive through method insertBirthdays
 #endif //DESKTOP_VERSION
 #endif //KORG_NOKABC
    return true;
 }
 
 // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI
 void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, 
                                   const QStringList& anniversaryList, const QStringList& realNameList,
                                   const QStringList& emailList, const QStringList& assembledNameList, 
                                   const QStringList& uidList)
 {
    //qDebug("KO::CalendarView::insertBirthdays");
  if (uid == this->name())
  {
    int count = birthdayList.count();
    int addCount = 0;
    KCal::Attendee* a = 0;
    //qDebug("CalView 1 %i", count);
    QProgressBar bar(count,0 );
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
        w = 220;
    int h = bar.sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
    bar.show();
    bar.setCaption (i18n("inserting birthdays - close to abort!") );
    qApp->processEvents();
    QDate birthday;
    QDate anniversary;
    QString realName;
    QString email;
    QString assembledName;
    QString uid;
    bool ok = true;
    for ( int i = 0; i < count; i++)
        {
            if ( ! bar.isVisible() )
                return;
            bar.setProgress( i );
            qApp->processEvents();
            birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok);
            if (!ok) {
                ;//qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1());
            }
            anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok);
            if (!ok) {
                ;//qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1());
            }
            realName = realNameList[i]; 
            email = emailList[i];
            assembledName = assembledNameList[i];
            uid = uidList[i];
            //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() );
            if ( birthday.isValid() ){
                a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                        KCal::Attendee::ReqParticipant,uid) ;
                if ( addAnniversary(  birthday, assembledName,  a, true ) )
                    ++addCount;
            } 
            if ( anniversary.isValid() ){ 
                a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                        KCal::Attendee::ReqParticipant,uid) ;
                if ( addAnniversary(  anniversary, assembledName,  a, false ) )
                    ++addCount;
            }
        }
    updateView(); 
    topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
  }
 }
 bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a,  bool birthday)
 {
    //qDebug("addAnni ");
    Event * ev = new Event();
    if ( a ) {
        ev->addAttendee( a );
    }
    QString kind;
    if ( birthday ) {
        kind = i18n( "Birthday" );
        ev->setSummary( name + " (" + QString::number(date.year()) +")"); 
    }
    else {
        kind = i18n( "Anniversary" );
        ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); 
    }
-    ev->setOrganizer(a->email());
+    //ev->setOrganizer(a->email());
    ev->setCategories( kind );
    ev->setDtStart( QDateTime(date) );
    ev->setDtEnd(  QDateTime(date) );
    ev->setFloats( true );
    Recurrence * rec = ev->recurrence();
    rec->setYearly(Recurrence::rYearlyMonth,1,-1);
    rec->addYearlyNum( date.month() );
    if ( !mCalendar->addAnniversaryNoDup( ev ) ) {
        delete ev;
        return false;
    }
    return true;
 }
 bool CalendarView::importQtopia( const QString &categories,
                                 const QString &datebook,
                                 const QString &todolist )
 {
    
   QtopiaFormat qtopiaFormat;
    qtopiaFormat.setCategoriesList (  &(KOPrefs::instance()->mCustomCategories));
    if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories );
    if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook );
    if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist );
   
    updateView();
    return true;
 #if 0
 mGlobalSyncMode = SYNC_MODE_QTOPIA;
    mCurrentSyncDevice = "qtopia-XML";
    if ( mSyncManager->mAskForPreferences )
        edit_sync_options(); 
    qApp->processEvents();
    CalendarLocal* calendar = new CalendarLocal();
    calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
    bool syncOK = false;
 QtopiaFormat qtopiaFormat;
    qtopiaFormat.setCategoriesList (  &(KOPrefs::instance()->mCustomCategories));
    bool loadOk = true;
    if ( !categories.isEmpty() ) 
        loadOk = qtopiaFormat.load( calendar, categories );
    if ( loadOk && !datebook.isEmpty() ) 
        loadOk = qtopiaFormat.load( calendar, datebook );
    if ( loadOk && !todolist.isEmpty() ) 
        loadOk = qtopiaFormat.load( calendar, todolist );
    if ( loadOk  ) {
        getEventViewerDialog()->setSyncMode( true );
        syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
        getEventViewerDialog()->setSyncMode( false );
        qApp->processEvents();
        if (  syncOK ) {
            if ( mSyncManager->mWriteBackFile )
            {
                // write back XML file
            }
        setModified( true );
        }
    } else {
        QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ;
        QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"),
                                      question, i18n("Ok")) ;
    }
    delete calendar;
    updateView();
    return syncOK;
 #endif
 }
    
 void CalendarView::setSyncEventsReadOnly()
 {
    Event * ev;
    QPtrList<Event> eL = mCalendar->rawEvents(); 
    ev = eL.first();
    while ( ev ) {
        if ( ev->uid().left(15) == QString("last-syncEvent-") )
            ev->setReadOnly( true );
        ev =  eL.next();
    } 
 }
 bool CalendarView::openCalendar(QString filename, bool merge)
 {
    if (filename.isEmpty()) {
        return false;
    }
    if (!QFile::exists(filename)) {
        KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
        return false;
    }
    globalFlagBlockAgenda = 1;
    if (!merge) mCalendar->close();
    mStorage->setFileName( filename );
    if ( mStorage->load() ) {
        if ( merge ) ;//setModified( true );
        else {
            //setModified( true );
            mViewManager->setDocumentId( filename );
            mDialogManager->setDocumentId( filename );
            mTodoList->setDocumentId( filename );
        }
        globalFlagBlockAgenda = 2;
        // if ( getLastSyncEvent() )
        //  getLastSyncEvent()->setReadOnly( true );
        mCalendar->reInitAlarmSettings();
        setSyncEventsReadOnly();
        updateUnmanagedViews();
        updateView();
        if (  filename != MainWindow::defaultFileName() ) {
            saveCalendar( MainWindow::defaultFileName() );
        } else {
            QFileInfo finf ( MainWindow::defaultFileName());   
            if ( finf.exists() ) {
                setLoadedFileVersion( finf.lastModified () );
            }
        }
        return true;
    } else {
        // while failing to load, the calendar object could
        // have become partially populated.  Clear it out.
        if ( !merge ) {
            mCalendar->close();
            mViewManager->setDocumentId( filename );
            mDialogManager->setDocumentId( filename );
            mTodoList->setDocumentId( filename );
        }
        //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
        QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); 
        globalFlagBlockAgenda = 2;
        mCalendar->reInitAlarmSettings();
        setSyncEventsReadOnly();
        updateUnmanagedViews();
        updateView();
    }
    return false;
 }
 void CalendarView::showOpenError()
 {
   KMessageBox::error(this,i18n("Couldn't load calendar\n."));
 }
 void CalendarView::setLoadedFileVersion(QDateTime dt)
 {
    loadedFileVersion = dt;
 }
 bool CalendarView::checkFileChanged(QString fn)
 {
    QFileInfo finf ( fn ); 
    if ( !finf.exists() )
        return true;
    QDateTime dt = finf.lastModified ();
    if ( dt <= loadedFileVersion )
        return false;
    return true;
 }
 void CalendarView::watchSavedFile()
 {
  QFileInfo finf ( MainWindow::defaultFileName());   
  if ( !finf.exists() )
    return;
  QDateTime dt = finf.lastModified ();
  if ( dt < loadedFileVersion ) {
      //qDebug("watch %s %s ",  dt.toString().latin1(), loadedFileVersion.toString().latin1());
    QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile()  ) );
    return;
  }
  loadedFileVersion = dt;
 }
 bool CalendarView::checkFileVersion(QString fn)
 {
    QFileInfo finf ( fn );  
    if ( !finf.exists() )
        return true;
    QDateTime dt = finf.lastModified ();
    //qDebug("loaded file version %s",loadedFileVersion.toString().latin1());
    //qDebug("file on disk version  %s",dt.toString().latin1());
    if ( dt <= loadedFileVersion )
        return true;
   int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                 i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                 i18n("Sync+save"));
   
   if ( km ==  KMessageBox::Cancel )
       return false;
   if ( km ==  KMessageBox::Yes )
       return true;
    setSyncDevice("deleteaftersync" );
    mSyncManager->mAskForPreferences = true;
    mSyncManager->mSyncAlgoPrefs = 3;
    mSyncManager->mWriteBackFile = false;
    mSyncManager->mWriteBackExistingOnly = false;
    mSyncManager->mShowSyncSummary = false;
    syncCalendar( fn, 3 );
    Event * e = getLastSyncEvent();
    mCalendar->deleteEvent ( e );
    updateView();
    return true;
 }
 bool CalendarView::saveCalendar( QString filename )
 {
 
    // Store back all unsaved data into calendar object
    // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
    if ( mViewManager->currentView() )
        mViewManager->currentView()->flushView();
    
    QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
    mStorage->setSaveFormat( new ICalFormat() );
    mStorage->setFileName( filename );
    bool success;
    success = mStorage->save();
    if ( !success ) {
        return false;
    }
    if ( filename == MainWindow::defaultFileName() ) {
        setLoadedFileVersion( lfv );
        watchSavedFile();
    }
    return true;
 }
 void CalendarView::closeCalendar()
 {
 
    // child windows no longer valid
    emit closingDown();
    mCalendar->close();
    setModified(false);
    updateView();
 }
 void CalendarView::archiveCalendar()
 {
    mDialogManager->showArchiveDialog();
 }
 void CalendarView::readSettings()
 {
 
@@ -1961,542 +1961,542 @@ void CalendarView::writeSettings()
        list << QString::number( w );
        list << QString::number( h );
        config->writeEntry("SearchLayout",list );
    }
 #endif
    config->sync();
 }
 void CalendarView::readFilterSettings(KConfig *config)
 {
    //  kdDebug() << "CalendarView::readFilterSettings()" << endl;
    mFilters.clear();
    config->setGroup("General");
    QStringList filterList = config->readListEntry("CalendarFilters");
    QStringList::ConstIterator it = filterList.begin();
    QStringList::ConstIterator end = filterList.end();
    while(it != end) {
        //    kdDebug() << "  filter: " << (*it) << endl;
        CalFilter *filter;
        filter = new CalFilter(*it);
        config->setGroup("Filter_" + (*it));
        //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) );
        filter->setCriteria(config->readNumEntry("Criteria",0));
        filter->setCategoryList(config->readListEntry("CategoryList"));
        mFilters.append(filter);
        ++it;
    }
    if (mFilters.count() == 0) {
        CalFilter *filter = new CalFilter(i18n("Default"));
        mFilters.append(filter);
    }
    mFilterView->updateFilters();
    config->setGroup("FilterView");
    mFilterView->blockSignals(true);
    mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled"));
    mFilterView->setSelectedFilter(config->readEntry("Current Filter"));
    mFilterView->blockSignals(false);
    // We do it manually to avoid it being done twice by the above calls
    updateFilter();
 }
 void CalendarView::writeFilterSettings(KConfig *config)
 {
    //  kdDebug() << "CalendarView::writeFilterSettings()" << endl;
    QStringList filterList;
    CalFilter *filter = mFilters.first();
    while(filter) {
        //    kdDebug() << " fn: " << filter->name() << endl;
        filterList << filter->name();
        config->setGroup("Filter_" + filter->name());
        config->writeEntry("Criteria",filter->criteria());
        config->writeEntry("CategoryList",filter->categoryList());
        filter = mFilters.next();
    }
    config->setGroup("General");
    config->writeEntry("CalendarFilters",filterList);
    config->setGroup("FilterView");
    config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
    config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 void CalendarView::goToday()
 {
    if ( mViewManager->currentView()->isMonthView() )
        mNavigator->selectTodayMonth();
    else
        mNavigator->selectToday();
 }
 void CalendarView::goNext()
 {
    mNavigator->selectNext();
 }
 void CalendarView::goPrevious()
 {
    mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
    mNavigator->selectNextMonth();
 }
 void CalendarView::goPreviousMonth()
 {
    mNavigator->selectPreviousMonth();
 }
 void CalendarView::writeLocale() 
 {
    //KPimGlobalPrefs::instance()->setGlobalConfig();
 #if 0
    KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
    KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
    KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
    KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage );
    QString dummy = KOPrefs::instance()->mUserDateFormatLong;
    KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
    dummy = KOPrefs::instance()->mUserDateFormatShort;
    KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
    KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving,
                                          KOPrefs::instance()->mDaylightsavingStart,
                                          KOPrefs::instance()->mDaylightsavingEnd );
    KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId );
 #endif
 }
 void CalendarView::updateConfig()
 {
    writeLocale();
    if ( KOPrefs::instance()->mUseAppColors )
        QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
    emit configChanged();
    mTodoList->updateConfig();
    // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
    mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
    // To make the "fill window" configurations work
    //mViewManager->raiseCurrentView();
 }
 void CalendarView::eventChanged(Event *event)
 {
    changeEventDisplay(event,KOGlobals::EVENTEDITED);
    //updateUnmanagedViews();
 }
 void CalendarView::eventAdded(Event *event)
 {
    changeEventDisplay(event,KOGlobals::EVENTADDED);
 }
 void CalendarView::eventToBeDeleted(Event *)
 {
    kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl;
 }
 void CalendarView::eventDeleted()
 {
    changeEventDisplay(0,KOGlobals::EVENTDELETED);
 }
 void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
    changeIncidenceDisplay((Incidence *)which,  action);
    mDateNavigator->updateView(); //LR
    //mDialogManager->updateSearchDialog();
    if (which) {
        mViewManager->updateWNview();
        //mTodoList->updateView();
    }
   
 }
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
    updateUnmanagedViews();
    //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++  %d  %d ",which, action );
    if ( action == KOGlobals::EVENTDELETED ) { //delete
        mCalendar->checkAlarmForIncidence( 0, true );
        if ( mEventViewerDialog )
            mEventViewerDialog->hide();
    } 
    else
        mCalendar->checkAlarmForIncidence( which , false );
 }
 // most of the changeEventDisplays() right now just call the view's
 // total update mode, but they SHOULD be recoded to be more refresh-efficient.
 void CalendarView::changeEventDisplay(Event *which, int action)
 {
    //  kdDebug() << "CalendarView::changeEventDisplay" << endl;
    changeIncidenceDisplay((Incidence *)which,  action);
    mDateNavigator->updateView();
    //mDialogManager->updateSearchDialog();
    if (which) {
        // If there is an event view visible update the display
        mViewManager->currentView()->changeEventDisplay(which,action);
        // TODO: check, if update needed
        //    if (which->getTodoStatus()) {
        mTodoList->updateView();
        //    }
    } else {
        mViewManager->currentView()->updateView();
    }
 }
 void CalendarView::updateTodoViews()
 {
   
    mTodoList->updateView();
    mViewManager->currentView()->updateView();
 
 }
 void CalendarView::updateView(const QDate &start, const QDate &end)
 {
    mTodoList->updateView();
    mViewManager->updateView(start, end);
    //mDateNavigator->updateView();
 }
 void CalendarView::updateView()
 {
    DateList tmpList = mNavigator->selectedDates();
    if ( KOPrefs::instance()->mHideNonStartedTodos ) 
        mTodoList->updateView();
    // We assume that the navigator only selects consecutive days.
    updateView( tmpList.first(), tmpList.last() );
 }
 void CalendarView::updateUnmanagedViews()
 {
    mDateNavigator->updateDayMatrix();
 }
 int CalendarView::msgItemDelete(const QString name)
 {
    return KMessageBox::warningContinueCancel(this,name +"\n\n"+
                                              i18n("This item will be\npermanently deleted."),
                                              i18n("KO/Pi Confirmation"),i18n("Delete"));
 }
 void CalendarView::edit_cut()
 {
    Event *anEvent=0;
    Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
    if (mViewManager->currentView()->isEventView()) {
        if ( incidence && incidence->type() == "Event" ) {
            anEvent = static_cast<Event *>(incidence);
        }
    }
    if (!anEvent) {
        KNotifyClient::beep();
        return;
    }
    DndFactory factory( mCalendar );
-    factory.cutEvent(anEvent);
+    factory.cutIncidence(anEvent);
    changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
 }
 void CalendarView::edit_copy()
 {
    Event *anEvent=0;
    Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
    if (mViewManager->currentView()->isEventView()) {
        if ( incidence && incidence->type() == "Event" ) {
            anEvent = static_cast<Event *>(incidence);
        }
    }
    if (!anEvent) {
        KNotifyClient::beep();
        return;
    }
    DndFactory factory( mCalendar );
-    factory.copyEvent(anEvent);
+    factory.copyIncidence(anEvent);
 }
 void CalendarView::edit_paste()
 {
    QDate date = mNavigator->selectedDates().first();
    DndFactory factory( mCalendar );
-    Event *pastedEvent = factory.pasteEvent( date );
+    Event *pastedEvent = (Event *)factory.pasteIncidence( date );
    changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
 void CalendarView::edit_options()
 {
    mDialogManager->showOptionsDialog();
    //writeSettings();
 }
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
    mDateFrame->hide();
    if ( mDatePickerMode == 1 ) {
        mNavigator->slotDaySelect( d );
    } else  if ( mDatePickerMode == 2 ) {
        if ( mMoveIncidence->type() == "Todo" ) {
            Todo * to = (Todo *) mMoveIncidence;
            QTime tim;
            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 );
            todoChanged( to );
        } else { 
            if ( mMoveIncidence->doesRecur() ) {
 #if 0 
                // PENDING implement this
                Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate );
                mCalendar()->addIncidence( newInc ); 
                if ( mMoveIncidence->type() == "Todo" )
                    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);
        }
        
        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();
    int i;
    int count = 0;
    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();
    int 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::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 )
 {
    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
    }
 }
 void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
    delete ir;
 #endif
    topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
    topLevelWidget()->raise();
 }
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
    if ( !inc ) return;
    // qDebug("showDatePickerForIncidence( ) ");
    if ( mDateFrame->isVisible() )
        mDateFrame->hide();
    else {
        int w =mDatePicker->sizeHint().width()+2*mDateFrame->lineWidth() ;
        int h = mDatePicker->sizeHint().height()+2*mDateFrame->lineWidth() ;
        int dw = QApplication::desktop()->width();
        int dh = QApplication::desktop()->height();
        mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
        mDateFrame->show();
    }
    mDatePickerMode = 2;
    mMoveIncidence = inc ;
    QDate da;
    if ( mMoveIncidence->type() == "Todo" ) {
        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::showDatePicker( ) 
 {
    //qDebug("CalendarView::showDatePicker( )  ");
    if ( mDateFrame->isVisible() )
        mDateFrame->hide();
    else {
        int w =mDatePicker->sizeHint().width() ;
        int h = mDatePicker->sizeHint().height() ;
        int dw = QApplication::desktop()->width();
        int dh = QApplication::desktop()->height();
        mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 4d67dca..3c7a1fb 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,191 +1,191 @@
        TEMPLATE= app
        CONFIG  += qt warn_off
        TARGET  = kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 include( ../variables.pri )
 INCLUDEPATH += ../microkde  ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
 #../qtcompat
-DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
+DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
-#KORG_NOPRINTER KORG_NOKABC 
+#KORG_NOPRINTER KORG_NOKABC KORG_NODND 
 DEFINES += KORG_NOLVALTERNATION
 DEFINES +=  DESKTOP_VERSION
 unix : {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 #LIBS += -lbluetooth
 #LIBS += -lsdp
 #LIBS += -lldap
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_  
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 #blabla: {
 LIBS += mfc71u.lib
 DEFINES +=  _OL_IMPORT_
 HEADERS += ../outport/msoutl9.h \
 koimportoldialog.h 
 SOURCES += ../outport/msoutl9.cpp \
 koimportoldialog.cpp
 #}
 #olimport section end
 }
 
 INTERFACES = kofilterview_base.ui 
 #filteredit_base.ui
 # kdateedit.h \
 HEADERS += \
 filteredit_base.h \
 alarmclient.h \
 calendarview.h \
 customlistviewitem.h \
 datenavigator.h \
 docprefs.h \
 filtereditdialog.h \
 incomingdialog.h \
 incomingdialog_base.h \
 interfaces/korganizer/baseview.h \
 interfaces/korganizer/calendarviewbase.h \
 journalentry.h \
 kdatenavigator.h \
 koagenda.h \
 koagendaitem.h \
 koagendaview.h \
 kocounterdialog.h \
 kodaymatrix.h \
 kodialogmanager.h \
 koeditordetails.h \
 koeditorgeneral.h \
 koeditorgeneralevent.h \
 koeditorgeneraltodo.h \
 koeditorrecurrence.h \
 koeventeditor.h \
 koeventpopupmenu.h \
 koeventview.h \
 koeventviewer.h \
 koeventviewerdialog.h \
 kofilterview.h \
 koglobals.h \
 koincidenceeditor.h \
 kojournalview.h \
 kolistview.h \
 kolocationbox.h \
 komonthview.h \
 koprefs.h \
 koprefsdialog.h \
 kotimespanview.h \
 kotodoeditor.h \
 kotodoview.h \
 kotodoviewitem.h \
 koviewmanager.h \
 kowhatsnextview.h \
 ktimeedit.h \
 lineview.h \
 mainwindow.h \
 navigatorbar.h \
 outgoingdialog.h \
 outgoingdialog_base.h \
 publishdialog.h \
 publishdialog_base.h \
 savetemplatedialog.h \
 searchdialog.h \
 simplealarmclient.h \
 statusdialog.h \
 timeline.h \
 timespanview.h \
 version.h \
 ../kalarmd/alarmdialog.h \
 SOURCES += \ 
 filteredit_base.cpp \
 calendarview.cpp \
 datenavigator.cpp \
 docprefs.cpp \
 filtereditdialog.cpp \
 incomingdialog.cpp \
 incomingdialog_base.cpp \
 journalentry.cpp \
 kdatenavigator.cpp \
 koagenda.cpp \
 koagendaitem.cpp \
 koagendaview.cpp \
 kocounterdialog.cpp \
 kodaymatrix.cpp \
 kodialogmanager.cpp \
 koeditordetails.cpp \
 koeditorgeneral.cpp \
 koeditorgeneralevent.cpp \
 koeditorgeneraltodo.cpp \
 koeditorrecurrence.cpp \
 koeventeditor.cpp \
 koeventpopupmenu.cpp \
 koeventview.cpp \
 koeventviewer.cpp \
 koeventviewerdialog.cpp \
 kofilterview.cpp \
 koglobals.cpp \
 koincidenceeditor.cpp \
 kojournalview.cpp \
 kolistview.cpp \
 kolocationbox.cpp \
 komonthview.cpp \
 koprefs.cpp \
 koprefsdialog.cpp \
 kotimespanview.cpp \
 kotodoeditor.cpp \
 kotodoview.cpp \
 kotodoviewitem.cpp \
 koviewmanager.cpp \
 kowhatsnextview.cpp \
 ktimeedit.cpp \
 lineview.cpp \
 main.cpp \
 mainwindow.cpp \
 navigatorbar.cpp \
 outgoingdialog.cpp \
 outgoingdialog_base.cpp \
 publishdialog.cpp \
 publishdialog_base.cpp \
 savetemplatedialog.cpp \
 searchdialog.cpp \
 simplealarmclient.cpp \
 statusdialog.cpp \
 timeline.cpp \
 timespanview.cpp \
 ../kalarmd/alarmdialog.cpp
 HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
 INTERFACES += calprintdayconfig_base.ui \
              calprintmonthconfig_base.ui \
              calprinttodoconfig_base.ui \
              calprintweekconfig_base.ui
 SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 1fb480d..8c1953d 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1,762 +1,771 @@
 /*
    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.
    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 <qlayout.h>
 #include <qheader.h>
 #include <qcursor.h>
 #include <qvbox.h>
 #include <kdebug.h>
 #include "koprefs.h"
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/calfilter.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "docprefs.h"
 #include "kotodoview.h"
 using namespace KOrg;
 KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
                               const char *name) :
  KListView(parent,name)
 {
  mName = QString ( name );
  mCalendar = calendar;
 #ifndef DESKTOP_VERSION
  QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
  mOldCurrent = 0;
  mMousePressed = false;
  setAcceptDrops(true);
  viewport()->setAcceptDrops(true);
  int size = 16;
  if (qApp->desktop()->width() < 300 )
      size = 12;
  setTreeStepSize( size + 6 );
 }
 void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
  if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
       !QTextDrag::canDecode( e ) ) {
    e->ignore();
    return;
  }
  mOldCurrent = currentItem();
 #endif
 }
 void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl;
  if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
       !QTextDrag::canDecode( e ) ) {
    e->ignore();
    return;
  }
  e->accept();
 #endif
 }
 void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragLeaveEvent" << endl;
  setCurrentItem(mOldCurrent);
  setSelected(mOldCurrent,true);
 #endif
 }
 void KOTodoListView::contentsDropEvent(QDropEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDropEvent" << endl;
  if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
       !QTextDrag::canDecode( e ) ) {
    e->ignore();
    return;
  }
  DndFactory factory( mCalendar );
  Todo *todo = factory.createDropTodo(e);
  if (todo) {
    e->acceptAction();
    KOTodoViewItem *destination =
        (KOTodoViewItem *)itemAt(contentsToViewport(e->pos()));
    Todo *destinationEvent = 0;
    if (destination) destinationEvent = destination->todo();
    Todo *existingTodo = mCalendar->todo(todo->uid());
    if(existingTodo) {
-//      kdDebug() << "Drop existing Todo" << endl;
      Incidence *to = destinationEvent;
      while(to) {
        if (to->uid() == todo->uid()) {
          KMessageBox::sorry(this,
-              i18n("Cannot move To-Do to itself or a child of itself"),
+              i18n("Cannot move To-Do to itself\nor a child of itself"),
              i18n("Drop To-Do"));
          delete todo;
          return;
        }
        to = to->relatedTo();
      }
-      existingTodo->setRelatedTo(destinationEvent);
+      internalDrop = true;
-      emit todoDropped(todo);
+      if ( destinationEvent )
+          reparentTodoSignal( destinationEvent, existingTodo );
+      else 
+          unparentTodoSignal(existingTodo);
      delete todo;
    } else {
-//      kdDebug() << "Drop new Todo" << endl;
-      todo->setRelatedTo(destinationEvent);
      mCalendar->addTodo(todo);
+      emit todoDropped(todo, KOGlobals::EVENTADDED);
-      emit todoDropped(todo);
+      if ( destinationEvent )
+          reparentTodoSignal( destinationEvent, todo );
    }
  }
  else {
    QString text;
    if (QTextDrag::decode(e,text)) {
      //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
      KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) ));
-      kdDebug() << "Dropped : " << text << endl;
+      qDebug("Dropped : " + text);
      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() && todoi) {
          todoi->todo()->addAttendee(new Attendee(name,email));
        }
      }
    }
    else {
-      kdDebug() << "KOTodoListView::contentsDropEvent(): Todo from drop not decodable" << endl;
+        qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable ");
      e->ignore();
    }
  }
 #endif
 }
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
-  QListView::contentsMousePressEvent(e);
 #ifndef KORG_NODND
  QPoint p(contentsToViewport(e->pos()));
  QListViewItem *i = itemAt(p);
+  mMousePressed = false; 
  if (i) {
    // if the user clicked into the root decoration of the item, don't
    // try to start a drag!
    if (p.x() > header()->sectionPos(header()->mapToIndex(0)) +
        treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
        itemMargin() ||
        p.x() < header()->sectionPos(header()->mapToIndex(0))) {
      if (e->button()==Qt::LeftButton) {
        mPressPos = e->pos();
        mMousePressed = true;
      }
    }
  }
 #endif
+   QListView::contentsMousePressEvent(e);   
 }
 void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
 {
 #ifndef KORG_NODND
-//  kdDebug() << "KOTodoListView::contentsMouseMoveEvent()" << endl;
  QListView::contentsMouseMoveEvent(e);
  if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
      QApplication::startDragDistance()) {
    mMousePressed = false;
    QListViewItem *item = itemAt(contentsToViewport(mPressPos));
    if (item) {
-//      kdDebug() << "Start Drag for item " << item->text(0) << endl;
      DndFactory factory( mCalendar );
-      ICalDrag *vd = factory.createDragTodo(
+      ICalDrag *vd = factory.createDrag(
                          ((KOTodoViewItem *)item)->todo(),viewport());
+      internalDrop = false;
+      // we cannot do any senseful here, because the DnD is still broken in Qt
      if (vd->drag()) {
-        kdDebug() << "KOTodoListView::contentsMouseMoveEvent(): Delete drag source" << endl;
+          if ( !internalDrop ) {
+              //emit deleteTodo( ((KOTodoViewItem *)item)->todo() );
+              qDebug("Dnd: External move: Delete drag source "); 
+          } else
+              qDebug("Dnd: Internal move ");
+          
+      } else {
+          if ( !internalDrop ) {
+              qDebug("Dnd: External Copy");
+          } else
+              qDebug("DnD: Internal copy: Copy pending");
      }
-/*
-      QString source = fullPath(item);
-      if ( QFile::exists(source) ) {
-        QUriDrag* ud = new QUriDrag(viewport());
-        ud->setFilenames( source );
-        if ( ud->drag() )
-          QMessageBox::information( this, "Drag source",
-                                    QString("Delete ")+source, "Not implemented" );
-*/
    }
  }
 #endif
 }
 void KOTodoListView::keyPressEvent ( QKeyEvent * e )
 {
    
    QListViewItem* cn;
    if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) {
        cn = currentItem();
        if ( cn ) {
            KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
            if ( ci ){
                if ( e->state() == ShiftButton )
                    ci->setOn( false );
                else
                    ci->setOn( true );
                cn = cn->nextSibling();
                if ( cn ) {
                    setCurrentItem ( cn );
                    ensureItemVisible ( cn );
                }
                
            }
        }
        
        return;
    }
   
    //  qDebug("KOTodoListView::keyPressEvent  ");
    if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall"  ) {
        switch ( e->key() ) {
        case Qt::Key_Down:
        case Qt::Key_Up:
            QListView::keyPressEvent (  e );
            break; 
        case Qt::Key_Left:
        case Qt::Key_Right:
            QListView::keyPressEvent (  e );
            e->accept();
            return;
            break; 
        default:
            e->ignore();
            break;
        }
        return;
    }
    e->ignore();
 }
 void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
  QListView::contentsMouseReleaseEvent(e);
  mMousePressed = false;
 }
 void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
  if (!e) return;
  QPoint vp = contentsToViewport(e->pos());
  QListViewItem *item = itemAt(vp);
  emit double_Clicked(item);
  if (!item) return;
  emit doubleClicked(item,vp,0);
 }
 /////////////////////////////////////////////////////////////////////////////
 KOQuickTodo::KOQuickTodo(QWidget *parent) :
  QLineEdit(parent)
 {
  setText(i18n("Click to add a new Todo"));
 }
 void KOQuickTodo::focusInEvent(QFocusEvent *ev)
 {
  if ( text()==i18n("Click to add a new Todo") )
    setText("");
  QLineEdit::focusInEvent(ev);
 }
 void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 {
  setText(i18n("Click to add a new Todo"));
  QLineEdit::focusOutEvent(ev);
 }
 /////////////////////////////////////////////////////////////////////////////
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  KOrg::BaseView(calendar,parent,name)
 {
  mNavigator = 0;
  QBoxLayout *topLayout = new QVBoxLayout(this);
  mName = QString ( name );
  mBlockUpdate = false;
  mQuickAdd = new KOQuickTodo(this);
  topLayout->addWidget(mQuickAdd);
  if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide();
  mTodoListView = new KOTodoListView(calendar,this, name );
  topLayout->addWidget(mTodoListView);
  //mTodoListView->header()->setMaximumHeight(30);
  mTodoListView->setRootIsDecorated(true);
  mTodoListView->setAllColumnsShowFocus(true);
  mTodoListView->setShowSortIndicator(true);
  mTodoListView->addColumn(i18n("Todo"));
  mTodoListView->addColumn(i18n("Prio"));
  mTodoListView->setColumnAlignment(1,AlignHCenter);
  mTodoListView->addColumn(i18n("Complete"));
  mTodoListView->setColumnAlignment(2,AlignCenter);
  mTodoListView->addColumn(i18n("Due Date"));
  mTodoListView->setColumnAlignment(3,AlignLeft);
  mTodoListView->addColumn(i18n("Due Time"));
  mTodoListView->setColumnAlignment(4,AlignHCenter);
  mTodoListView->addColumn(i18n("Start Date"));
  mTodoListView->setColumnAlignment(5,AlignLeft);
  mTodoListView->addColumn(i18n("Start Time"));
  mTodoListView->setColumnAlignment(6,AlignHCenter);
  mTodoListView->addColumn(i18n("Cancelled"));
  mTodoListView->addColumn(i18n("Categories"));
 #if 0
  mTodoListView->addColumn(i18n("Sort Id"));
  mTodoListView->setColumnAlignment(4,AlignHCenter);
 #endif
  mTodoListView->setMinimumHeight( 60 );
  mTodoListView->setItemsRenameable( true );
  mTodoListView->setRenameable( 0 );
  mTodoListView->setColumnWidth( 0, 120 );
  mTodoListView->setColumnWidthMode(0, QListView::Manual);
  mTodoListView->setColumnWidthMode(1, QListView::Manual);
  mTodoListView->setColumnWidthMode(2, QListView::Manual);
  mTodoListView->setColumnWidthMode(3, QListView::Manual);
  mTodoListView->setColumnWidthMode(4, QListView::Manual);
  mTodoListView->setColumnWidthMode(5, QListView::Manual);
  mTodoListView->setColumnWidthMode(6, QListView::Manual);
  mTodoListView->setColumnWidthMode(7, QListView::Manual);
  mTodoListView->setColumnWidthMode(8, QListView::Manual);
 
  mPriorityPopupMenu = new QPopupMenu(this);
  for (int i = 1; i <= 5; i++) {
    QString label = QString ("%1").arg (i);
    mPriority[mPriorityPopupMenu->insertItem (label)] = i;
  }
  connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
  mPercentageCompletedPopupMenu = new QPopupMenu(this);
  for (int i = 0; i <= 100; i+=20) {
    QString label = QString ("%1 %").arg (i);
    mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
  }
  connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
  
  mItemPopupMenu = new QPopupMenu(this);
  mItemPopupMenu->insertItem(i18n("Show..."), this,
                             SLOT (showTodo()));
  mItemPopupMenu->insertItem(i18n("Edit..."), this,
                             SLOT (editTodo()));
  mItemPopupMenu->insertItem( i18n("Delete"), this,
                             SLOT (deleteTodo()));
  mItemPopupMenu->insertItem( i18n("Clone..."), this,
                             SLOT (cloneTodo()));
  mItemPopupMenu->insertItem( i18n("Move..."), this,
                             SLOT (moveTodo()));
  mItemPopupMenu->insertItem( i18n("Beam..."), this,
                             SLOT (beamTodo()));
  mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                             SLOT (cancelTodo()));
  mItemPopupMenu->insertSeparator();
  mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                             SLOT (newTodo()));
  mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                             SLOT (newSubTodo())); 
  mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
                             SLOT (unparentTodo()),0,21);
  mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
                             SLOT (reparentTodo()),0,22);
  mItemPopupMenu->insertSeparator();
 #if 0
  mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"),
                             this, SLOT( purgeCompleted() ) );
  mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
                             this, SLOT( toggleCompleted() ),0, 33 );
  mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                             this, SLOT( toggleQuickTodo() ),0, 34 );
  mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                             this, SLOT( toggleRunning() ),0, 35 );
  
 #endif
  mPopupMenu = new QPopupMenu(this);
  mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
                         SLOT (newTodo()),0,1);
  mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed"),
                         this, SLOT(purgeCompleted()),0,2);
  mPopupMenu->insertItem(i18n("Show Completed"),
                             this, SLOT( toggleCompleted() ),0,3 );
  mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                             this, SLOT( toggleQuickTodo() ),0,4 );
  mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                             this, SLOT( toggleRunning() ),0,5 );
  mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
                             this, SLOT( setAllOpen() ),0,6 );
  mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
                             this, SLOT( setAllClose() ),0,7 );
  mPopupMenu->insertItem(i18n(" set all flat","Display all flat"),
                             this, SLOT( setAllFlat() ),0,8 );
  mDocPrefs = new DocPrefs( name );
 
  mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu );
  mPopupMenu->setCheckable( true );
  mItemPopupMenu->setCheckable( true );
  mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo  );
  mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo   );
  mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
  mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
  mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
  mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
  // Double clicking conflicts with opening/closing the subtree
  connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
           SLOT( editItem( QListViewItem *) ) );
  /*
  connect( mTodoListView, SIGNAL(  rightButtonClicked ( QListViewItem *,
                                                        const QPoint &,int ) ),
           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
  */ 
  connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
                                                        const QPoint &,int ) ),
           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
  connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
           SLOT( itemClicked( QListViewItem * ) ) );
  connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
           SLOT( itemDoubleClicked( QListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( todoDropped( Todo * ) ),
+  connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
           SLOT( updateView() ) );
+  connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
+           SLOT( todoModified(Todo *, int) ) );
  connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
           SLOT( itemStateChanged( QListViewItem * ) ) );
  connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
           SLOT( itemStateChanged( QListViewItem * ) ) );
 #if 0
  connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
          SLOT(selectionChanged(QListViewItem *)));
  connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
          SLOT(selectionChanged(QListViewItem *)));
  connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
          SLOT(selectionChanged(QListViewItem *)));
 #endif
+  connect( mTodoListView, SIGNAL(reparentTodoSignal( Todo *,Todo * ) ), SIGNAL(reparentTodoSignal( Todo *,Todo * ) ));
+  connect( mTodoListView, SIGNAL(unparentTodoSignal(Todo *)  ), SIGNAL(unparentTodoSignal(Todo *)  ));
+  connect( mTodoListView, SIGNAL( deleteTodo(Todo *)  ), SIGNAL(deleteTodoSignal(Todo *)  ));
  connect( mTodoListView, SIGNAL(selectionChanged() ),
           SLOT( processSelectionChange() ) );
  connect( mQuickAdd, SIGNAL( returnPressed () ),
           SLOT( addQuickTodo() ) );
 
 }
 KOTodoView::~KOTodoView()
 {
  delete mDocPrefs;
 }
 void KOTodoView::jumpToDate ()
 {
  //   if (mActiveItem) {
 //     mActiveItem->todo());
 //    if ( mActiveItem->todo()->hasDueDate() )
 //       emit mActiveItem->todo()jumpToTime( mTodo->dtDue().date() );
 }
 void KOTodoView::updateView()
 {
    pendingSubtodo = 0;
    if ( mBlockUpdate ) {
        //qDebug("blocked ");
        return;
    }
    if ( isFlatDisplay ) {
        setAllFlat();
        return;
    }
    //qDebug("update ");
 //  kdDebug() << "KOTodoView::updateView()" << endl;
    QFont fo = KOPrefs::instance()->mTodoViewFont;
    mTodoListView->clear();
    if ( mName == "todolistsmall" ) {
        if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
            int ps = fo.pointSize() -2;
            if ( ps > 12 )
                ps -= 2;
            fo.setPointSize( ps );
        } 
    }
    
  mTodoListView->setFont( fo );
  // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont );
  //mTodoListView->header()->setMaximumHeight(fm.height());
  QPtrList<Todo> todoList = calendar()->todos();
 /*
  kdDebug() << "KOTodoView::updateView(): Todo List:" << endl;
  Event *t;
  for(t = todoList.first(); t; t = todoList.next()) {
    kdDebug() << "  " << t->getSummary() << endl;
    if (t->getRelatedTo()) {
      kdDebug() << "      (related to " << t->getRelatedTo()->getSummary() << ")" << endl;
    }
    QPtrList<Event> l = t->getRelations();
    Event *c;
    for(c=l.first();c;c=l.next()) {
      kdDebug() << "    - relation: " << c->getSummary() << endl;
    }
  }
 */
  // Put for each Event a KOTodoViewItem in the list view. Don't rely on a
  // specific order of events. That means that we have to generate parent items
  // recursively for proper hierarchical display of Todos.
  mTodoMap.clear();
  Todo *todo;
  todo = todoList.first();// todo; todo = todoList.next()) {
  while ( todo ) {
      bool next = true;
      // qDebug("todo %s ", todo->summary().latin1());
      Incidence *incidence = todo->relatedTo();
      while  ( incidence ) {
          if ( incidence->type() == "Todo") {
              //qDebug("related %s ",incidence->summary().latin1() );
              if ( !(todoList.contains ( ((Todo* )incidence ) ) )) {
                  //qDebug("related not found ");
                  todoList.remove( );
                  todo = todoList.current();
                  next = false;
                  incidence = 0;
              } else {
                  //qDebug("related found  ");
                  incidence = incidence->relatedTo();
              }
          } else 
              incidence = 0;
      }
      if ( next )
          todo = todoList.next();
  }
 //   qDebug("again .... ");
 //   for(todo = todoList.first(); todo; todo = todoList.next()) {
      
 //       qDebug("yytodo %s ", todo->summary().latin1());
 //   }
  //qDebug("for  ");
  for(todo = todoList.first(); todo; todo = todoList.next()) {
      if (!mTodoMap.contains(todo)  && checkTodo( todo ) )
      {
      insertTodoItem(todo);
    }
  }
  //qDebug("for end ");
  // Restore opened/closed state
  mTodoListView->blockSignals( true );
  if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
  mTodoListView->blockSignals( false );
  mTodoListView->setFocus();
  processSelectionChange();
 }
 bool KOTodoView::checkTodo( Todo * todo )
 {
   
    if (  !KOPrefs::instance()->mShowCompletedTodo &&  todo->isCompleted() )
        return false;
    if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) {
        if ( todo->hasStartDate() ) 
            if ( mNavigator->selectedDates().last() < todo->dtStart().date() )
                return false;
        if ( todo->hasDueDate() ) 
            if ( mNavigator->selectedDates().first() > todo->dtDue().date() )
                return false;
    }
    return true;
 }
 void KOTodoView::restoreItemState( QListViewItem *item )
 {
    pendingSubtodo = 0;
  while( item ) {
    KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
    todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) );
    if( item->childCount() > 0 ) restoreItemState( item->firstChild() );
    item = item->nextSibling();
  }
 }
 QMap<Todo *,KOTodoViewItem *>::ConstIterator
  KOTodoView::insertTodoItem(Todo *todo)
 {
 //  kdDebug() << "KOTodoView::insertTodoItem(): " << todo->getSummary() << endl;
  // TODO: Check, if dynmaic cast is necessary
    pendingSubtodo = 0;
  Incidence *incidence = todo->relatedTo();
  if (incidence && incidence->type() == "Todo") {
    Todo *relatedTodo = static_cast<Todo *>(incidence);
 //    kdDebug() << "  has Related" << endl;
    QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
    itemIterator = mTodoMap.find(relatedTodo);
    if (itemIterator == mTodoMap.end()) {
 //      kdDebug() << "    related not yet in list" << endl;
      itemIterator = insertTodoItem (relatedTodo);
    }
    // isn't this pretty stupid? We give one Todo  to the KOTodoViewItem
    // and one into the map. Sure finding is more easy but why? -zecke
    KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this);
    return mTodoMap.insert(todo,todoItem);
  } else {
 //    kdDebug() << "  no Related" << endl;
      // see above -zecke
    KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
    return mTodoMap.insert(todo,todoItem);
  }
 }
 void KOTodoView::updateConfig()
 {
    updateView();
  mTodoListView->repaintContents();
 }
 QPtrList<Incidence> KOTodoView::selectedIncidences()
 {
  QPtrList<Incidence> selected;
  KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
 //  if (!item) item = mActiveItem;
  if (item) selected.append(item->todo());
  return selected;
 }
 QPtrList<Todo> KOTodoView::selectedTodos()
 {
  QPtrList<Todo> selected;
  KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
 //  if (!item) item = mActiveItem;
  if (item) selected.append(item->todo());
  return selected;
 }
 void KOTodoView::changeEventDisplay(Event *, int)
 {
  updateView();
 }
 void KOTodoView::showDates(const QDate &, const QDate &)
 {
 }
 void KOTodoView::showEvents(QPtrList<Event>)
 {
  kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl;
 }
 void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                              const QDate &td)
 {
 #ifndef KORG_NOPRINTER
  calPrinter->preview(CalPrinter::Todolist, fd, td);
 #endif
 }
 void KOTodoView::editItem(QListViewItem *item )
 {
    // qDebug("editItem(QListViewItem *item ) ");
  emit editTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
 {
  emit showTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 void KOTodoView::popupMenu(QListViewItem *item,const QPoint &,int column)
 {
    pendingSubtodo = 0;
  mActiveItem = (KOTodoViewItem *)item;
  if (item) {
    switch (column){
    case 1:
      mPriorityPopupMenu->popup(QCursor::pos ()); break;
    case 2:
      mPercentageCompletedPopupMenu->popup(QCursor::pos ()); break;
    case 3:
         moveTodo();
        break;
    case 8:
      getCategoryPopupMenu((KOTodoViewItem *)item)->popup(QCursor::pos ()); break;
    default:
      mItemPopupMenu->popup(QCursor::pos());
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index f11518d..68e29bb 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -1,244 +1,247 @@
 /*
    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.
    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 KOTODOVIEW_H
 #define KOTODOVIEW_H
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qlineedit.h>
 #include <qptrlist.h>
 #include <qstrlist.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
 #include <qlistview.h>
 #include <klistview.h>
 #include <libkcal/calendar.h>
 #include <libkcal/todo.h>
 #include <korganizer/baseview.h>
 #include "kotodoviewitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 #include "datenavigator.h"
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 class DocPrefs;
 class KOTodoListView : public KListView
 {
    Q_OBJECT
  public:
    KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
    virtual ~KOTodoListView() {}
  signals:
-    void todoDropped(Todo *);  
+    void todoDropped(Todo *, int);  
    void double_Clicked(QListViewItem *item);
+    void reparentTodoSignal( Todo *,Todo * );
+    void unparentTodoSignal(Todo *);
+    void deleteTodo( Todo * );
  protected:
    void contentsDragEnterEvent(QDragEnterEvent *);
    void contentsDragMoveEvent(QDragMoveEvent *);
    void contentsDragLeaveEvent(QDragLeaveEvent *);
    void contentsDropEvent(QDropEvent *);
    void contentsMousePressEvent(QMouseEvent *);
    void contentsMouseMoveEvent(QMouseEvent *);
    void contentsMouseReleaseEvent(QMouseEvent *);
    void contentsMouseDoubleClickEvent(QMouseEvent *);
  private:
+    bool internalDrop;
    QString mName;
    Calendar *mCalendar;
    QPoint mPressPos;
    bool mMousePressed;
    QListViewItem *mOldCurrent;
    void keyPressEvent ( QKeyEvent * ) ;
 };
 /**
  This is the line-edit on top of the todoview for fast addition of new todos
 */
 class KOQuickTodo : public QLineEdit
 {
  public:
    KOQuickTodo(QWidget *parent=0);
  protected:
    void focusInEvent(QFocusEvent *ev);
    void focusOutEvent(QFocusEvent *ev);
 };
 /**
  This class provides a multi-column list view of todo events.
  @short multi-column list view of todo events.
  @author Cornelius Schumacher <schumacher@kde.org>
 */
 class KOTodoView : public KOrg::BaseView
 {
    Q_OBJECT
  public:
    KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 );
    ~KOTodoView();
    QPtrList<Incidence> selectedIncidences();
    QPtrList<Todo> selectedTodos();
    DateList selectedDates()
      {DateList q;
       return q;}
    /** Return number of shown dates. TodoView does not show dates, */
    int currentDateCount() { return 0; }
    void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td);
    void setDocumentId( const QString & );
    void saveLayout(KConfig *config, const QString &group) const;
    void restoreLayout(KConfig *config, const QString &group);
    /** Create a popup menu to set categories */
    QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
    void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
  public slots:
    void updateView();
    void updateConfig();
    void changeEventDisplay(Event *, int);
    void showDates(const QDate &start, const QDate &end);
    void showEvents(QPtrList<Event> eventList);
    void clearSelection();
    void jumpToDate ();
    void editItem(QListViewItem *item);
    void showItem(QListViewItem *item,const QPoint &,int);
    void popupMenu(QListViewItem *item,const QPoint &,int);
    void newTodo();
    void newSubTodo();
    void unparentTodo();
    void reparentTodo();
    void showTodo();
    void editTodo();
    void cloneTodo();
    void cancelTodo();
    void moveTodo();
    void beamTodo();
    void deleteTodo();
    void setNewPriority(int);
    void setNewPercentage(int);
    void changedCategories(int);
    void setAllOpen();
    void setAllClose();
    void setAllFlat();
    void purgeCompleted();
    void toggleCompleted();
    void toggleRunning();
    void toggleQuickTodo();
    void updateTodo( Todo *, int );
    void itemClicked(QListViewItem *);
    void itemStateChanged(QListViewItem *);
    void modified(bool);
    void itemDoubleClicked(QListViewItem *item);
  signals:
    void newTodoSignal();
    void newSubTodoSignal(Todo *);
    void unparentTodoSignal(Todo *);
    void reparentTodoSignal( Todo *,Todo * );
    void showTodoSignal(Todo *);
    void editTodoSignal(Todo *);
    void deleteTodoSignal(Todo *);
    void todoModifiedSignal (Todo *, int);
    void isModified(bool);
    void cloneTodoSignal( Incidence * );
    void cancelTodoSignal( Incidence * );
    void moveTodoSignal( Incidence * );
    void beamTodoSignal( Incidence * );
    void purgeCompletedSignal();
  protected slots:
    void processSelectionChange();
    void addQuickTodo();
+    void setTodoModified( Todo* );
+    void todoModified(Todo *, int );
  private:
    /*
     * the TodoEditor approach is rather unscaling in the long
     * run.
     * Korganizer keeps it in memory and we need to update
     * 1. make KOTodoViewItem a QObject again?
     * 2. add a public method for setting one todo modified?
     * 3. add a private method for setting a todo modified + friend here?
     *  -- zecke 2002-07-08
     */
    friend class KOTodoViewItem;
-    void setTodoModified( Todo* );
    QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
    void restoreItemState( QListViewItem * );
    bool checkTodo( Todo * );
    bool isFlatDisplay;
    void  setOpen( QListViewItem*, bool setOpen);
    KOTodoListView *mTodoListView;
    QPopupMenu *mItemPopupMenu;
    QPopupMenu *mPopupMenu;
    QPopupMenu *mPriorityPopupMenu;
    QPopupMenu *mPercentageCompletedPopupMenu;
    QPopupMenu *mCategoryPopupMenu;
    QMap<int, int> mPercentage;
    QMap<int, int> mPriority;
    QMap<int, QString> mCategory;
    KOTodoViewItem *mActiveItem;
    QMap<Todo *,KOTodoViewItem *> mTodoMap;
    QString mName;
    DocPrefs *mDocPrefs;
    QString mCurrentDoc;
    KOQuickTodo *mQuickAdd;
    bool mBlockUpdate;
-    void todoModified(Todo *, int );
    void keyPressEvent ( QKeyEvent * ) ;
    KOTodoViewItem * pendingSubtodo;
    DateNavigator* mNavigator;
 };
 #endif
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
new file mode 100644
index 0000000..cdcfae4
--- a/dev/null
+++ b/libkcal/dndfactory.cpp
@@ -0,0 +1,186 @@
+/*
+    This file is part of libkcal.
+    Copyright (c) 1998 Preston Brwon
+    Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
+    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 <qapplication.h>
+#include <qclipboard.h>
+#include <kiconloader.h>
+#include <kdebug.h>
+#include <kmessagebox.h>
+#include <klocale.h>
+#include "vcaldrag.h"
+#include "icaldrag.h"
+#include "calendar.h"
+#include "vcalformat.h"
+#include "icalformat.h"
+#include "calendarlocal.h"
+#include "dndfactory.h"
+using namespace KCal;
+DndFactory::DndFactory( Calendar *cal ) :
+  mCalendar( cal )
+{
+}
+ICalDrag *DndFactory::createDrag( Incidence *incidence, QWidget *owner )
+{
+  CalendarLocal cal( mCalendar->timeZoneId() );
+  Incidence *i = incidence->clone();
+  cal.addIncidence( i );
+  ICalDrag *icd = new ICalDrag( &cal, owner );
+  if ( i->type() == "Event" )
+    icd->setPixmap( BarIcon( "appointment" ) );
+  else if ( i->type() == "Todo" )
+    icd->setPixmap( BarIcon( "todo" ) );
+  return icd;
+}
+Event *DndFactory::createDrop(QDropEvent *de)
+{
+  kdDebug(5800) << "DndFactory::createDrop()" << endl;
+  CalendarLocal cal( mCalendar->timeZoneId() );
+  if ( ICalDrag::decode( de, &cal ) || VCalDrag::decode( de, &cal ) ) {
+    de->accept();
+    QPtrList<Event> events = cal.events();
+    if ( !events.isEmpty() ) {
+      Event *event = new Event( *events.first() );
+      return event;
+    }
+  }
+  return 0;
+}
+Todo *DndFactory::createDropTodo(QDropEvent *de)
+{
+  kdDebug(5800) << "VCalFormat::createDropTodo()" << endl;
+  CalendarLocal cal( mCalendar->timeZoneId() );
+  if ( ICalDrag::decode( de, &cal ) || VCalDrag::decode( de, &cal ) ) {
+    de->accept();
+    QPtrList<Todo> todos = cal.todos();
+    if ( !todos.isEmpty() ) {
+      Todo *todo = new Todo( *todos.first() );
+      return todo;
+    }
+  }
+  return 0;
+}
+void DndFactory::cutIncidence( Incidence *selectedInc )
+{
+  if ( copyIncidence( selectedInc ) ) {
+    mCalendar->deleteIncidence( selectedInc );
+  }
+}
+bool DndFactory::copyIncidence( Incidence *selectedInc )
+{
+  if ( !selectedInc ) 
+    return false;
+  QClipboard *cb = QApplication::clipboard();
+  CalendarLocal cal( mCalendar->timeZoneId() );
+  Incidence *inc = selectedInc->clone();
+  cal.addIncidence( inc );
+  cb->setData( new ICalDrag( &cal ) );
+  return true;
+}
+Incidence *DndFactory::pasteIncidence(const QDate &newDate, const QTime *newTime)
+{
+//  kdDebug(5800) << "DnDFactory::pasteEvent()" << endl;
+  CalendarLocal cal( mCalendar->timeZoneId() );
+  QClipboard *cb = QApplication::clipboard();
+  if ( !ICalDrag::decode( cb->data(), &cal ) &&
+       !VCalDrag::decode( cb->data(), &cal ) ) {
+    kdDebug(5800) << "Can't parse clipboard" << endl;
+    return 0;
+  }
+  QPtrList<Incidence> incList = cal.incidences();
+  Incidence *inc = incList.first();
+  if ( !incList.isEmpty() && inc ) {
+    inc = inc->clone();
+    inc->recreate();
+    if ( inc->type() == "Event" ) {
+      
+      Event *anEvent = static_cast<Event*>( inc );
+      // Calculate length of event
+      int daysOffset = anEvent->dtStart().date().daysTo(
+        anEvent->dtEnd().date() );
+      // new end date if event starts at the same time on the new day
+      QDateTime endDate( newDate.addDays(daysOffset), anEvent->dtEnd().time() );
+      if ( newTime ) {
+        // additional offset for new time of day
+        int addSecsOffset( anEvent->dtStart().time().secsTo( *newTime ));
+        endDate=endDate.addSecs( addSecsOffset );
+        anEvent->setDtStart( QDateTime( newDate, *newTime ) );
+      } else {
+        anEvent->setDtStart( QDateTime( newDate, anEvent->dtStart().time() ) );
+      }
+      anEvent->setDtEnd( endDate );
+    
+    } else if ( inc->type() == "Todo" ) {
+      Todo *anTodo = static_cast<Todo*>( inc );
+      if ( newTime ) {
+        anTodo->setDtDue( QDateTime( newDate, *newTime ) );
+      } else {
+        anTodo->setDtDue( QDateTime( newDate, anTodo->dtDue().time() ) );
+      }
+    } else if ( inc->type() == "Journal" ) {
+      Journal *anJournal = static_cast<Journal*>( inc );
+      if ( newTime ) {
+        anJournal->setDtStart( QDateTime( newDate, *newTime ) );
+      } else {
+        anJournal->setDtStart( QDateTime( newDate ) );
+      }
+    } else {
+      kdDebug(5850) << "Trying to paste unknown incidence of type " << inc->type() << endl;
+    }
+    
+    return inc;
+   
+  }
+  return 0;
+}
diff --git a/libkcal/dndfactory.h b/libkcal/dndfactory.h
index 6b73f34..7e2ca04 100644
--- a/libkcal/dndfactory.h
+++ b/libkcal/dndfactory.h
@@ -1,62 +1,74 @@
 /*
    This file is part of libkcal.
    Copyright (c) 1998 Preston Brown
-    Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
    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.
 */
-// $Id$
 #ifndef KCAL_DNDFACTORY_H
 #define KCAL_DNDFACTORY_H
-#include "vcalformat.h"
+//#include "libkcal_export.h"
-class QDropEvent;
 namespace KCal {
+class ICalDrag;
+class Event;
+class Todo;
+class Calendar;
+#define LIBKCAL_EXPORT
 /**
  This class implements functions to create Drag and Drop objects used for
  Drag-and-Drop and Copy-and-Paste.
-  @short vCalendar Drag-and-Drop object factory.
+  @short vCalendar/iCalendar Drag-and-Drop object factory.
 */
-class DndFactory {
+class LIBKCAL_EXPORT DndFactory
+{
  public:
-    DndFactory( Calendar * ) {}
+    DndFactory( Calendar * );
+    /**
+      Create a drag object.
+    */
+    ICalDrag *createDrag( Incidence *incidence, QWidget *owner );
-    /** create an object to be used with the Xdnd Drag And Drop protocol. */
-    ICalDrag *createDrag(Event *, QWidget *) { return 0; }
-    /** create an object to be used with the Xdnd Drag And Drop protocol. */
-    ICalDrag *createDragTodo(Todo *, QWidget *) { return 0; }
    /** Create Todo object from drop event */
-    Todo *createDropTodo(QDropEvent *) { return 0; }
+    Todo *createDropTodo(QDropEvent *de);
    /** Create Event object from drop event */
-    Event *createDrop(QDropEvent *) { return 0; }
+    Event *createDrop(QDropEvent *de);
-  
-    /** cut event to clipboard */
+    /** cut incidence to clipboard */
-    void cutEvent(Event *) {}
+    void cutIncidence( Incidence * );
-    /** cut, copy, and paste operations follow. */
+    /** copy the incidence to clipboard */
-    bool copyEvent(Event *) { return false; }
+    bool copyIncidence( Incidence * );
-    /** pastes the event and returns a pointer to the new event pasted. */
+    /** pastes the event or todo and returns a pointer to the new incidence pasted. */
-    Event *pasteEvent(const QDate &, const QTime *newTime = 0) { return 0; }
+    Incidence *pasteIncidence( const QDate &, const QTime *newTime = 0 );
+  private:
+    Calendar *mCalendar;
+    class Private;
+    Private *d;
 };
 }
 #endif
diff --git a/libkcal/dndfactory_dummy.h b/libkcal/dndfactory_dummy.h
new file mode 100644
index 0000000..6b73f34
--- a/dev/null
+++ b/libkcal/dndfactory_dummy.h
@@ -0,0 +1,62 @@
+/*
+    This file is part of libkcal.
+    Copyright (c) 1998 Preston Brown
+    Copyright (c) 2001,2002 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.
+*/
+// $Id$
+#ifndef KCAL_DNDFACTORY_H
+#define KCAL_DNDFACTORY_H
+#include "vcalformat.h"
+class QDropEvent;
+namespace KCal {
+/**
+  This class implements functions to create Drag and Drop objects used for
+  Drag-and-Drop and Copy-and-Paste.
+  @short vCalendar Drag-and-Drop object factory.
+*/
+class DndFactory {
+  public:
+    DndFactory( Calendar * ) {}
+    /** create an object to be used with the Xdnd Drag And Drop protocol. */
+    ICalDrag *createDrag(Event *, QWidget *) { return 0; }
+    /** create an object to be used with the Xdnd Drag And Drop protocol. */
+    ICalDrag *createDragTodo(Todo *, QWidget *) { return 0; }
+    /** Create Todo object from drop event */
+    Todo *createDropTodo(QDropEvent *) { return 0; }
+    /** Create Event object from drop event */
+    Event *createDrop(QDropEvent *) { return 0; }
+  
+    /** cut event to clipboard */
+    void cutEvent(Event *) {}
+    /** cut, copy, and paste operations follow. */
+    bool copyEvent(Event *) { return false; }
+    /** pastes the event and returns a pointer to the new event pasted. */
+    Event *pasteEvent(const QDate &, const QTime *newTime = 0) { return 0; }
+};
+}
+#endif
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 171c726..33c63c3 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,106 +1,108 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on
        TARGET  = microkcal
 include( ../variables.pri )
 INCLUDEPATH += ../libkdepim ../microkde  versit ../microkde/kdecore
 #../qtcompat
 INCLUDEPATH += ../libical/src/libical
 INCLUDEPATH += ../libical/src/libicalss
 DESTDIR = ../bin
 DEFINES +=  DESKTOP_VERSION
 unix: {
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 INTERFACES = \
 HEADERS = \
 alarm.h \
 attachment.h \
 attendee.h \
 calendar.h \
 calendarlocal.h \
 calfilter.h \
 calformat.h \
 calstorage.h \
 compat.h \
 customproperties.h \
 dummyscheduler.h \
 kincidenceformatter.h \
 duration.h \
 event.h \
 exceptions.h \
 filestorage.h \
 freebusy.h \
 icaldrag.h \
 icalformat.h \
 icalformatimpl.h \
 imipscheduler.h \
 incidence.h \
 incidencebase.h \
 journal.h \
 period.h \
 person.h \
 qtopiaformat.h \
 recurrence.h \
 scheduler.h \
 todo.h \
+dndfactory.h \
 vcaldrag.h \
 vcalformat.h \
 versit/port.h \
 versit/vcc.h \
 versit/vobject.h \
 phoneformat.h \
 SOURCES = \
 alarm.cpp \
 attachment.cpp \
 attendee.cpp \
 calendar.cpp \
 calendarlocal.cpp \
 calfilter.cpp \
 calformat.cpp \
 compat.cpp \
 customproperties.cpp \
 dummyscheduler.cpp \
 kincidenceformatter.cpp \
 duration.cpp \
 event.cpp \
 exceptions.cpp \
 filestorage.cpp \
 freebusy.cpp \
 icaldrag.cpp \
 icalformat.cpp \
 icalformatimpl.cpp \
 imipscheduler.cpp \
 incidence.cpp \
 incidencebase.cpp \
 journal.cpp \
 period.cpp \
 person.cpp \
 qtopiaformat.cpp \
 recurrence.cpp \
 scheduler.cpp \
 todo.cpp \
+dndfactory.cpp \
 vcaldrag.cpp \
 vcalformat.cpp \
 versit/vcc.c \
 versit/vobject.c \
 phoneformat.cpp \