author | zautrix <zautrix> | 2005-07-07 00:03:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-07 00:03:44 (UTC) |
commit | cb350dbe9151db2ded62942d29d11d6c8b88eabd (patch) (unidiff) | |
tree | 3ba8d483461e10afddb67f17cd038118d99513ef | |
parent | 93bc4dbbef774e28672c947281291b12d5971803 (diff) | |
download | kdepimpi-cb350dbe9151db2ded62942d29d11d6c8b88eabd.zip kdepimpi-cb350dbe9151db2ded62942d29d11d6c8b88eabd.tar.gz kdepimpi-cb350dbe9151db2ded62942d29d11d6c8b88eabd.tar.bz2 |
fixessss
-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 | |||
@@ -2816,13 +2816,13 @@ void CalendarView::slotSelectPickerDate( QDate d) | |||
2816 | else | 2816 | else |
2817 | if (to->dtStart() > to->dtDue() ) | 2817 | if (to->dtStart() > to->dtDue() ) |
2818 | to->setDtStart(to->dtDue().addDays( -3 )); | 2818 | to->setDtStart(to->dtDue().addDays( -3 )); |
2819 | } | 2819 | } |
2820 | 2820 | ||
2821 | todoChanged( to ); | 2821 | todoChanged( to ); |
2822 | } else { | 2822 | } else if ( mMoveIncidence->typeID() == eventID ) { |
2823 | if ( mMoveIncidence->doesRecur() ) { | 2823 | if ( mMoveIncidence->doesRecur() ) { |
2824 | #if 0 | 2824 | #if 0 |
2825 | // PENDING implement this | 2825 | // PENDING implement this |
2826 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); | 2826 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); |
2827 | mCalendar()->addIncidence( newInc ); | 2827 | mCalendar()->addIncidence( newInc ); |
2828 | if ( mMoveIncidence->typeID() == todoID ) | 2828 | if ( mMoveIncidence->typeID() == todoID ) |
@@ -2836,14 +2836,18 @@ void CalendarView::slotSelectPickerDate( QDate d) | |||
2836 | QTime tim = mMoveIncidence->dtStart().time(); | 2836 | QTime tim = mMoveIncidence->dtStart().time(); |
2837 | int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); | 2837 | int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); |
2838 | QDateTime dt ( d,tim ); | 2838 | QDateTime dt ( d,tim ); |
2839 | mMoveIncidence->setDtStart( dt ); | 2839 | mMoveIncidence->setDtStart( dt ); |
2840 | ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); | 2840 | ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); |
2841 | changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); | 2841 | changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); |
2842 | } else if ( mMoveIncidence->typeID() == journalID ) { | ||
2843 | QTime tim = mMoveIncidence->dtStart().time(); | ||
2844 | QDateTime dt ( d,tim ); | ||
2845 | mMoveIncidence->setDtStart( dt ); | ||
2846 | updateView(); | ||
2842 | } | 2847 | } |
2843 | |||
2844 | mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); | 2848 | mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); |
2845 | } | 2849 | } |
2846 | } | 2850 | } |
2847 | 2851 | ||
2848 | void CalendarView::removeCategories() | 2852 | void CalendarView::removeCategories() |
2849 | { | 2853 | { |
@@ -3182,22 +3186,25 @@ void CalendarView::cloneIncidence(Incidence * orgInc ) | |||
3182 | updateView(); | 3186 | updateView(); |
3183 | } | 3187 | } |
3184 | } else { | 3188 | } else { |
3185 | delete t; | 3189 | delete t; |
3186 | } | 3190 | } |
3187 | } | 3191 | } |
3188 | else { | 3192 | else if ( newInc->typeID() == eventID ) { |
3189 | Event* e = (Event*) newInc; | 3193 | Event* e = (Event*) newInc; |
3190 | showEventEditor(); | 3194 | showEventEditor(); |
3191 | mEventEditor->editEvent( e ); | 3195 | mEventEditor->editEvent( e ); |
3192 | if ( mEventEditor->exec() ) { | 3196 | if ( mEventEditor->exec() ) { |
3193 | mCalendar->addEvent( e ); | 3197 | mCalendar->addEvent( e ); |
3194 | updateView(); | 3198 | updateView(); |
3195 | } else { | 3199 | } else { |
3196 | delete e; | 3200 | delete e; |
3197 | } | 3201 | } |
3202 | } if ( newInc->typeID() == journalID ) { | ||
3203 | mCalendar->addJournal( (Journal*) newInc ); | ||
3204 | editJournal( (Journal*) newInc ); | ||
3198 | } | 3205 | } |
3199 | setActiveWindow(); | 3206 | setActiveWindow(); |
3200 | } | 3207 | } |
3201 | 3208 | ||
3202 | void CalendarView::newEvent() | 3209 | void CalendarView::newEvent() |
3203 | { | 3210 | { |
@@ -3495,13 +3502,13 @@ void CalendarView::deleteTodo(Todo *todo) | |||
3495 | if (KOPrefs::instance()->mConfirm) { | 3502 | if (KOPrefs::instance()->mConfirm) { |
3496 | QString text = todo->summary().left(20); | 3503 | QString text = todo->summary().left(20); |
3497 | if (!todo->relations().isEmpty()) { | 3504 | if (!todo->relations().isEmpty()) { |
3498 | text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!"); | 3505 | text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!"); |
3499 | 3506 | ||
3500 | } | 3507 | } |
3501 | switch (msgItemDelete(text)) { | 3508 | switch (msgItemDelete(i18n("Todo:") +"\n"+text)) { |
3502 | case KMessageBox::Continue: // OK | 3509 | case KMessageBox::Continue: // OK |
3503 | bool deleteT = false; | 3510 | bool deleteT = false; |
3504 | if (!todo->relations().isEmpty()) { | 3511 | if (!todo->relations().isEmpty()) { |
3505 | deleteT = removeCompletedSubTodos( todo ); | 3512 | deleteT = removeCompletedSubTodos( todo ); |
3506 | } | 3513 | } |
3507 | // deleteT == true: todo already deleted in removeCompletedSubTodos | 3514 | // deleteT == true: todo already deleted in removeCompletedSubTodos |
@@ -3526,13 +3533,23 @@ void CalendarView::deleteJournal(Journal *jour) | |||
3526 | { | 3533 | { |
3527 | if (!jour) { | 3534 | if (!jour) { |
3528 | KNotifyClient::beep(); | 3535 | KNotifyClient::beep(); |
3529 | return; | 3536 | return; |
3530 | } | 3537 | } |
3531 | if (KOPrefs::instance()->mConfirm) { | 3538 | if (KOPrefs::instance()->mConfirm) { |
3532 | switch (msgItemDelete( jour->description().left(20))) { | 3539 | |
3540 | QString des; | ||
3541 | if ( !jour->summary().isEmpty() ) { | ||
3542 | des = jour->summary(); | ||
3543 | } else { | ||
3544 | des = jour->description().left(30); | ||
3545 | des = des.simplifyWhiteSpace (); | ||
3546 | des.replace (QRegExp ("\\n"),"" ); | ||
3547 | des.replace (QRegExp ("\\r"),"" ); | ||
3548 | } | ||
3549 | switch (msgItemDelete( i18n("Journal:") +"\n"+des.left(20))) { | ||
3533 | case KMessageBox::Continue: // OK | 3550 | case KMessageBox::Continue: // OK |
3534 | calendar()->deleteJournal(jour); | 3551 | calendar()->deleteJournal(jour); |
3535 | updateView(); | 3552 | updateView(); |
3536 | break; | 3553 | break; |
3537 | } // switch | 3554 | } // switch |
3538 | } else { | 3555 | } else { |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 5f90dc6..7783dd4 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -968,15 +968,17 @@ void KOListView::resetFocus() | |||
968 | topLevelWidget()->raise(); | 968 | topLevelWidget()->raise(); |
969 | mListView->setFocus(); | 969 | mListView->setFocus(); |
970 | } | 970 | } |
971 | void KOListView::updateView() | 971 | void KOListView::updateView() |
972 | { | 972 | { |
973 | mListView->setFocus(); | 973 | mListView->setFocus(); |
974 | if ( mListView->firstChild () ) | 974 | if ( mListView->firstChild () ) { |
975 | mListView->setCurrentItem( mListView->firstChild () ); | 975 | mListView->setCurrentItem( mListView->firstChild () ); |
976 | } | 976 | } |
977 | processSelectionChange( mListView->firstChild () ); | ||
978 | } | ||
977 | void KOListView::updateConfig() | 979 | void KOListView::updateConfig() |
978 | { | 980 | { |
979 | 981 | ||
980 | mListView->setFont ( KOPrefs::instance()->mListViewFont ); | 982 | mListView->setFont ( KOPrefs::instance()->mListViewFont ); |
981 | updateView(); | 983 | updateView(); |
982 | 984 | ||
@@ -994,13 +996,13 @@ void KOListView::showDates(const QDate &start, const QDate &end) | |||
994 | while( date <= end ) { | 996 | while( date <= end ) { |
995 | addEvents(calendar()->events(date)); | 997 | addEvents(calendar()->events(date)); |
996 | addTodos(calendar()->todos(date)); | 998 | addTodos(calendar()->todos(date)); |
997 | addJournals( calendar()->journals4Date(date) ); | 999 | addJournals( calendar()->journals4Date(date) ); |
998 | date = date.addDays( 1 ); | 1000 | date = date.addDays( 1 ); |
999 | } | 1001 | } |
1000 | emit incidenceSelected( 0 ); | 1002 | //emit incidenceSelected( 0 ); |
1001 | updateView(); | 1003 | updateView(); |
1002 | 1004 | ||
1003 | } | 1005 | } |
1004 | 1006 | ||
1005 | void KOListView::addEvents(QPtrList<Event> eventList) | 1007 | void KOListView::addEvents(QPtrList<Event> eventList) |
1006 | { | 1008 | { |