summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp8
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
@@ -677,7 +677,9 @@ void CalendarView::nextConflict( bool all, bool allday )
QPtrList<Event> testlist2 = testlist;
test = testlist.first();
bool skip = false;
+ topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
while ( test ) {
+ qApp->processEvents();
skip = false;
if ( !all ) skip = ( allday != test->doesFloat() );
if ( !skip ) {
@@ -2768,10 +2770,7 @@ void CalendarView::checkConflictForEvent()
if (!KOPrefs::instance()->mConfirm)
return;
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();
Event * test = testlist.first();
QDateTime conflict;
@@ -2780,6 +2779,7 @@ void CalendarView::checkConflictForEvent()
Event * cE = 0;
QDateTime current = QDateTime::currentDateTime();
while ( test ) {
+ qApp->processEvents();
if ( !test->doesFloat() ) {
if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
if ( ! found ) {