oops

1 files changed, 1 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 898da6c..e3b62de 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2777,513 +2777,513 @@ void CalendarView::writeSettings()
     QDateTime dt_daylight_wrong = dt_nodaylight.addSecs( secsto );
     qDebug("dt nodaylight %s ",dt_nodaylight.toString().latin1() );
     qDebug("dt daylight %s ",dt_daylight.toString().latin1() );
     qDebug("dt daylight_wrong %s ",dt_daylight_wrong.toString().latin1() );
     qDebug("Computed secsTo %d . in minutes: %d . in hours: %d ", secsto, secsto/60, secsto/3600);
     qDebug("********************* testcode end");
 
 #endif
 
     QValueList<int> listINT = mLeftFrame->sizes();
     config->writeEntry("Left Splitter Frame",listINT);
     QValueList<int> listINT2 = mMainFrame->sizes();
     config->writeEntry("Main Splitter Frame",listINT2);
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list ;//= config->readListEntry("MainLayout");
     int x,y,w,h;
     QWidget* wid;
     wid = topLevelWidget();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("MainLayout",list );
     
     wid = mEventEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditEventLayout",list );
  
     wid = mTodoEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditTodoLayout",list ); 
     wid = getEventViewerDialog();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("ViewerLayout",list ); 
     wid = mDialogManager->getSearchDialog();
     if ( wid ) {
         x = wid->geometry().x();
         y = wid->geometry().y();
         w = wid->width();
         h = wid->height();
         list.clear();
         list << QString::number( x );
         list << QString::number( y );
         list << QString::number( w );
         list << QString::number( h );
         config->writeEntry("SearchLayout",list );
     }
 #endif
 
 
     config->sync();
 }
 
 void CalendarView::readFilterSettings(KConfig *config)
 {
     //  kdDebug() << "CalendarView::readFilterSettings()" << endl;
 
     mFilters.clear();
 
     config->setGroup("General");
     QStringList filterList = config->readListEntry("CalendarFilters");
 
     QStringList::ConstIterator it = filterList.begin();
     QStringList::ConstIterator end = filterList.end();
     while(it != end) {
         //    kdDebug() << "  filter: " << (*it) << endl;
 
         CalFilter *filter;
         filter = new CalFilter(*it);
         config->setGroup("Filter_" + (*it).utf8());
         //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) );
         filter->setCriteria(config->readNumEntry("Criteria",0));
         filter->setCategoryList(config->readListEntry("CategoryList"));
         mFilters.append(filter);
 
         ++it;
     }
 
     if (mFilters.count() == 0) {
         CalFilter *filter = new CalFilter(i18n("Default"));
         mFilters.append(filter);
     }
     mFilterView->updateFilters();
     config->setGroup("FilterView");
 
     mFilterView->blockSignals(true);
     mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled"));
     mFilterView->setSelectedFilter(config->readEntry("Current Filter"));
     mFilterView->blockSignals(false);
     // We do it manually to avoid it being done twice by the above calls
     updateFilter();
 }
 
 void CalendarView::writeFilterSettings(KConfig *config)
 {
     //  kdDebug() << "CalendarView::writeFilterSettings()" << endl;
 
     QStringList filterList;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         //    kdDebug() << " fn: " << filter->name() << endl;
         filterList << filter->name();
         config->setGroup("Filter_" + filter->name().utf8());
         config->writeEntry("Criteria",filter->criteria());
         config->writeEntry("CategoryList",filter->categoryList());
         filter = mFilters.next();
     }
     config->setGroup("General");
     config->writeEntry("CalendarFilters",filterList);
 
     config->setGroup("FilterView");
     config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
     config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 
 
 void CalendarView::goToday()
 {
     if ( mViewManager->currentView()->isMonthView() )
         mNavigator->selectTodayMonth();
     else
         mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
     mNavigator->selectNextMonth();
 }
 
 void CalendarView::goPreviousMonth()
 {
     mNavigator->selectPreviousMonth();
 }
 
 void CalendarView::updateConfig()
 {
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     emit configChanged();
     mTodoList->updateConfig();
     // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
     mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     // To make the "fill window" configurations work
     //mViewManager->raiseCurrentView();
 }
 
 
 void CalendarView::eventChanged(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTEDITED);
     //updateUnmanagedViews();
 }
 
 void CalendarView::eventAdded(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTADDED);
 }
 
 void CalendarView::eventToBeDeleted(Event *)
 {
     kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl;
 }
 
 void CalendarView::eventDeleted()
 {
     changeEventDisplay(0,KOGlobals::EVENTDELETED);
 }
 void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView(); //LR
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         mViewManager->updateWNview();
         //mTodoList->updateView();
     }
    
 }
 
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
     updateUnmanagedViews();
     //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++  %d  %d ",which, action );
     if ( action == KOGlobals::EVENTDELETED ) { //delete
         mCalendar->checkAlarmForIncidence( 0, true );
         if ( mEventViewerDialog )
             mEventViewerDialog->hide();
     } 
     else
         mCalendar->checkAlarmForIncidence( which , false );
 }
 
 // most of the changeEventDisplays() right now just call the view's
 // 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 ) {
