summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-29 23:23:11 (UTC)
committer zautrix <zautrix>2005-01-29 23:23:11 (UTC)
commitd94b52aa95cc52aa1bef7c9cd99f43c725ed8042 (patch) (side-by-side diff)
tree9443dfbc790a76e5d707ce762e075cdb21096f50
parent74c808f288bf81bc68c92a377ce64953603c2d40 (diff)
downloadkdepimpi-d94b52aa95cc52aa1bef7c9cd99f43c725ed8042.zip
kdepimpi-d94b52aa95cc52aa1bef7c9cd99f43c725ed8042.tar.gz
kdepimpi-d94b52aa95cc52aa1bef7c9cd99f43c725ed8042.tar.bz2
todo dnd
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp8
-rw-r--r--korganizer/korganizer.pro4
-rw-r--r--korganizer/kotodoview.cpp61
-rw-r--r--korganizer/kotodoview.h11
-rw-r--r--libkcal/dndfactory.cpp186
-rw-r--r--libkcal/dndfactory.h56
-rw-r--r--libkcal/dndfactory_dummy.h62
-rw-r--r--libkcal/libkcal.pro2
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
@@ -1532,5 +1532,5 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a
ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind );
}
- ev->setOrganizer(a->email());
+ //ev->setOrganizer(a->email());
ev->setCategories( kind );
ev->setDtStart( QDateTime(date) );
@@ -2215,5 +2215,5 @@ void CalendarView::edit_cut()
}
DndFactory factory( mCalendar );
- factory.cutEvent(anEvent);
+ factory.cutIncidence(anEvent);
changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
}
@@ -2236,5 +2236,5 @@ void CalendarView::edit_copy()
}
DndFactory factory( mCalendar );
- factory.copyEvent(anEvent);
+ factory.copyIncidence(anEvent);
}
@@ -2244,5 +2244,5 @@ void CalendarView::edit_paste()
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
@@ -10,7 +10,7 @@ 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
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 1fb480d..8c1953d 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -140,10 +140,9 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
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;
@@ -152,13 +151,15 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
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 );
}
}
@@ -168,8 +169,7 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
//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);
@@ -181,5 +181,5 @@ 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();
}
@@ -190,8 +190,8 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
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
@@ -208,4 +208,5 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
}
#endif
+ QListView::contentsMousePressEvent(e);
}
@@ -214,5 +215,4 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
#ifndef KORG_NODND
-// kdDebug() << "KOTodoListView::contentsMouseMoveEvent()" << endl;
QListView::contentsMouseMoveEvent(e);
if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
@@ -221,20 +221,22 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
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" );
-*/
}
}
@@ -490,6 +492,8 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
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 * ) ) );
@@ -505,4 +509,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
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() ) );
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index f11518d..68e29bb 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -61,7 +61,9 @@ class KOTodoListView : public KListView
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 *);
@@ -76,4 +78,5 @@ class KOTodoListView : public KListView
private:
+ bool internalDrop;
QString mName;
Calendar *mCalendar;
@@ -198,4 +201,6 @@ class KOTodoView : public KOrg::BaseView
void processSelectionChange();
void addQuickTodo();
+ void setTodoModified( Todo* );
+ void todoModified(Todo *, int );
private:
@@ -210,5 +215,4 @@ class KOTodoView : public KOrg::BaseView
*/
friend class KOTodoViewItem;
- void setTodoModified( Todo* );
QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
void restoreItemState( QListViewItem * );
@@ -236,5 +240,4 @@ class KOTodoView : public KOrg::BaseView
KOQuickTodo *mQuickAdd;
bool mBlockUpdate;
- void todoModified(Todo *, int );
void keyPressEvent ( QKeyEvent * ) ;
KOTodoViewItem * pendingSubtodo;
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,6 +1,8 @@
/*
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
@@ -20,40 +22,50 @@
*/
-// $Id$
-
#ifndef KCAL_DNDFACTORY_H
#define KCAL_DNDFACTORY_H
-#include "vcalformat.h"
-
-class QDropEvent;
+//#include "libkcal_export.h"
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; }
-
- /** 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; }
+ Event *createDrop(QDropEvent *de);
+
+ /** cut incidence to clipboard */
+ void cutIncidence( Incidence * );
+ /** copy the incidence to clipboard */
+ bool copyIncidence( Incidence * );
+ /** pastes the event or todo and returns a pointer to the new incidence pasted. */
+ Incidence *pasteIncidence( const QDate &, const QTime *newTime = 0 );
+
+ private:
+ Calendar *mCalendar;
+
+ class Private;
+ Private *d;
};
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
@@ -60,4 +60,5 @@ kincidenceformatter.h \
scheduler.h \
todo.h \
+dndfactory.h \
vcaldrag.h \
vcalformat.h \
@@ -99,4 +100,5 @@ SOURCES = \
scheduler.cpp \
todo.cpp \
+dndfactory.cpp \
vcaldrag.cpp \
vcalformat.cpp \