| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
| -rw-r--r-- | korganizer/calendarview.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 6723dc5..0b928ef 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1530,3 +1530,3 @@ { "Last Modified Sub","Zuletzt geändertes Sub" }, -{ "","" }, +{ "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" }, { "","" }, 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() ) { |