-rw-r--r-- | korganizer/kotodoview.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 7817a75..dd2c081 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -156,18 +156,18 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e) | |||
156 | 156 | ||
157 | Todo *existingTodo = mCalendar->todo(todo->uid()); | 157 | Todo *existingTodo = mCalendar->todo(todo->uid()); |
158 | 158 | ||
159 | if(existingTodo) { | 159 | if(existingTodo) { |
160 | Incidence *to = destinationEvent; | 160 | Incidence *to = destinationEvent; |
161 | while(to) { | 161 | while(to) { |
162 | if (to->uid() == todo->uid()) { | 162 | if (to->uid() == todo->uid()) { |
163 | KMessageBox::sorry(this, | 163 | KMessageBox::sorry(this, |
164 | i18n("Cannot move To-Do to itself\nor a child of itself"), | 164 | i18n("Cannot move Todo to itself\nor a child of itself"), |
165 | i18n("Drop To-Do")); | 165 | i18n("Drop Todo")); |
166 | delete todo; | 166 | delete todo; |
167 | return; | 167 | return; |
168 | } | 168 | } |
169 | to = to->relatedTo(); | 169 | to = to->relatedTo(); |
170 | } | 170 | } |
171 | internalDrop = true; | 171 | internalDrop = true; |
172 | if ( destinationEvent ) | 172 | if ( destinationEvent ) |
173 | reparentTodoSignal( destinationEvent, existingTodo ); | 173 | reparentTodoSignal( destinationEvent, existingTodo ); |
@@ -957,17 +957,16 @@ void KOTodoView::unparentTodo() | |||
957 | if (mActiveItem) { | 957 | if (mActiveItem) { |
958 | emit unparentTodoSignal(mActiveItem->todo()); | 958 | emit unparentTodoSignal(mActiveItem->todo()); |
959 | } | 959 | } |
960 | } | 960 | } |
961 | 961 | ||
962 | void KOTodoView::reparentTodo() | 962 | void KOTodoView::reparentTodo() |
963 | { | 963 | { |
964 | if (mActiveItem) { | 964 | if (mActiveItem) { |
965 | qDebug("KOTodoView::reparentTodo() "); | ||
966 | topLevelWidget()->setCaption(i18n("Click on new parent item")); | 965 | topLevelWidget()->setCaption(i18n("Click on new parent item")); |
967 | pendingSubtodo = mActiveItem; | 966 | pendingSubtodo = mActiveItem; |
968 | } | 967 | } |
969 | } | 968 | } |
970 | void KOTodoView::editTodo() | 969 | void KOTodoView::editTodo() |
971 | { | 970 | { |
972 | if (mActiveItem) { | 971 | if (mActiveItem) { |
973 | emit editTodoSignal(mActiveItem->todo()); | 972 | emit editTodoSignal(mActiveItem->todo()); |
@@ -1157,17 +1156,16 @@ void KOTodoView::itemClicked(QListViewItem *item) | |||
1157 | if ( par == pendingSubtodo ) { | 1156 | if ( par == pendingSubtodo ) { |
1158 | allowReparent = false; | 1157 | allowReparent = false; |
1159 | break; | 1158 | break; |
1160 | } | 1159 | } |
1161 | par = par->parent(); | 1160 | par = par->parent(); |
1162 | } | 1161 | } |
1163 | if ( !allowReparent ) { | 1162 | if ( !allowReparent ) { |
1164 | topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!")); | 1163 | topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!")); |
1165 | qDebug("Recursive reparenting not possible "); | ||
1166 | pendingSubtodo = 0; | 1164 | pendingSubtodo = 0; |
1167 | } else { | 1165 | } else { |
1168 | Todo* newParent = todoItem->todo(); | 1166 | Todo* newParent = todoItem->todo(); |
1169 | Todo* newSub = pendingSubtodo->todo(); | 1167 | Todo* newSub = pendingSubtodo->todo(); |
1170 | pendingSubtodo = 0; | 1168 | pendingSubtodo = 0; |
1171 | emit reparentTodoSignal( newParent,newSub ); | 1169 | emit reparentTodoSignal( newParent,newSub ); |
1172 | return; | 1170 | return; |
1173 | } | 1171 | } |
@@ -1190,17 +1188,16 @@ void KOTodoView::itemClicked(QListViewItem *item) | |||
1190 | todoItem->todo()->setCompleted(false); | 1188 | todoItem->todo()->setCompleted(false); |
1191 | } | 1189 | } |
1192 | } | 1190 | } |
1193 | #endif | 1191 | #endif |
1194 | } | 1192 | } |
1195 | 1193 | ||
1196 | void KOTodoView::setDocumentId( const QString &id ) | 1194 | void KOTodoView::setDocumentId( const QString &id ) |
1197 | { | 1195 | { |
1198 | kdDebug() << "KOTodoView::setDocumentId()" << endl; | ||
1199 | 1196 | ||
1200 | mDocPrefs->setDoc( id ); | 1197 | mDocPrefs->setDoc( id ); |
1201 | } | 1198 | } |
1202 | 1199 | ||
1203 | void KOTodoView::itemStateChanged( QListViewItem *item ) | 1200 | void KOTodoView::itemStateChanged( QListViewItem *item ) |
1204 | { | 1201 | { |
1205 | if (!item) return; | 1202 | if (!item) return; |
1206 | 1203 | ||