summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -2818,9 +2818,9 @@ void CalendarView::slotSelectPickerDate( QDate d)
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 );
@@ -2838,10 +2838,14 @@ void CalendarView::slotSelectPickerDate( QDate d)
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 );
}
}
@@ -3184,9 +3188,9 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
} else {
delete t;
}
}
- else {
+ else if ( newInc->typeID() == eventID ) {
Event* e = (Event*) newInc;
showEventEditor();
mEventEditor->editEvent( e );
if ( mEventEditor->exec() ) {
@@ -3194,8 +3198,11 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
updateView();
} else {
delete e;
}
+ } if ( newInc->typeID() == journalID ) {
+ mCalendar->addJournal( (Journal*) newInc );
+ editJournal( (Journal*) newInc );
}
setActiveWindow();
}
@@ -3497,9 +3504,9 @@ void CalendarView::deleteTodo(Todo *todo)
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 );
@@ -3528,9 +3535,19 @@ void CalendarView::deleteJournal(Journal *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;
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 5f90dc6..7783dd4 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -970,10 +970,12 @@ void KOListView::resetFocus()
}
void KOListView::updateView()
{
mListView->setFocus();
- if ( mListView->firstChild () )
+ if ( mListView->firstChild () ) {
mListView->setCurrentItem( mListView->firstChild () );
+ }
+ processSelectionChange( mListView->firstChild () );
}
void KOListView::updateConfig()
{
@@ -996,9 +998,9 @@ void KOListView::showDates(const QDate &start, const QDate &end)
addTodos(calendar()->todos(date));
addJournals( calendar()->journals4Date(date) );
date = date.addDays( 1 );
}
- emit incidenceSelected( 0 );
+ //emit incidenceSelected( 0 );
updateView();
}