-rw-r--r-- | korganizer/calendarview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ab69158..5a2482e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2801,25 +2801,26 @@ void CalendarView::checkConflictForEvent() | |||
2801 | qApp->processEvents(); | 2801 | qApp->processEvents(); |
2802 | int km = KMessageBox::warningContinueCancel(this,mess, | 2802 | int km = KMessageBox::warningContinueCancel(this,mess, |
2803 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); | 2803 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); |
2804 | if ( km != KMessageBox::Continue ) | 2804 | if ( km != KMessageBox::Continue ) |
2805 | return; | 2805 | return; |
2806 | 2806 | ||
2807 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 2807 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
2808 | mViewManager->showDayView(); | 2808 | mViewManager->showDayView(); |
2809 | mNavigator->slotDaySelect( conflict.date() ); | 2809 | mNavigator->slotDaySelect( conflict.date() ); |
2810 | int hour = conflict.time().hour(); | 2810 | int hour = conflict.time().hour(); |
2811 | mViewManager->agendaView()->setStartHour( hour ); | 2811 | mViewManager->agendaView()->setStartHour( hour ); |
2812 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); | 2812 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); |
2813 | } | 2813 | } else |
2814 | topLevelWidget()->setCaption( i18n("No conflict found") ); | ||
2814 | mConflictingEvent = 0; | 2815 | mConflictingEvent = 0; |
2815 | return; | 2816 | return; |
2816 | 2817 | ||
2817 | } | 2818 | } |
2818 | 2819 | ||
2819 | void CalendarView::updateTodoViews() | 2820 | void CalendarView::updateTodoViews() |
2820 | { | 2821 | { |
2821 | mTodoList->updateView(); | 2822 | mTodoList->updateView(); |
2822 | mViewManager->currentView()->updateView(); | 2823 | mViewManager->currentView()->updateView(); |
2823 | 2824 | ||
2824 | } | 2825 | } |
2825 | 2826 | ||