author | zautrix <zautrix> | 2005-01-29 23:23:11 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-29 23:23:11 (UTC) |
commit | d94b52aa95cc52aa1bef7c9cd99f43c725ed8042 (patch) (unidiff) | |
tree | 9443dfbc790a76e5d707ce762e075cdb21096f50 | |
parent | 74c808f288bf81bc68c92a377ce64953603c2d40 (diff) | |
download | kdepimpi-d94b52aa95cc52aa1bef7c9cd99f43c725ed8042.zip kdepimpi-d94b52aa95cc52aa1bef7c9cd99f43c725ed8042.tar.gz kdepimpi-d94b52aa95cc52aa1bef7c9cd99f43c725ed8042.tar.bz2 |
todo dnd
-rw-r--r-- | korganizer/calendarview.cpp | 8 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 4 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 61 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 11 | ||||
-rw-r--r-- | libkcal/dndfactory.cpp | 186 | ||||
-rw-r--r-- | libkcal/dndfactory.h | 56 | ||||
-rw-r--r-- | libkcal/dndfactory_dummy.h | 62 | ||||
-rw-r--r-- | libkcal/libkcal.pro | 2 |
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 | |||
1532 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); | 1532 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); |
1533 | } | 1533 | } |
1534 | ev->setOrganizer(a->email()); | 1534 | //ev->setOrganizer(a->email()); |
1535 | ev->setCategories( kind ); | 1535 | ev->setCategories( kind ); |
1536 | ev->setDtStart( QDateTime(date) ); | 1536 | ev->setDtStart( QDateTime(date) ); |
@@ -2215,5 +2215,5 @@ void CalendarView::edit_cut() | |||
2215 | } | 2215 | } |
2216 | DndFactory factory( mCalendar ); | 2216 | DndFactory factory( mCalendar ); |
2217 | factory.cutEvent(anEvent); | 2217 | factory.cutIncidence(anEvent); |
2218 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); | 2218 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); |
2219 | } | 2219 | } |
@@ -2236,5 +2236,5 @@ void CalendarView::edit_copy() | |||
2236 | } | 2236 | } |
2237 | DndFactory factory( mCalendar ); | 2237 | DndFactory factory( mCalendar ); |
2238 | factory.copyEvent(anEvent); | 2238 | factory.copyIncidence(anEvent); |
2239 | } | 2239 | } |
2240 | 2240 | ||
@@ -2244,5 +2244,5 @@ void CalendarView::edit_paste() | |||
2244 | 2244 | ||
2245 | DndFactory factory( mCalendar ); | 2245 | DndFactory factory( mCalendar ); |
2246 | Event *pastedEvent = factory.pasteEvent( date ); | 2246 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); |
2247 | 2247 | ||
2248 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2248 | 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 ) | |||
10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim | 10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim |
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC | 14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | 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) | |||
140 | 140 | ||
141 | if(existingTodo) { | 141 | if(existingTodo) { |
142 | // kdDebug() << "Drop existing Todo" << endl; | ||
143 | Incidence *to = destinationEvent; | 142 | Incidence *to = destinationEvent; |
144 | while(to) { | 143 | while(to) { |
145 | if (to->uid() == todo->uid()) { | 144 | if (to->uid() == todo->uid()) { |
146 | KMessageBox::sorry(this, | 145 | KMessageBox::sorry(this, |
147 | i18n("Cannot move To-Do to itself or a child of itself"), | 146 | i18n("Cannot move To-Do to itself\nor a child of itself"), |
148 | i18n("Drop To-Do")); | 147 | i18n("Drop To-Do")); |
149 | delete todo; | 148 | delete todo; |
@@ -152,13 +151,15 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e) | |||
152 | to = to->relatedTo(); | 151 | to = to->relatedTo(); |
153 | } | 152 | } |
154 | existingTodo->setRelatedTo(destinationEvent); | 153 | internalDrop = true; |
155 | emit todoDropped(todo); | 154 | if ( destinationEvent ) |
155 | reparentTodoSignal( destinationEvent, existingTodo ); | ||
156 | else | ||
157 | unparentTodoSignal(existingTodo); | ||
156 | delete todo; | 158 | delete todo; |
157 | } else { | 159 | } else { |
158 | // kdDebug() << "Drop new Todo" << endl; | ||
159 | todo->setRelatedTo(destinationEvent); | ||
160 | mCalendar->addTodo(todo); | 160 | mCalendar->addTodo(todo); |
161 | 161 | emit todoDropped(todo, KOGlobals::EVENTADDED); | |
162 | emit todoDropped(todo); | 162 | if ( destinationEvent ) |
163 | reparentTodoSignal( destinationEvent, todo ); | ||
163 | } | 164 | } |
164 | } | 165 | } |
@@ -168,8 +169,7 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e) | |||
168 | //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) ); | 169 | //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) ); |
169 | KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) )); | 170 | KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) )); |
170 | kdDebug() << "Dropped : " << text << endl; | 171 | qDebug("Dropped : " + text); |
171 | QStringList emails = QStringList::split(",",text); | 172 | QStringList emails = QStringList::split(",",text); |
172 | for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) { | 173 | for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) { |
173 | kdDebug() << " Email: " << (*it) << endl; | ||
174 | int pos = (*it).find("<"); | 174 | int pos = (*it).find("<"); |
175 | QString name = (*it).left(pos); | 175 | QString name = (*it).left(pos); |
@@ -181,5 +181,5 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e) | |||
181 | } | 181 | } |
182 | else { | 182 | else { |
183 | kdDebug() << "KOTodoListView::contentsDropEvent(): Todo from drop not decodable" << endl; | 183 | qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable "); |
184 | e->ignore(); | 184 | e->ignore(); |
185 | } | 185 | } |
@@ -190,8 +190,8 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e) | |||
190 | void KOTodoListView::contentsMousePressEvent(QMouseEvent* e) | 190 | void KOTodoListView::contentsMousePressEvent(QMouseEvent* e) |
191 | { | 191 | { |
192 | QListView::contentsMousePressEvent(e); | ||
193 | #ifndef KORG_NODND | 192 | #ifndef KORG_NODND |
194 | QPoint p(contentsToViewport(e->pos())); | 193 | QPoint p(contentsToViewport(e->pos())); |
195 | QListViewItem *i = itemAt(p); | 194 | QListViewItem *i = itemAt(p); |
195 | mMousePressed = false; | ||
196 | if (i) { | 196 | if (i) { |
197 | // if the user clicked into the root decoration of the item, don't | 197 | // if the user clicked into the root decoration of the item, don't |
@@ -208,4 +208,5 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e) | |||
208 | } | 208 | } |
209 | #endif | 209 | #endif |
210 | QListView::contentsMousePressEvent(e); | ||
210 | } | 211 | } |
211 | 212 | ||
@@ -214,5 +215,4 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e) | |||
214 | 215 | ||
215 | #ifndef KORG_NODND | 216 | #ifndef KORG_NODND |
216 | // kdDebug() << "KOTodoListView::contentsMouseMoveEvent()" << endl; | ||
217 | QListView::contentsMouseMoveEvent(e); | 217 | QListView::contentsMouseMoveEvent(e); |
218 | if (mMousePressed && (mPressPos - e->pos()).manhattanLength() > | 218 | if (mMousePressed && (mPressPos - e->pos()).manhattanLength() > |
@@ -221,20 +221,22 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e) | |||
221 | QListViewItem *item = itemAt(contentsToViewport(mPressPos)); | 221 | QListViewItem *item = itemAt(contentsToViewport(mPressPos)); |
222 | if (item) { | 222 | if (item) { |
223 | // kdDebug() << "Start Drag for item " << item->text(0) << endl; | ||
224 | DndFactory factory( mCalendar ); | 223 | DndFactory factory( mCalendar ); |
225 | ICalDrag *vd = factory.createDragTodo( | 224 | ICalDrag *vd = factory.createDrag( |
226 | ((KOTodoViewItem *)item)->todo(),viewport()); | 225 | ((KOTodoViewItem *)item)->todo(),viewport()); |
226 | internalDrop = false; | ||
227 | // we cannot do any senseful here, because the DnD is still broken in Qt | ||
227 | if (vd->drag()) { | 228 | if (vd->drag()) { |
228 | kdDebug() << "KOTodoListView::contentsMouseMoveEvent(): Delete drag source" << endl; | 229 | if ( !internalDrop ) { |
230 | //emit deleteTodo( ((KOTodoViewItem *)item)->todo() ); | ||
231 | qDebug("Dnd: External move: Delete drag source "); | ||
232 | } else | ||
233 | qDebug("Dnd: Internal move "); | ||
234 | |||
235 | } else { | ||
236 | if ( !internalDrop ) { | ||
237 | qDebug("Dnd: External Copy"); | ||
238 | } else | ||
239 | qDebug("DnD: Internal copy: Copy pending"); | ||
229 | } | 240 | } |
230 | /* | ||
231 | QString source = fullPath(item); | ||
232 | if ( QFile::exists(source) ) { | ||
233 | QUriDrag* ud = new QUriDrag(viewport()); | ||
234 | ud->setFilenames( source ); | ||
235 | if ( ud->drag() ) | ||
236 | QMessageBox::information( this, "Drag source", | ||
237 | QString("Delete ")+source, "Not implemented" ); | ||
238 | */ | ||
239 | } | 241 | } |
240 | } | 242 | } |
@@ -490,6 +492,8 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
490 | connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ), | 492 | connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ), |
491 | SLOT( itemDoubleClicked( QListViewItem * ) ) ); | 493 | SLOT( itemDoubleClicked( QListViewItem * ) ) ); |
492 | connect( mTodoListView, SIGNAL( todoDropped( Todo * ) ), | 494 | connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), |
493 | SLOT( updateView() ) ); | 495 | SLOT( updateView() ) ); |
496 | connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ), | ||
497 | SLOT( todoModified(Todo *, int) ) ); | ||
494 | connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ), | 498 | connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ), |
495 | SLOT( itemStateChanged( QListViewItem * ) ) ); | 499 | SLOT( itemStateChanged( QListViewItem * ) ) ); |
@@ -505,4 +509,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
505 | SLOT(selectionChanged(QListViewItem *))); | 509 | SLOT(selectionChanged(QListViewItem *))); |
506 | #endif | 510 | #endif |
511 | |||
512 | connect( mTodoListView, SIGNAL(reparentTodoSignal( Todo *,Todo * ) ), SIGNAL(reparentTodoSignal( Todo *,Todo * ) )); | ||
513 | connect( mTodoListView, SIGNAL(unparentTodoSignal(Todo *) ), SIGNAL(unparentTodoSignal(Todo *) )); | ||
514 | connect( mTodoListView, SIGNAL( deleteTodo(Todo *) ), SIGNAL(deleteTodoSignal(Todo *) )); | ||
515 | |||
507 | connect( mTodoListView, SIGNAL(selectionChanged() ), | 516 | connect( mTodoListView, SIGNAL(selectionChanged() ), |
508 | SLOT( processSelectionChange() ) ); | 517 | 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 | |||
61 | 61 | ||
62 | signals: | 62 | signals: |
63 | void todoDropped(Todo *); | 63 | void todoDropped(Todo *, int); |
64 | void double_Clicked(QListViewItem *item); | 64 | void double_Clicked(QListViewItem *item); |
65 | 65 | void reparentTodoSignal( Todo *,Todo * ); | |
66 | void unparentTodoSignal(Todo *); | ||
67 | void deleteTodo( Todo * ); | ||
66 | protected: | 68 | protected: |
67 | void contentsDragEnterEvent(QDragEnterEvent *); | 69 | void contentsDragEnterEvent(QDragEnterEvent *); |
@@ -76,4 +78,5 @@ class KOTodoListView : public KListView | |||
76 | 78 | ||
77 | private: | 79 | private: |
80 | bool internalDrop; | ||
78 | QString mName; | 81 | QString mName; |
79 | Calendar *mCalendar; | 82 | Calendar *mCalendar; |
@@ -198,4 +201,6 @@ class KOTodoView : public KOrg::BaseView | |||
198 | void processSelectionChange(); | 201 | void processSelectionChange(); |
199 | void addQuickTodo(); | 202 | void addQuickTodo(); |
203 | void setTodoModified( Todo* ); | ||
204 | void todoModified(Todo *, int ); | ||
200 | 205 | ||
201 | private: | 206 | private: |
@@ -210,5 +215,4 @@ class KOTodoView : public KOrg::BaseView | |||
210 | */ | 215 | */ |
211 | friend class KOTodoViewItem; | 216 | friend class KOTodoViewItem; |
212 | void setTodoModified( Todo* ); | ||
213 | QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo); | 217 | QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo); |
214 | void restoreItemState( QListViewItem * ); | 218 | void restoreItemState( QListViewItem * ); |
@@ -236,5 +240,4 @@ class KOTodoView : public KOrg::BaseView | |||
236 | KOQuickTodo *mQuickAdd; | 240 | KOQuickTodo *mQuickAdd; |
237 | bool mBlockUpdate; | 241 | bool mBlockUpdate; |
238 | void todoModified(Todo *, int ); | ||
239 | void keyPressEvent ( QKeyEvent * ) ; | 242 | void keyPressEvent ( QKeyEvent * ) ; |
240 | KOTodoViewItem * pendingSubtodo; | 243 | 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 @@ | |||
1 | /* | ||
2 | This file is part of libkcal. | ||
3 | Copyright (c) 1998 Preston Brwon | ||
4 | Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org> | ||
5 | Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com> | ||
6 | |||
7 | This library is free software; you can redistribute it and/or | ||
8 | modify it under the terms of the GNU Library General Public | ||
9 | License as published by the Free Software Foundation; either | ||
10 | version 2 of the License, or (at your option) any later version. | ||
11 | |||
12 | This library is distributed in the hope that it will be useful, | ||
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | Library General Public License for more details. | ||
16 | |||
17 | You should have received a copy of the GNU Library General Public License | ||
18 | along with this library; see the file COPYING.LIB. If not, write to | ||
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
20 | Boston, MA 02111-1307, USA. | ||
21 | */ | ||
22 | |||
23 | #include <qapplication.h> | ||
24 | #include <qclipboard.h> | ||
25 | |||
26 | #include <kiconloader.h> | ||
27 | #include <kdebug.h> | ||
28 | #include <kmessagebox.h> | ||
29 | #include <klocale.h> | ||
30 | |||
31 | #include "vcaldrag.h" | ||
32 | #include "icaldrag.h" | ||
33 | #include "calendar.h" | ||
34 | #include "vcalformat.h" | ||
35 | #include "icalformat.h" | ||
36 | #include "calendarlocal.h" | ||
37 | |||
38 | #include "dndfactory.h" | ||
39 | |||
40 | using namespace KCal; | ||
41 | |||
42 | DndFactory::DndFactory( Calendar *cal ) : | ||
43 | mCalendar( cal ) | ||
44 | { | ||
45 | } | ||
46 | |||
47 | ICalDrag *DndFactory::createDrag( Incidence *incidence, QWidget *owner ) | ||
48 | { | ||
49 | CalendarLocal cal( mCalendar->timeZoneId() ); | ||
50 | Incidence *i = incidence->clone(); | ||
51 | cal.addIncidence( i ); | ||
52 | |||
53 | ICalDrag *icd = new ICalDrag( &cal, owner ); | ||
54 | if ( i->type() == "Event" ) | ||
55 | icd->setPixmap( BarIcon( "appointment" ) ); | ||
56 | else if ( i->type() == "Todo" ) | ||
57 | icd->setPixmap( BarIcon( "todo" ) ); | ||
58 | |||
59 | return icd; | ||
60 | } | ||
61 | |||
62 | Event *DndFactory::createDrop(QDropEvent *de) | ||
63 | { | ||
64 | kdDebug(5800) << "DndFactory::createDrop()" << endl; | ||
65 | |||
66 | CalendarLocal cal( mCalendar->timeZoneId() ); | ||
67 | |||
68 | if ( ICalDrag::decode( de, &cal ) || VCalDrag::decode( de, &cal ) ) { | ||
69 | de->accept(); | ||
70 | |||
71 | QPtrList<Event> events = cal.events(); | ||
72 | if ( !events.isEmpty() ) { | ||
73 | Event *event = new Event( *events.first() ); | ||
74 | return event; | ||
75 | } | ||
76 | } | ||
77 | |||
78 | return 0; | ||
79 | } | ||
80 | |||
81 | Todo *DndFactory::createDropTodo(QDropEvent *de) | ||
82 | { | ||
83 | kdDebug(5800) << "VCalFormat::createDropTodo()" << endl; | ||
84 | |||
85 | CalendarLocal cal( mCalendar->timeZoneId() ); | ||
86 | |||
87 | if ( ICalDrag::decode( de, &cal ) || VCalDrag::decode( de, &cal ) ) { | ||
88 | de->accept(); | ||
89 | |||
90 | QPtrList<Todo> todos = cal.todos(); | ||
91 | if ( !todos.isEmpty() ) { | ||
92 | Todo *todo = new Todo( *todos.first() ); | ||
93 | return todo; | ||
94 | } | ||
95 | } | ||
96 | |||
97 | return 0; | ||
98 | } | ||
99 | |||
100 | |||
101 | void DndFactory::cutIncidence( Incidence *selectedInc ) | ||
102 | { | ||
103 | if ( copyIncidence( selectedInc ) ) { | ||
104 | mCalendar->deleteIncidence( selectedInc ); | ||
105 | } | ||
106 | } | ||
107 | |||
108 | bool DndFactory::copyIncidence( Incidence *selectedInc ) | ||
109 | { | ||
110 | if ( !selectedInc ) | ||
111 | return false; | ||
112 | QClipboard *cb = QApplication::clipboard(); | ||
113 | |||
114 | CalendarLocal cal( mCalendar->timeZoneId() ); | ||
115 | Incidence *inc = selectedInc->clone(); | ||
116 | cal.addIncidence( inc ); | ||
117 | cb->setData( new ICalDrag( &cal ) ); | ||
118 | |||
119 | return true; | ||
120 | } | ||
121 | |||
122 | Incidence *DndFactory::pasteIncidence(const QDate &newDate, const QTime *newTime) | ||
123 | { | ||
124 | // kdDebug(5800) << "DnDFactory::pasteEvent()" << endl; | ||
125 | |||
126 | CalendarLocal cal( mCalendar->timeZoneId() ); | ||
127 | |||
128 | QClipboard *cb = QApplication::clipboard(); | ||
129 | |||
130 | if ( !ICalDrag::decode( cb->data(), &cal ) && | ||
131 | !VCalDrag::decode( cb->data(), &cal ) ) { | ||
132 | kdDebug(5800) << "Can't parse clipboard" << endl; | ||
133 | return 0; | ||
134 | } | ||
135 | |||
136 | QPtrList<Incidence> incList = cal.incidences(); | ||
137 | Incidence *inc = incList.first(); | ||
138 | |||
139 | if ( !incList.isEmpty() && inc ) { | ||
140 | inc = inc->clone(); | ||
141 | |||
142 | inc->recreate(); | ||
143 | |||
144 | if ( inc->type() == "Event" ) { | ||
145 | |||
146 | Event *anEvent = static_cast<Event*>( inc ); | ||
147 | // Calculate length of event | ||
148 | int daysOffset = anEvent->dtStart().date().daysTo( | ||
149 | anEvent->dtEnd().date() ); | ||
150 | // new end date if event starts at the same time on the new day | ||
151 | QDateTime endDate( newDate.addDays(daysOffset), anEvent->dtEnd().time() ); | ||
152 | |||
153 | if ( newTime ) { | ||
154 | // additional offset for new time of day | ||
155 | int addSecsOffset( anEvent->dtStart().time().secsTo( *newTime )); | ||
156 | endDate=endDate.addSecs( addSecsOffset ); | ||
157 | anEvent->setDtStart( QDateTime( newDate, *newTime ) ); | ||
158 | } else { | ||
159 | anEvent->setDtStart( QDateTime( newDate, anEvent->dtStart().time() ) ); | ||
160 | } | ||
161 | anEvent->setDtEnd( endDate ); | ||
162 | |||
163 | } else if ( inc->type() == "Todo" ) { | ||
164 | Todo *anTodo = static_cast<Todo*>( inc ); | ||
165 | if ( newTime ) { | ||
166 | anTodo->setDtDue( QDateTime( newDate, *newTime ) ); | ||
167 | } else { | ||
168 | anTodo->setDtDue( QDateTime( newDate, anTodo->dtDue().time() ) ); | ||
169 | } | ||
170 | } else if ( inc->type() == "Journal" ) { | ||
171 | Journal *anJournal = static_cast<Journal*>( inc ); | ||
172 | if ( newTime ) { | ||
173 | anJournal->setDtStart( QDateTime( newDate, *newTime ) ); | ||
174 | } else { | ||
175 | anJournal->setDtStart( QDateTime( newDate ) ); | ||
176 | } | ||
177 | } else { | ||
178 | kdDebug(5850) << "Trying to paste unknown incidence of type " << inc->type() << endl; | ||
179 | } | ||
180 | |||
181 | return inc; | ||
182 | |||
183 | } | ||
184 | |||
185 | return 0; | ||
186 | } | ||
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 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkcal. | 2 | This file is part of libkcal. |
3 | |||
3 | Copyright (c) 1998 Preston Brown | 4 | Copyright (c) 1998 Preston Brown |
4 | Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org> | 5 | Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org> |
6 | Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com> | ||
5 | 7 | ||
6 | This library is free software; you can redistribute it and/or | 8 | This library is free software; you can redistribute it and/or |
@@ -20,40 +22,50 @@ | |||
20 | */ | 22 | */ |
21 | 23 | ||
22 | // $Id$ | ||
23 | |||
24 | #ifndef KCAL_DNDFACTORY_H | 24 | #ifndef KCAL_DNDFACTORY_H |
25 | #define KCAL_DNDFACTORY_H | 25 | #define KCAL_DNDFACTORY_H |
26 | 26 | ||
27 | #include "vcalformat.h" | 27 | //#include "libkcal_export.h" |
28 | |||
29 | class QDropEvent; | ||
30 | 28 | ||
31 | namespace KCal { | 29 | namespace KCal { |
32 | 30 | ||
31 | class ICalDrag; | ||
32 | class Event; | ||
33 | class Todo; | ||
34 | class Calendar; | ||
35 | #define LIBKCAL_EXPORT | ||
36 | |||
33 | /** | 37 | /** |
34 | This class implements functions to create Drag and Drop objects used for | 38 | This class implements functions to create Drag and Drop objects used for |
35 | Drag-and-Drop and Copy-and-Paste. | 39 | Drag-and-Drop and Copy-and-Paste. |
36 | 40 | ||
37 | @short vCalendar Drag-and-Drop object factory. | 41 | @short vCalendar/iCalendar Drag-and-Drop object factory. |
38 | */ | 42 | */ |
39 | class DndFactory { | 43 | class LIBKCAL_EXPORT DndFactory |
44 | { | ||
40 | public: | 45 | public: |
41 | DndFactory( Calendar * ) {} | 46 | DndFactory( Calendar * ); |
47 | |||
48 | /** | ||
49 | Create a drag object. | ||
50 | */ | ||
51 | ICalDrag *createDrag( Incidence *incidence, QWidget *owner ); | ||
42 | 52 | ||
43 | /** create an object to be used with the Xdnd Drag And Drop protocol. */ | ||
44 | ICalDrag *createDrag(Event *, QWidget *) { return 0; } | ||
45 | /** create an object to be used with the Xdnd Drag And Drop protocol. */ | ||
46 | ICalDrag *createDragTodo(Todo *, QWidget *) { return 0; } | ||
47 | /** Create Todo object from drop event */ | 53 | /** Create Todo object from drop event */ |
48 | Todo *createDropTodo(QDropEvent *) { return 0; } | 54 | Todo *createDropTodo(QDropEvent *de); |
49 | /** Create Event object from drop event */ | 55 | /** Create Event object from drop event */ |
50 | Event *createDrop(QDropEvent *) { return 0; } | 56 | Event *createDrop(QDropEvent *de); |
51 | 57 | ||
52 | /** cut event to clipboard */ | 58 | /** cut incidence to clipboard */ |
53 | void cutEvent(Event *) {} | 59 | void cutIncidence( Incidence * ); |
54 | /** cut, copy, and paste operations follow. */ | 60 | /** copy the incidence to clipboard */ |
55 | bool copyEvent(Event *) { return false; } | 61 | bool copyIncidence( Incidence * ); |
56 | /** pastes the event and returns a pointer to the new event pasted. */ | 62 | /** pastes the event or todo and returns a pointer to the new incidence pasted. */ |
57 | Event *pasteEvent(const QDate &, const QTime *newTime = 0) { return 0; } | 63 | Incidence *pasteIncidence( const QDate &, const QTime *newTime = 0 ); |
64 | |||
65 | private: | ||
66 | Calendar *mCalendar; | ||
67 | |||
68 | class Private; | ||
69 | Private *d; | ||
58 | }; | 70 | }; |
59 | 71 | ||
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 @@ | |||
1 | /* | ||
2 | This file is part of libkcal. | ||
3 | Copyright (c) 1998 Preston Brown | ||
4 | Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org> | ||
5 | |||
6 | This library is free software; you can redistribute it and/or | ||
7 | modify it under the terms of the GNU Library General Public | ||
8 | License as published by the Free Software Foundation; either | ||
9 | version 2 of the License, or (at your option) any later version. | ||
10 | |||
11 | This library is distributed in the hope that it will be useful, | ||
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
14 | Library General Public License for more details. | ||
15 | |||
16 | You should have received a copy of the GNU Library General Public License | ||
17 | along with this library; see the file COPYING.LIB. If not, write to | ||
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
19 | Boston, MA 02111-1307, USA. | ||
20 | */ | ||
21 | |||
22 | // $Id$ | ||
23 | |||
24 | #ifndef KCAL_DNDFACTORY_H | ||
25 | #define KCAL_DNDFACTORY_H | ||
26 | |||
27 | #include "vcalformat.h" | ||
28 | |||
29 | class QDropEvent; | ||
30 | |||
31 | namespace KCal { | ||
32 | |||
33 | /** | ||
34 | This class implements functions to create Drag and Drop objects used for | ||
35 | Drag-and-Drop and Copy-and-Paste. | ||
36 | |||
37 | @short vCalendar Drag-and-Drop object factory. | ||
38 | */ | ||
39 | class DndFactory { | ||
40 | public: | ||
41 | DndFactory( Calendar * ) {} | ||
42 | |||
43 | /** create an object to be used with the Xdnd Drag And Drop protocol. */ | ||
44 | ICalDrag *createDrag(Event *, QWidget *) { return 0; } | ||
45 | /** create an object to be used with the Xdnd Drag And Drop protocol. */ | ||
46 | ICalDrag *createDragTodo(Todo *, QWidget *) { return 0; } | ||
47 | /** Create Todo object from drop event */ | ||
48 | Todo *createDropTodo(QDropEvent *) { return 0; } | ||
49 | /** Create Event object from drop event */ | ||
50 | Event *createDrop(QDropEvent *) { return 0; } | ||
51 | |||
52 | /** cut event to clipboard */ | ||
53 | void cutEvent(Event *) {} | ||
54 | /** cut, copy, and paste operations follow. */ | ||
55 | bool copyEvent(Event *) { return false; } | ||
56 | /** pastes the event and returns a pointer to the new event pasted. */ | ||
57 | Event *pasteEvent(const QDate &, const QTime *newTime = 0) { return 0; } | ||
58 | }; | ||
59 | |||
60 | } | ||
61 | |||
62 | #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 \ | |||
60 | scheduler.h \ | 60 | scheduler.h \ |
61 | todo.h \ | 61 | todo.h \ |
62 | dndfactory.h \ | ||
62 | vcaldrag.h \ | 63 | vcaldrag.h \ |
63 | vcalformat.h \ | 64 | vcalformat.h \ |
@@ -99,4 +100,5 @@ SOURCES = \ | |||
99 | scheduler.cpp \ | 100 | scheduler.cpp \ |
100 | todo.cpp \ | 101 | todo.cpp \ |
102 | dndfactory.cpp \ | ||
101 | vcaldrag.cpp \ | 103 | vcaldrag.cpp \ |
102 | vcalformat.cpp \ | 104 | vcalformat.cpp \ |