author | zautrix <zautrix> | 2005-10-22 14:49:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-22 14:49:34 (UTC) |
commit | 30550b912b291ccedc8ab100004ba8c5ed216097 (patch) (unidiff) | |
tree | 9b815bc396ce304b1e975226306da5a498e70259 /korganizer | |
parent | 2e5c0a288f7c54cce7e0327ddbbd160f242758f1 (diff) | |
download | kdepimpi-30550b912b291ccedc8ab100004ba8c5ed216097.zip kdepimpi-30550b912b291ccedc8ab100004ba8c5ed216097.tar.gz kdepimpi-30550b912b291ccedc8ab100004ba8c5ed216097.tar.bz2 |
fix
-rw-r--r-- | korganizer/calendarview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 2ba8528..e31a6e1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3983,66 +3983,66 @@ void CalendarView::todo_resub( Todo * parent, Todo * sub ) | |||
3983 | sub->updated(); | 3983 | sub->updated(); |
3984 | setModified(true); | 3984 | setModified(true); |
3985 | updateView(); | 3985 | updateView(); |
3986 | } | 3986 | } |
3987 | void CalendarView::todo_unsub(Todo *anTodo ) | 3987 | void CalendarView::todo_unsub(Todo *anTodo ) |
3988 | { | 3988 | { |
3989 | todo_resub( 0, anTodo ); | 3989 | todo_resub( 0, anTodo ); |
3990 | } | 3990 | } |
3991 | 3991 | ||
3992 | void CalendarView::deleteTodo(Todo *todo) | 3992 | void CalendarView::deleteTodo(Todo *todo) |
3993 | { | 3993 | { |
3994 | if (!todo) { | 3994 | if (!todo) { |
3995 | KNotifyClient::beep(); | 3995 | KNotifyClient::beep(); |
3996 | return; | 3996 | return; |
3997 | } | 3997 | } |
3998 | if (KOPrefs::instance()->mConfirm) { | 3998 | if (KOPrefs::instance()->mConfirm) { |
3999 | QString text = KGlobal::formatMessage ( todo->summary(),0 ); | 3999 | QString text = KGlobal::formatMessage ( todo->summary(),0 ); |
4000 | if (!todo->relations().isEmpty()) { | 4000 | if (!todo->relations().isEmpty()) { |
4001 | text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!"); | 4001 | text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!"); |
4002 | 4002 | ||
4003 | } | 4003 | } |
4004 | switch (msgItemDelete(i18n("Todo:") +"\n"+text)) { | 4004 | switch (msgItemDelete(i18n("Todo:") +"\n"+text)) { |
4005 | case KMessageBox::Continue: // OK | 4005 | case KMessageBox::Continue: // OK |
4006 | bool deleteT = false; | 4006 | bool deleteT = false; |
4007 | if (!todo->relations().isEmpty()) { | 4007 | if (!todo->relations().isEmpty()) { |
4008 | deleteT = removeCompletedSubTodos( todo ); | 4008 | deleteT = removeCompletedSubTodos( todo ); |
4009 | } | 4009 | } |
4010 | // deleteT == true: todo already deleted in removeCompletedSubTodos | 4010 | // deleteT == true: todo already deleted in removeCompletedSubTodos |
4011 | if ( !deleteT ) { | 4011 | if ( !deleteT ) { |
4012 | checkExternalId( todo ); | 4012 | checkExternalId( todo ); |
4013 | calendar()->deleteTodo(todo); | 4013 | calendar()->deleteTodo(todo); |
4014 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); | 4014 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); |
4015 | updateView(); | ||
4016 | } | 4015 | } |
4016 | updateView(); | ||
4017 | break; | 4017 | break; |
4018 | } // switch | 4018 | } // switch |
4019 | } else { | 4019 | } else { |
4020 | checkExternalId( todo ); | 4020 | checkExternalId( todo ); |
4021 | mCalendar->deleteTodo(todo); | 4021 | mCalendar->deleteTodo(todo); |
4022 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); | 4022 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); |
4023 | updateView(); | 4023 | updateView(); |
4024 | } | 4024 | } |
4025 | 4025 | ||
4026 | emit updateSearchDialog(); | 4026 | emit updateSearchDialog(); |
4027 | } | 4027 | } |
4028 | void CalendarView::deleteJournal(Journal *jour) | 4028 | void CalendarView::deleteJournal(Journal *jour) |
4029 | { | 4029 | { |
4030 | if (!jour) { | 4030 | if (!jour) { |
4031 | KNotifyClient::beep(); | 4031 | KNotifyClient::beep(); |
4032 | return; | 4032 | return; |
4033 | } | 4033 | } |
4034 | if (KOPrefs::instance()->mConfirm) { | 4034 | if (KOPrefs::instance()->mConfirm) { |
4035 | 4035 | ||
4036 | QString des; | 4036 | QString des; |
4037 | if ( !jour->summary().isEmpty() ) { | 4037 | if ( !jour->summary().isEmpty() ) { |
4038 | des = jour->summary(); | 4038 | des = jour->summary(); |
4039 | } else { | 4039 | } else { |
4040 | des = jour->description().left(30); | 4040 | des = jour->description().left(30); |
4041 | des = des.simplifyWhiteSpace (); | 4041 | des = des.simplifyWhiteSpace (); |
4042 | des.replace (QRegExp ("\\n"),"" ); | 4042 | des.replace (QRegExp ("\\n"),"" ); |
4043 | des.replace (QRegExp ("\\r"),"" ); | 4043 | des.replace (QRegExp ("\\r"),"" ); |
4044 | } | 4044 | } |
4045 | switch (msgItemDelete( i18n("Journal:") +"\n"+KGlobal::formatMessage ( des,0 ))) { | 4045 | switch (msgItemDelete( i18n("Journal:") +"\n"+KGlobal::formatMessage ( des,0 ))) { |
4046 | case KMessageBox::Continue: // OK | 4046 | case KMessageBox::Continue: // OK |
4047 | calendar()->deleteJournal(jour); | 4047 | calendar()->deleteJournal(jour); |
4048 | updateView(); | 4048 | updateView(); |