todo dnd

4 files changed, 48 insertions, 36 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0c39590..74aefb7 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1530,9 +1530,9 @@ bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a
     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 );
@@ -2213,9 +2213,9 @@ void CalendarView::edit_cut()
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
-    factory.cutEvent(anEvent);
+    factory.cutIncidence(anEvent);
     changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
 }
 
 void CalendarView::edit_copy()
@@ -2234,17 +2234,17 @@ void CalendarView::edit_copy()
         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 );
 }
 
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 4d67dca..3c7a1fb 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -8,11 +8,11 @@ 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
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 1fb480d..8c1953d 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -138,40 +138,40 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
 
     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);
-      emit todoDropped(todo);
+      internalDrop = true;
+      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);
+      emit todoDropped(todo, KOGlobals::EVENTADDED);
+      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) {
@@ -179,21 +179,21 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
         }
       }
     }
     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)) +
@@ -206,37 +206,39 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
       }
     }
   }
 #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
 }
@@ -488,10 +490,12 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   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 * ) ) );
@@ -503,8 +507,13 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
           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() ) );
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index f11518d..68e29bb 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -59,11 +59,13 @@ class KOTodoListView : public KListView
     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 *);
@@ -74,8 +76,9 @@ class KOTodoListView : public KListView
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
+    bool internalDrop;
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
@@ -196,8 +199,10 @@ class KOTodoView : public KOrg::BaseView
 
   protected slots:
     void processSelectionChange();
     void addQuickTodo();
+    void setTodoModified( Todo* );
+    void todoModified(Todo *, int );
 
   private:
     /*
      * the TodoEditor approach is rather unscaling in the long
@@ -208,9 +213,8 @@ class KOTodoView : public KOrg::BaseView
      * 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 * );
@@ -234,9 +238,8 @@ class KOTodoView : public KOrg::BaseView
     DocPrefs *mDocPrefs;
     QString mCurrentDoc;
     KOQuickTodo *mQuickAdd;
     bool mBlockUpdate;
-    void todoModified(Todo *, int );
     void keyPressEvent ( QKeyEvent * ) ;
     KOTodoViewItem * pendingSubtodo;
     DateNavigator* mNavigator;
 };