summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-10 00:09:04 (UTC)
committer zautrix <zautrix>2005-07-10 00:09:04 (UTC)
commit2d1e1fe5d290503db8c0462fc294f5c04f58e95c (patch) (side-by-side diff)
treeffb1ba581d7a766cb736d42d43dad88a54dabdfd
parent2aabde6c21d6dc4f9de8cf3ac17b98053961cc6b (diff)
downloadkdepimpi-2d1e1fe5d290503db8c0462fc294f5c04f58e95c.zip
kdepimpi-2d1e1fe5d290503db8c0462fc294f5c04f58e95c.tar.gz
kdepimpi-2d1e1fe5d290503db8c0462fc294f5c04f58e95c.tar.bz2
fixxx
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/calendarview.cpp8
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
@@ -1525,13 +1525,13 @@
{ "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
@@ -674,13 +674,15 @@ void CalendarView::nextConflict( bool all, bool allday )
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;
@@ -2765,24 +2767,22 @@ void CalendarView::changeEventDisplay(Event *which, int action)
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 {