fixxx

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
@@ -1499,45 +1499,45 @@
 { "Events with time","Termine mit Zeit" },
 { "No conflict found","Kein Konflikt gefunden" },
 { "Conflict %1 <-> %2","Konflikt %1 <-> %2" },
 { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " },
 { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" },
 { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" },
 { "KO/Pi Conflict delected","KO/Pi Konflikt erkannt" },
 { "Show date","Zeige Datum" },
 { "No problem!","Null Problemo!" },
 { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" },
 { "Pi-Sync Port Error","Pi-Sync Port Fehler" },
 { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" },
 { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" },
 { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" },
 { "Pi-Sync Error","Pi-Sync Fehler" },
 { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" },
 { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" },
 { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." },
 { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" },
 { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" },
 { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" },
 { "Receiving file from remote...","Empfange entfernte Datei..." },
 { "Sending back synced file...","Sende synchronisierte Datei zurück..." },
 { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" },
 { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" },
 { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." },
 { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" },
 { "Writing back file ...","Schreibe Datei zurück..." },
 { "Sending back file ...","Sende Datei zurück..." },
 { "Eeek, there I am ticklish!","Hihi, da bin ich kitzlig!" },
 { "Created","Angelegt" },
 { "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
@@ -648,65 +648,67 @@ CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 void CalendarView::nextConflict( bool all, bool allday )
 {
     
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
         test = testlist.next();
     }
     QTime st ( 0,0,0);
     if ( mViewManager->currentView() == mViewManager->agendaView()  )
         st = mViewManager->agendaView()->agenda()->getEndTime();
     //qDebug("time %s ", st.toString().latin1());
     QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st);
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     Event * cE2 = 0;
     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 ) {
             Event * test2 = testlist2.first();
             while ( test2 ) { 
                 skip = false;
                 if ( !all ) skip = ( allday != test2->doesFloat() );
                 if ( !skip ) {
                     if ( !test2->isTagged() ) {
                         if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
                             //qDebug("overlap ");
                             if ( ! found ) {
                                 if ( retVal >= startDT ) {
                                     conflict = retVal; 
                                     cE = test;
                                     cE2 = test2;
                                     found = true;
                                 }
                             } else {
                                 if ( retVal >= startDT && retVal < conflict ) {
                                     conflict = retVal; 
                                     cE = test;
                                     cE2 = test2;
                                 }
                             }
                         }
                     }
                 }
                 test2 = testlist2.next();
             }
         }
         test->setTagged( true );
@@ -2739,76 +2741,74 @@ void CalendarView::changeEventDisplay(Event *which, int action)
     static bool clearallviews = false;
     if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
         if ( clearallviews ) {
             clearAllViews();
             clearallviews = false;
         }
         return;
     }
     clearallviews = true;
     mDateNavigator->updateView();
     //mDialogManager->updateSearchDialog();
     if (which) {
         // If there is an event view visible update the display
         mViewManager->currentView()->changeEventDisplay(which,action);
         // TODO: check, if update needed
         //    if (which->getTodoStatus()) {
         mTodoList->updateView();
         if (  action != KOGlobals::EVENTDELETED ) {
             mConflictingEvent = which ;
             QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) );
         }
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 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;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     QDateTime current = QDateTime::currentDateTime();
     while ( test ) {
+        qApp->processEvents();
         if ( !test->doesFloat() ) {
             if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal; 
                     cE = test;
                 } else {
                     if ( retVal < conflict ) {
                         conflict = retVal; 
                         cE = test;
                     }
                 }
                 found = true;
             }
         }
         test = testlist.next();
     }
     if ( found ) {
         QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ;
         qApp->processEvents();
         int km = KMessageBox::warningContinueCancel(this,mess,
                                                     i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!"));
         if ( km != KMessageBox::Continue )
             return;
 
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
     }
     mConflictingEvent = 0;