| -rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f9685e9..ab69158 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -679,3 +679,5 @@ void CalendarView::nextConflict( bool all, bool allday ) bool skip = false; + topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); while ( test ) { + qApp->processEvents(); skip = false; @@ -2770,6 +2772,3 @@ void CalendarView::checkConflictForEvent() if ( ! mConflictingEvent ) return; - if ( mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) { - mConflictingEvent = 0; - return; - } + topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); QPtrList<Event> testlist = mCalendar->events(); @@ -2782,2 +2781,3 @@ void CalendarView::checkConflictForEvent() while ( test ) { + qApp->processEvents(); if ( !test->doesFloat() ) { |