| -rw-r--r-- | korganizer/calendarview.cpp | 27 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 6 |
2 files changed, 26 insertions, 7 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 98e0ac1..bc1c0c7 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2820,5 +2820,5 @@ void CalendarView::slotSelectPickerDate( QDate d) todoChanged( to ); - } else { + } else if ( mMoveIncidence->typeID() == eventID ) { if ( mMoveIncidence->doesRecur() ) { #if 0 @@ -2840,6 +2840,10 @@ void CalendarView::slotSelectPickerDate( QDate d) ((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 ); } @@ -3186,5 +3190,5 @@ void CalendarView::cloneIncidence(Incidence * orgInc ) } } - else { + else if ( newInc->typeID() == eventID ) { Event* e = (Event*) newInc; showEventEditor(); @@ -3196,4 +3200,7 @@ void CalendarView::cloneIncidence(Incidence * orgInc ) delete e; } + } if ( newInc->typeID() == journalID ) { + mCalendar->addJournal( (Journal*) newInc ); + editJournal( (Journal*) newInc ); } setActiveWindow(); @@ -3499,5 +3506,5 @@ void CalendarView::deleteTodo(Todo *todo) } - switch (msgItemDelete(text)) { + switch (msgItemDelete(i18n("Todo:") +"\n"+text)) { case KMessageBox::Continue: // OK bool deleteT = false; @@ -3530,5 +3537,15 @@ void CalendarView::deleteJournal(Journal *jour) } 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); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 5f90dc6..7783dd4 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -972,6 +972,8 @@ void KOListView::updateView() { mListView->setFocus(); - if ( mListView->firstChild () ) + if ( mListView->firstChild () ) { mListView->setCurrentItem( mListView->firstChild () ); + } + processSelectionChange( mListView->firstChild () ); } void KOListView::updateConfig() @@ -998,5 +1000,5 @@ void KOListView::showDates(const QDate &start, const QDate &end) date = date.addDays( 1 ); } - emit incidenceSelected( 0 ); + //emit incidenceSelected( 0 ); updateView(); |