+        if (  action != KOGlobals::EVENTDELETED && KOPrefs::instance()->mDetectConflicts ) {
             mConflictingEvent = which ;
             int time = 1000;
 #ifdef DESKTOP_VERSION
             time = 500;
 #endif
             bool checkC = false;
             if ( mConflictingEvent->doesFloat() ) {
                 checkC = KOPrefs::instance()->mCheckConflictsAllDayAllDay 
                     || KOPrefs::instance()->mCheckConflictsAllDayNonAD;
             } else {
                 checkC = KOPrefs::instance()->mCheckConflictsNonADAllDay  
                     || KOPrefs::instance()->mCheckConflictsNonADNonAD;
             }
             if ( checkC )
                 QTimer::singleShot( time, this, SLOT ( checkConflictForEvent() ) );
         }
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 void CalendarView::checkConflictForEvent()
 {
 
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
     Event * conflictingEvent = mConflictingEvent;
     mConflictingEvent = 0;
     QDateTime current = QDateTime::currentDateTime();
     if ( ! conflictingEvent->matchTime( &current, 0 ) ) {
         return;
     }
     CalFilter *filterIN = 0;
     CalFilter *filterALL = 0;
     CalFilter *filter = mFilters.first();
     while(filter) {
         if ( filter->name() == KOPrefs::instance()->mFilterConflictEditItem)
             filterIN = filter;
         if ( filter->name() == KOPrefs::instance()->mFilterConflictAllItem )
             filterALL = filter;
         filter = mFilters.next();
     }
     if ( filterIN ) {
         if ( !filterIN->filterCalendarItem( conflictingEvent ) ) {
             return;   
         }
     }
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     bool chAD = KOPrefs::instance()->mCheckConflictsAllDayAllDay;
     bool chNad = KOPrefs::instance()->mCheckConflictsAllDayNonAD;
     if ( !conflictingEvent->doesFloat() ) {
         chAD = KOPrefs::instance()->mCheckConflictsNonADAllDay;
         chNad = KOPrefs::instance()->mCheckConflictsNonADNonAD;
     }
     topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     while ( test ) {
         qApp->processEvents(); 
         bool skip = ( test->doesFloat() && !chAD ) || ( !test->doesFloat() && !chNad );
         if ( !skip ) {
             if ( filterALL ) {
                 if ( !filterALL->filterCalendarItem( test ) ) {
                     skip = true;
                 }
             } 
             if ( !skip ) {
                 if ( found )
                     skip =  !test->matchTime( &current, &conflict );
                 else 
                     skip =  !test->matchTime( &current, 0 ); 
                 if ( !skip ) {
                     if ( conflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                         if ( ! found ) {
                             conflict = retVal; 
                             cE = test;
                         } else {
                             if ( retVal < conflict ) {
                                 conflict = retVal; 
                                 cE = test;
                             }
                         }
                         found = true;
                     }
                 }
             }
         }
         test = testlist.next();
     }
     topLevelWidget()->setCaption( i18n("KO/Pi") );
     if ( found ) {
         QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( conflictingEvent->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 detected"),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( conflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
     } else
         topLevelWidget()->setCaption( i18n("No conflict found") );
     return;
    
 }
 
 void CalendarView::updateTodoViews()
 {
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 
 void CalendarView::clearAllViews()
 {
     mTodoList->clearList();
     mViewManager->clearAllViews();
     SearchDialog * sd = mDialogManager->getSearchDialog();
     if ( sd ) {
         KOListView* kol = sd->listview();
         if ( kol )
             kol->clearList();
     }
 }
 void CalendarView::updateView()
 {
     static bool clearallviews = false;
     if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
         if ( clearallviews ) {
             clearAllViews();
             clearallviews = false;
         }
         return;
     }
     clearallviews = true;
     DateList tmpList = mNavigator->selectedDates();
 
     if ( KOPrefs::instance()->mHideNonStartedTodos ) 
         mTodoList->updateView();
     // We assume that the navigator only selects consecutive days.
     updateView( tmpList.first(), tmpList.last() );
 }
 
 void CalendarView::updateUnmanagedViews()
 {
     mDateNavigator->updateDayMatrix();
 }
 
 int CalendarView::msgItemDelete(const QString name)
 {
     return KMessageBox::warningContinueCancel(this,name +"\n\n"+
                                               i18n("This item will be\npermanently deleted."),
                                               i18n("KO/Pi Confirmation"),i18n("Delete"));
 }
 
 
 void CalendarView::edit_cut()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.cutIncidence(anEvent);
     changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
 }
 
 void CalendarView::edit_copy()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.copyIncidence(anEvent);
 }
 
 void CalendarView::edit_paste()
 {
     QDate date = mNavigator->selectedDates().first();
 
     DndFactory factory( mCalendar );
     Event *pastedEvent = (Event *)factory.pasteIncidence( date );
 
     changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
 void CalendarView::edit_global_options()
 {
     QString tz = KPimGlobalPrefs::instance()->mTimeZoneId;
     emit save();
     emit saveStopTimer();
     mDialogManager->showGlobalOptionsDialog();
     if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) {
         emit saveStopTimer();
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"),
                                                  i18n("Timezone settings"),i18n("Reload"))) {
             qDebug("KO: TZ reload cancelled ");
             mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
             return;
         }
         qDebug("KO: Timezone change ");
         loadCalendars();
         setModified(true);
     }
     else
         qDebug("KO: No tz change ");
 }
 void CalendarView::edit_options()
 {
     mDialogManager->showOptionsDialog();
 }
 
 
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
     mDateFrame->hide();
     if ( mDatePickerMode == 1 ) {
         mNavigator->slotDaySelect( d );
     } else  if ( mDatePickerMode == 2 ) {
         if ( mMoveIncidence->typeID() == todoID ) {
             Todo * to = (Todo *) mMoveIncidence;
             QTime tim;
             int len  = 0;
             if ( to->hasStartDate() &&  to->hasDueDate() )
                 len = to->dtStart().secsTo( to->dtDue());
             if ( to->hasDueDate() )