author | zautrix <zautrix> | 2005-07-10 20:17:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-10 20:17:14 (UTC) |
commit | bf95dce0b9143e3c9b9aeb3cdfda24cb5325dd33 (patch) (side-by-side diff) | |
tree | 19849ae249cb104db250d6e60e60de4ffef0acbc | |
parent | f06311e58cb5887fd673eb1c2c48acf7cd987ad9 (diff) | |
download | kdepimpi-bf95dce0b9143e3c9b9aeb3cdfda24cb5325dd33.zip kdepimpi-bf95dce0b9143e3c9b9aeb3cdfda24cb5325dd33.tar.gz kdepimpi-bf95dce0b9143e3c9b9aeb3cdfda24cb5325dd33.tar.bz2 |
fix
-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 427d71b..9674921 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2755,49 +2755,53 @@ void CalendarView::changeIncidenceDisplay(Incidence *which, int action) // total update mode, but they SHOULD be recoded to be more refresh-efficient. void CalendarView::changeEventDisplay(Event *which, int action) { // kdDebug() << "CalendarView::changeEventDisplay" << endl; changeIncidenceDisplay((Incidence *)which, 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() ) ); + int time = 1000; +#ifdef DESKTOP_VERSION + time = 500; +#endif + QTimer::singleShot( time, this, SLOT ( checkConflictForEvent() ) ); } // } } else { mViewManager->currentView()->updateView(); } } void CalendarView::checkConflictForEvent() { if (!KOPrefs::instance()->mConfirm) return; if ( ! mConflictingEvent ) return; QDateTime current = QDateTime::currentDateTime(); if ( ! mConflictingEvent->matchTime( ¤t, 0 ) ) { mConflictingEvent = 0; return; } QPtrList<Event> testlist = mCalendar->events(); Event * test = testlist.first(); QDateTime conflict; QDateTime retVal; bool found = false; Event * cE = 0; topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |