author | zautrix <zautrix> | 2005-07-10 01:20:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-10 01:20:01 (UTC) |
commit | 2a3542ecc4eee8bb4b3d81fcf69e0cf97f07ff4a (patch) (unidiff) | |
tree | b85ac7b9a3bc85abe04f6e3aea77b0e70fa22396 /korganizer/calendarview.cpp | |
parent | 2d1e1fe5d290503db8c0462fc294f5c04f58e95c (diff) | |
download | kdepimpi-2a3542ecc4eee8bb4b3d81fcf69e0cf97f07ff4a.zip kdepimpi-2a3542ecc4eee8bb4b3d81fcf69e0cf97f07ff4a.tar.gz kdepimpi-2a3542ecc4eee8bb4b3d81fcf69e0cf97f07ff4a.tar.bz2 |
fixxx
-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 | |||
@@ -2807,13 +2807,14 @@ void CalendarView::checkConflictForEvent() | |||
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() |