-rw-r--r-- | korganizer/calendarview.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7c8316f..3dac20b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2218,105 +2218,117 @@ void CalendarView::edit_copy() | |||
2218 | return; | 2218 | return; |
2219 | } | 2219 | } |
2220 | DndFactory factory( mCalendar ); | 2220 | DndFactory factory( mCalendar ); |
2221 | factory.copyIncidence(anEvent); | 2221 | factory.copyIncidence(anEvent); |
2222 | } | 2222 | } |
2223 | 2223 | ||
2224 | void CalendarView::edit_paste() | 2224 | void CalendarView::edit_paste() |
2225 | { | 2225 | { |
2226 | QDate date = mNavigator->selectedDates().first(); | 2226 | QDate date = mNavigator->selectedDates().first(); |
2227 | 2227 | ||
2228 | DndFactory factory( mCalendar ); | 2228 | DndFactory factory( mCalendar ); |
2229 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); | 2229 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); |
2230 | 2230 | ||
2231 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2231 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); |
2232 | } | 2232 | } |
2233 | 2233 | ||
2234 | void CalendarView::edit_options() | 2234 | void CalendarView::edit_options() |
2235 | { | 2235 | { |
2236 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; | 2236 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; |
2237 | emit save(); | 2237 | emit save(); |
2238 | emit saveStopTimer(); | 2238 | emit saveStopTimer(); |
2239 | mDialogManager->showOptionsDialog(); | 2239 | mDialogManager->showOptionsDialog(); |
2240 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { | 2240 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { |
2241 | emit saveStopTimer(); | 2241 | emit saveStopTimer(); |
2242 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), | 2242 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), |
2243 | i18n("Timezone settings"),i18n("Reload"))) { | 2243 | i18n("Timezone settings"),i18n("Reload"))) { |
2244 | qDebug("KO: TZ reload cancelled "); | 2244 | qDebug("KO: TZ reload cancelled "); |
2245 | return; | 2245 | return; |
2246 | } | 2246 | } |
2247 | qDebug("KO: Timezone change "); | 2247 | qDebug("KO: Timezone change "); |
2248 | openCalendar( MainWindow::defaultFileName() ); | 2248 | openCalendar( MainWindow::defaultFileName() ); |
2249 | setModified(true); | 2249 | setModified(true); |
2250 | } | 2250 | } |
2251 | else | 2251 | else |
2252 | qDebug("KO: No tz change "); | 2252 | qDebug("KO: No tz change "); |
2253 | 2253 | ||
2254 | } | 2254 | } |
2255 | 2255 | ||
2256 | 2256 | ||
2257 | void CalendarView::slotSelectPickerDate( QDate d) | 2257 | void CalendarView::slotSelectPickerDate( QDate d) |
2258 | { | 2258 | { |
2259 | mDateFrame->hide(); | 2259 | mDateFrame->hide(); |
2260 | if ( mDatePickerMode == 1 ) { | 2260 | if ( mDatePickerMode == 1 ) { |
2261 | mNavigator->slotDaySelect( d ); | 2261 | mNavigator->slotDaySelect( d ); |
2262 | } else if ( mDatePickerMode == 2 ) { | 2262 | } else if ( mDatePickerMode == 2 ) { |
2263 | if ( mMoveIncidence->type() == "Todo" ) { | 2263 | if ( mMoveIncidence->type() == "Todo" ) { |
2264 | Todo * to = (Todo *) mMoveIncidence; | 2264 | Todo * to = (Todo *) mMoveIncidence; |
2265 | QTime tim; | 2265 | QTime tim; |
2266 | int len = 0; | ||
2267 | if ( to->hasStartDate() && to->hasDueDate() ) | ||
2268 | len = to->dtStart().secsTo( to->dtDue()); | ||
2266 | if ( to->hasDueDate() ) | 2269 | if ( to->hasDueDate() ) |
2267 | tim = to->dtDue().time(); | 2270 | tim = to->dtDue().time(); |
2268 | else { | 2271 | else { |
2269 | tim = QTime ( 0,0,0 ); | 2272 | tim = QTime ( 0,0,0 ); |
2270 | to->setFloats( true ); | 2273 | to->setFloats( true ); |
2271 | to->setHasDueDate( true ); | 2274 | to->setHasDueDate( true ); |
2272 | } | 2275 | } |
2273 | QDateTime dt ( d,tim ); | 2276 | QDateTime dt ( d,tim ); |
2274 | to->setDtDue( dt ); | 2277 | to->setDtDue( dt ); |
2278 | |||
2279 | if ( to->hasStartDate() ) { | ||
2280 | if ( len>0 ) | ||
2281 | to->setDtStart(to->dtDue().addSecs( -len )); | ||
2282 | else | ||
2283 | if (to->dtStart() > to->dtDue() ) | ||
2284 | to->setDtStart(to->dtDue().addDays( -3 )); | ||
2285 | } | ||
2286 | |||
2275 | todoChanged( to ); | 2287 | todoChanged( to ); |
2276 | } else { | 2288 | } else { |
2277 | if ( mMoveIncidence->doesRecur() ) { | 2289 | if ( mMoveIncidence->doesRecur() ) { |
2278 | #if 0 | 2290 | #if 0 |
2279 | // PENDING implement this | 2291 | // PENDING implement this |
2280 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); | 2292 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); |
2281 | mCalendar()->addIncidence( newInc ); | 2293 | mCalendar()->addIncidence( newInc ); |
2282 | if ( mMoveIncidence->type() == "Todo" ) | 2294 | if ( mMoveIncidence->type() == "Todo" ) |
2283 | emit todoMoved((Todo*)mMoveIncidence, KOGlobals::EVENTEDITED ); | 2295 | emit todoMoved((Todo*)mMoveIncidence, KOGlobals::EVENTEDITED ); |
2284 | else | 2296 | else |
2285 | emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED); | 2297 | emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED); |
2286 | mMoveIncidence = newInc; | 2298 | mMoveIncidence = newInc; |
2287 | 2299 | ||
2288 | #endif | 2300 | #endif |
2289 | } | 2301 | } |
2290 | QTime tim = mMoveIncidence->dtStart().time(); | 2302 | QTime tim = mMoveIncidence->dtStart().time(); |
2291 | int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); | 2303 | int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); |
2292 | QDateTime dt ( d,tim ); | 2304 | QDateTime dt ( d,tim ); |
2293 | mMoveIncidence->setDtStart( dt ); | 2305 | mMoveIncidence->setDtStart( dt ); |
2294 | ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); | 2306 | ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) ); |
2295 | changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); | 2307 | changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED); |
2296 | } | 2308 | } |
2297 | 2309 | ||
2298 | mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); | 2310 | mMoveIncidence->setRevision( mMoveIncidence->revision()+1 ); |
2299 | } | 2311 | } |
2300 | } | 2312 | } |
2301 | 2313 | ||
2302 | void CalendarView::removeCategories() | 2314 | void CalendarView::removeCategories() |
2303 | { | 2315 | { |
2304 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); | 2316 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); |
2305 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 2317 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
2306 | QStringList catIncList; | 2318 | QStringList catIncList; |
2307 | QStringList newCatList; | 2319 | QStringList newCatList; |
2308 | Incidence* inc = incList.first(); | 2320 | Incidence* inc = incList.first(); |
2309 | int i; | 2321 | int i; |
2310 | int count = 0; | 2322 | int count = 0; |
2311 | while ( inc ) { | 2323 | while ( inc ) { |
2312 | newCatList.clear(); | 2324 | newCatList.clear(); |
2313 | catIncList = inc->categories() ; | 2325 | catIncList = inc->categories() ; |
2314 | for( i = 0; i< catIncList.count(); ++i ) { | 2326 | for( i = 0; i< catIncList.count(); ++i ) { |
2315 | if ( catList.contains (catIncList[i])) | 2327 | if ( catList.contains (catIncList[i])) |
2316 | newCatList.append( catIncList[i] ); | 2328 | newCatList.append( catIncList[i] ); |
2317 | } | 2329 | } |
2318 | newCatList.sort(); | 2330 | newCatList.sort(); |
2319 | inc->setCategories( newCatList.join(",") ); | 2331 | inc->setCategories( newCatList.join(",") ); |
2320 | inc = incList.next(); | 2332 | inc = incList.next(); |
2321 | } | 2333 | } |
2322 | } | 2334 | } |
@@ -3765,97 +3777,97 @@ void CalendarView::showIncidence(Incidence *incidence) | |||
3765 | ShowIncidenceVisitor v; | 3777 | ShowIncidenceVisitor v; |
3766 | v.act( incidence, this ); | 3778 | v.act( incidence, this ); |
3767 | } | 3779 | } |
3768 | } | 3780 | } |
3769 | 3781 | ||
3770 | void CalendarView::editIncidence(Incidence *incidence) | 3782 | void CalendarView::editIncidence(Incidence *incidence) |
3771 | { | 3783 | { |
3772 | if ( incidence ) { | 3784 | if ( incidence ) { |
3773 | 3785 | ||
3774 | EditIncidenceVisitor v; | 3786 | EditIncidenceVisitor v; |
3775 | v.act( incidence, this ); | 3787 | v.act( incidence, this ); |
3776 | 3788 | ||
3777 | } | 3789 | } |
3778 | } | 3790 | } |
3779 | 3791 | ||
3780 | void CalendarView::deleteIncidence(Incidence *incidence) | 3792 | void CalendarView::deleteIncidence(Incidence *incidence) |
3781 | { | 3793 | { |
3782 | //qDebug(" CalendarView::deleteIncidence "); | 3794 | //qDebug(" CalendarView::deleteIncidence "); |
3783 | if ( incidence ) { | 3795 | if ( incidence ) { |
3784 | DeleteIncidenceVisitor v; | 3796 | DeleteIncidenceVisitor v; |
3785 | v.act( incidence, this ); | 3797 | v.act( incidence, this ); |
3786 | } | 3798 | } |
3787 | } | 3799 | } |
3788 | 3800 | ||
3789 | 3801 | ||
3790 | void CalendarView::lookForOutgoingMessages() | 3802 | void CalendarView::lookForOutgoingMessages() |
3791 | { | 3803 | { |
3792 | OutgoingDialog *ogd = mDialogManager->outgoingDialog(); | 3804 | OutgoingDialog *ogd = mDialogManager->outgoingDialog(); |
3793 | ogd->loadMessages(); | 3805 | ogd->loadMessages(); |
3794 | } | 3806 | } |
3795 | 3807 | ||
3796 | void CalendarView::lookForIncomingMessages() | 3808 | void CalendarView::lookForIncomingMessages() |
3797 | { | 3809 | { |
3798 | IncomingDialog *icd = mDialogManager->incomingDialog(); | 3810 | IncomingDialog *icd = mDialogManager->incomingDialog(); |
3799 | icd->retrieve(); | 3811 | icd->retrieve(); |
3800 | } | 3812 | } |
3801 | 3813 | ||
3802 | bool CalendarView::removeCompletedSubTodos( Todo* t ) | 3814 | bool CalendarView::removeCompletedSubTodos( Todo* t ) |
3803 | { | 3815 | { |
3804 | bool deleteTodo = true; | 3816 | bool deleteTodo = true; |
3805 | QPtrList<Incidence> subTodos; | 3817 | QPtrList<Incidence> subTodos; |
3806 | Incidence *aTodo; | 3818 | Incidence *aTodo; |
3807 | subTodos = t->relations(); | 3819 | subTodos = t->relations(); |
3808 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { | 3820 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { |
3809 | if (! removeCompletedSubTodos( (Todo*) aTodo )) | 3821 | if (! removeCompletedSubTodos( (Todo*) aTodo )) |
3810 | deleteTodo = false; | 3822 | deleteTodo = false; |
3811 | } | 3823 | } |
3812 | if ( deleteTodo ) { | 3824 | if ( deleteTodo ) { |
3813 | if ( t->isCompleted() ) { | 3825 | if ( t->isCompleted() && !t->doesRecur()) { |
3814 | checkExternalId( t ); | 3826 | checkExternalId( t ); |
3815 | mCalendar->deleteTodo( t ); | 3827 | mCalendar->deleteTodo( t ); |
3816 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); | 3828 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); |
3817 | } | 3829 | } |
3818 | else | 3830 | else |
3819 | deleteTodo = false; | 3831 | deleteTodo = false; |
3820 | } | 3832 | } |
3821 | return deleteTodo; | 3833 | return deleteTodo; |
3822 | 3834 | ||
3823 | } | 3835 | } |
3824 | void CalendarView::purgeCompleted() | 3836 | void CalendarView::purgeCompleted() |
3825 | { | 3837 | { |
3826 | int result = KMessageBox::warningContinueCancel(this, | 3838 | int result = KMessageBox::warningContinueCancel(this, |
3827 | i18n("Delete all\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge")); | 3839 | i18n("Delete all\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge")); |
3828 | 3840 | ||
3829 | if (result == KMessageBox::Continue) { | 3841 | if (result == KMessageBox::Continue) { |
3830 | 3842 | ||
3831 | QPtrList<Todo> todoCal; | 3843 | QPtrList<Todo> todoCal; |
3832 | QPtrList<Todo> rootTodos; | 3844 | QPtrList<Todo> rootTodos; |
3833 | //QPtrList<Incidence> rel; | 3845 | //QPtrList<Incidence> rel; |
3834 | Todo *aTodo;//, *rTodo; | 3846 | Todo *aTodo;//, *rTodo; |
3835 | Incidence *rIncidence; | 3847 | Incidence *rIncidence; |
3836 | bool childDelete = false; | 3848 | bool childDelete = false; |
3837 | bool deletedOne = true; | 3849 | bool deletedOne = true; |
3838 | todoCal = calendar()->todos(); | 3850 | todoCal = calendar()->todos(); |
3839 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { | 3851 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { |
3840 | if ( !aTodo->relatedTo() ) | 3852 | if ( !aTodo->relatedTo() ) |
3841 | rootTodos.append( aTodo ); | 3853 | rootTodos.append( aTodo ); |
3842 | } | 3854 | } |
3843 | for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) { | 3855 | for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) { |
3844 | removeCompletedSubTodos( aTodo ); | 3856 | removeCompletedSubTodos( aTodo ); |
3845 | } | 3857 | } |
3846 | 3858 | ||
3847 | updateView(); | 3859 | updateView(); |
3848 | } | 3860 | } |
3849 | } | 3861 | } |
3850 | 3862 | ||
3851 | void CalendarView::slotCalendarChanged() | 3863 | void CalendarView::slotCalendarChanged() |
3852 | { | 3864 | { |
3853 | ; | 3865 | ; |
3854 | } | 3866 | } |
3855 | 3867 | ||
3856 | void CalendarView::keyPressEvent ( QKeyEvent *e) | 3868 | void CalendarView::keyPressEvent ( QKeyEvent *e) |
3857 | { | 3869 | { |
3858 | //qDebug(" alendarView::keyPressEvent "); | 3870 | //qDebug(" alendarView::keyPressEvent "); |
3859 | e->ignore(); | 3871 | e->ignore(); |
3860 | } | 3872 | } |
3861 | 3873 | ||