summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp27
-rw-r--r--korganizer/kolistview.cpp6
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
@@ -2821,3 +2821,3 @@ void CalendarView::slotSelectPickerDate( QDate d)
todoChanged( to );
- } else {
+ } else if ( mMoveIncidence->typeID() == eventID ) {
if ( mMoveIncidence->doesRecur() ) {
@@ -2841,4 +2841,8 @@ void CalendarView::slotSelectPickerDate( QDate d)
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 );
@@ -3187,3 +3191,3 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
}
- else {
+ else if ( newInc->typeID() == eventID ) {
Event* e = (Event*) newInc;
@@ -3197,2 +3201,5 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
}
+ } if ( newInc->typeID() == journalID ) {
+ mCalendar->addJournal( (Journal*) newInc );
+ editJournal( (Journal*) newInc );
}
@@ -3500,3 +3507,3 @@ void CalendarView::deleteTodo(Todo *todo)
}
- switch (msgItemDelete(text)) {
+ switch (msgItemDelete(i18n("Todo:") +"\n"+text)) {
case KMessageBox::Continue: // OK
@@ -3531,3 +3538,13 @@ 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
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 5f90dc6..7783dd4 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -973,5 +973,7 @@ void KOListView::updateView()
mListView->setFocus();
- if ( mListView->firstChild () )
+ if ( mListView->firstChild () ) {
mListView->setCurrentItem( mListView->firstChild () );
}
+ processSelectionChange( mListView->firstChild () );
+}
void KOListView::updateConfig()
@@ -999,3 +1001,3 @@ void KOListView::showDates(const QDate &start, const QDate &end)
}
- emit incidenceSelected( 0 );
+ //emit incidenceSelected( 0 );
updateView();