author | zautrix <zautrix> | 2005-07-07 00:03:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-07 00:03:44 (UTC) |
commit | cb350dbe9151db2ded62942d29d11d6c8b88eabd (patch) (side-by-side diff) | |
tree | 3ba8d483461e10afddb67f17cd038118d99513ef /korganizer/calendarview.cpp | |
parent | 93bc4dbbef774e28672c947281291b12d5971803 (diff) | |
download | kdepimpi-cb350dbe9151db2ded62942d29d11d6c8b88eabd.zip kdepimpi-cb350dbe9151db2ded62942d29d11d6c8b88eabd.tar.gz kdepimpi-cb350dbe9151db2ded62942d29d11d6c8b88eabd.tar.bz2 |
fixessss
-rw-r--r-- | korganizer/calendarview.cpp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 98e0ac1..bc1c0c7 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2814,17 +2814,17 @@ void CalendarView::slotSelectPickerDate( QDate d) if ( len>0 ) to->setDtStart(to->dtDue().addSecs( -len )); else if (to->dtStart() > to->dtDue() ) to->setDtStart(to->dtDue().addDays( -3 )); } todoChanged( to ); - } else { + } else if ( mMoveIncidence->typeID() == eventID ) { if ( mMoveIncidence->doesRecur() ) { #if 0 // PENDING implement this Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); mCalendar()->addIncidence( newInc ); if ( mMoveIncidence->typeID() == todoID ) emit todoMoved((Todo*)mMoveIncidence, KOGlobals::EVENTEDITED ); else @@ -2834,18 +2834,22 @@ void CalendarView::slotSelectPickerDate( QDate d) #endif } QTime tim = mMoveIncidence->dtStart().time(); int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); QDateTime dt ( d,tim ); mMoveIncidence->setDtStart( dt ); ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); + } else if ( mMoveIncidence->typeID() == journalID ) { + QTime tim = mMoveIncidence->dtStart().time(); + QDateTime dt ( d,tim ); + mMoveIncidence->setDtStart( dt ); + updateView(); } - mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); } } void CalendarView::removeCategories() { QPtrList<Incidence> incList = mCalendar->rawIncidences(); QStringList catList = KOPrefs::instance()->mCustomCategories; @@ -3180,26 +3184,29 @@ void CalendarView::cloneIncidence(Incidence * orgInc ) } else { mCalendar->addTodo( t ); updateView(); } } else { delete t; } } - else { + else if ( newInc->typeID() == eventID ) { Event* e = (Event*) newInc; showEventEditor(); mEventEditor->editEvent( e ); if ( mEventEditor->exec() ) { mCalendar->addEvent( e ); updateView(); } else { delete e; } + } if ( newInc->typeID() == journalID ) { + mCalendar->addJournal( (Journal*) newInc ); + editJournal( (Journal*) newInc ); } setActiveWindow(); } void CalendarView::newEvent() { // TODO: Replace this code by a common eventDurationHint of KOBaseView. KOAgendaView *aView = mViewManager->agendaView(); @@ -3493,17 +3500,17 @@ void CalendarView::deleteTodo(Todo *todo) return; } if (KOPrefs::instance()->mConfirm) { QString text = todo->summary().left(20); if (!todo->relations().isEmpty()) { text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!"); } - switch (msgItemDelete(text)) { + switch (msgItemDelete(i18n("Todo:") +"\n"+text)) { case KMessageBox::Continue: // OK bool deleteT = false; if (!todo->relations().isEmpty()) { deleteT = removeCompletedSubTodos( todo ); } // deleteT == true: todo already deleted in removeCompletedSubTodos if ( !deleteT ) { checkExternalId( todo ); @@ -3524,17 +3531,27 @@ void CalendarView::deleteTodo(Todo *todo) } void CalendarView::deleteJournal(Journal *jour) { if (!jour) { KNotifyClient::beep(); return; } if (KOPrefs::instance()->mConfirm) { - switch (msgItemDelete( jour->description().left(20))) { + + QString des; + if ( !jour->summary().isEmpty() ) { + des = jour->summary(); + } else { + des = jour->description().left(30); + des = des.simplifyWhiteSpace (); + des.replace (QRegExp ("\\n"),"" ); + des.replace (QRegExp ("\\r"),"" ); + } + switch (msgItemDelete( i18n("Journal:") +"\n"+des.left(20))) { case KMessageBox::Continue: // OK calendar()->deleteJournal(jour); updateView(); break; } // switch } else { calendar()->deleteJournal(jour);; updateView(); |