conflict settings

5 files changed, 113 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 26323b1..898da6c 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2991,151 +2991,190 @@ void CalendarView::changeTodoDisplay(Todo *which, int action)
         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 ) {
             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 = false;
+        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 && !test->doesFloat() ) {
+                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 delected"),i18n("Show date"),i18n("No problem!"));
+                                                    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();
 
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 77f572c..571ca11 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -185,96 +185,104 @@ KOPrefs::KOPrefs() :
   addItemFont("EventView Font",&mEventViewFont,fon);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 
   KPrefs::setCurrentGroup("LoadSaveFileNames");
 
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("MonthViewWeek",&mMonthViewWeek,false);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
+  KPrefs::setCurrentGroup("Conflicts");
+  addItemBool("EnableAutoDetect",&mDetectConflicts,true);
+  addItemBool("CheckConflictsAllDayAllDay",&mCheckConflictsAllDayAllDay,false);
+  addItemBool("CheckConflictsAllDayNonAD",&mCheckConflictsAllDayNonAD,false);
+  addItemBool("CheckConflictsNonADAllDay",&mCheckConflictsNonADAllDay,false);
+  addItemBool("CheckConflictsNonADNonAD",&mCheckConflictsNonADNonAD,true);
+  addItemString("FilterConflictEditItem", &mFilterConflictEditItem ,"nofilter" );
+  addItemString("FilterConflictAllItem", &mFilterConflictAllItem ,"nofilter" );
 
   KPrefs::setCurrentGroup("Views");
   addItemBool("Block Popup Menu",&mBlockPopupMenu,false);
   addItemBool("Show Date Navigator",&mShowDateNavigator,true);
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
   addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true);
 #ifdef DESKTOP_VERION
   addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
 #endif
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
   addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
   addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
   addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
   addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,false);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 9749ba3..576edf9 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -304,62 +304,71 @@ class KOPrefs : public KPimPrefs
     bool mHighlightCurrentDay;
     bool mUseHighlightLightColor;
     bool mListViewMonthTimespan;
     bool mWNViewShowsParents;
     bool mWNViewShowsPast;
     bool mWNViewShowLocation;
     bool mTodoViewShowsPercentage;
     bool mTodoViewUsesCatColors;
     bool mMonthViewUsesBigFont;
     bool mTodoViewUsesSmallFont;
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
     bool mShortDateInViewer;
 
     bool mShowDateNavigator;
 
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
     QStringList mTodoSummaryUser;
     QStringList mJournalSummaryUser;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
     int mAlarmSuspendTime;
     int mAlarmSuspendCount;
     int mAlarmBeepInterval;
     int mOldLanguage;
     int mOldLoadedLanguage;
 
   
     QString mActiveSyncPort;
     QString mActiveSyncIP;
 
     // settings for eventviewer
     bool mEVshowDetails;
     bool mEVshowCreated;
     bool mEVshowChanged;
     bool mWTshowDetails;
     bool mWTshowCreated;
     bool mWTshowChanged;
 
     int mCurrentDisplayedView;
     QPtrList<KopiCalendarFile> mCalendars;
     int mNextAvailableCalendar;
     bool mGlobalUpdateDisabled;
 
+
+    bool mDetectConflicts;
+    bool mCheckConflictsAllDayAllDay;
+    bool mCheckConflictsAllDayNonAD;
+    bool mCheckConflictsNonADAllDay;
+    bool mCheckConflictsNonADNonAD;
+    QString mFilterConflictEditItem;
+    QString mFilterConflictAllItem;
+
   private:
     QDict<QColor> mCategoryColors;
     QArray<KopiCalendarFile*> mDefCalColors;
     QColor mDefaultCategoryColor;
 
     QFont mDefaultTimeBarFont;
     QFont mDefaultViewFont;
     QFont mDefaultMonthViewFont;
 
     QString mName;
     QString mEmail;
 };
 
 #endif
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 9e2378a..bbdf508 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -877,96 +877,131 @@ dummy =
   topLayout->addWidget(wid,ii++,0);
 
  dummy =
     addWidBool(i18n("Colors are applied to text"),
                &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
    topFrame = addPage(i18n("View Options"),0,0);
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;  
 
    dummy  =
       addWidBool(i18n("Show Sync Events"),
                  &(KOPrefs::instance()->mShowSyncEvents),topFrame);
   topLayout->addWidget(dummy->checkBox(), ii++,0);
 
   lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mEVshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Created time"),
                &(KOPrefs::instance()->mEVshowCreated),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mEVshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
   lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mWTshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Created time"),
                &(KOPrefs::instance()->mWTshowCreated),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mWTshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
+  topFrame = addPage(i18n("Conflict detection"),0,0);
+
+  topLayout = new QGridLayout(topFrame,2,1);
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
+  ii = 0;  
+   dummy  = addWidBool(i18n("Enable conflict detection"),
+                       &(KOPrefs::instance()->mDetectConflicts),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+  topFrame = new QFrame( topFrame );
+  topLayout->addWidget(topFrame ,ii++,0);
+  topLayout = new QGridLayout(topFrame,4,1);
+  connect ( dummy->checkBox(), SIGNAL( toggled( bool ) ), topFrame, SLOT ( setEnabled( bool ) ) );
+  topLayout->addWidget( new QLabel ( i18n("Conflict detection checks an <b>edited event</b> with other <b>existing events</b> for overlapping. You can define which events are checked:"), topFrame ) , ii++,0); 
+  topLayout->addWidget( new QLabel ( i18n("Filter for the edited event"), topFrame ) , ii++,0);
+  mFilterEditItem = new QComboBox(  topFrame );
+  topLayout->addWidget(mFilterEditItem,ii++,0);
+  topLayout->addWidget( new QLabel ( i18n("Filter for other existing events"), topFrame ) , ii++,0);
+  mFilterAllItem = new QComboBox( topFrame );
+  topLayout->addWidget(mFilterAllItem,ii++,0);
+  dummy = addWidBool(i18n("Check Allday with Allday"),
+                           &(KOPrefs::instance()->mCheckConflictsAllDayAllDay),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+  dummy = addWidBool(i18n("Check Allday with NonAllday"),
+                           &(KOPrefs::instance()->mCheckConflictsAllDayNonAD),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+  dummy = addWidBool(i18n("Check NonAllday with Allday"),
+                           &(KOPrefs::instance()->mCheckConflictsNonADAllDay),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+  dummy = addWidBool(i18n("Check NonAllday with NonAllday"),
+                           &(KOPrefs::instance()->mCheckConflictsNonADNonAD),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+
+
+
 
    topFrame = addPage(i18n("Alarm"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,2,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   int iii = 0;
 
  dummy =
     addWidBool(i18n("Use internal alarm notification"),
                &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
   topLayout->addWidget(dummy->checkBox(),iii++,0);
 
   if (  QApplication::desktop()->height() > 240 ) {
       
       lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
       
       topLayout->addWidget(lab ,iii++,0);
   }
 #ifndef DESKTOP_VERSION
     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
     lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
  
     QHBox* dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Play beeps count:"),dummyBox);
     mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Beeps interval in sec:"),dummyBox);
     mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Default suspend time in min:"),dummyBox);
     mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Auto suspend count:"),dummyBox);
     mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
 
@@ -1390,140 +1425,157 @@ void KOPrefsDialog::showPrinterTab()
 
 void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
                                const QStringList *tags)
 {
   if (tags) {
     int i = tags->findIndex(text);
     if (i > 0) combo->setCurrentItem(i);
   } else {
     for(int i=0;i<combo->count();++i) {
       if (combo->text(i) == text) {
         combo->setCurrentItem(i);
         break;
       }
     }
   }
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
   
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
  
   mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
   mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
   mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime);
 
   mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays);
   mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays);
   mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios);
   // mAMails->clear();
  //  for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin();
 //             it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) {
 //     QListViewItem *item = new QListViewItem(mAMails);
 //     item->setText(0,*it);
 //     mAMails->insertItem(item);
 //   }
 
   //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
   mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile);
   updateCategories();
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
   mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
   mCatDefaultColor = KOPrefs::instance()->mEventColor;
+
+
+    KConfig cfgko(locateLocal("config","korganizerrc"));
+    cfgko.setGroup("General");
+    QStringList temp = cfgko.readListEntry("CalendarFilters");
+    temp.prepend(i18n("No Filter") );
+    mFilterEditItem->insertStringList( temp );
+    mFilterAllItem->insertStringList( temp );
+    int index = temp.findIndex( KOPrefs::instance()->mFilterConflictEditItem );
+    if ( index >= 0 )
+        mFilterEditItem->setCurrentItem( index );
+    index = temp.findIndex( KOPrefs::instance()->mFilterConflictAllItem );
+    if ( index >= 0 )
+        mFilterAllItem->setCurrentItem( index );
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
     KOPrefs::instance()->setFullName(mNameEdit->text());
     KOPrefs::instance()->setEmail(mEmailEdit->text());
     
     KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value();
     KOPrefs::instance()->mStartTime = mStartTimeSpin->value();
     KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
     KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
     if ( mCatDefaultColor != KOPrefs::instance()->mEventColor ) {
         QStringList cat = KOPrefs::instance()->mCustomCategories;
         int iii = 0;
         while ( iii < cat.count() ) {
             if ( *KOPrefs::instance()->categoryColor( cat[ iii ] ) == mCatDefaultColor )
                 KOPrefs::instance()->setCategoryColor( cat[ iii ], KOPrefs::instance()->mEventColor );
             ++iii;
         }
     }
     QDictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
     
     KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
     KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value();
     KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value();
     
     KOPrefs::instance()->mAdditionalMails.clear();
     //  QListViewItem *item;
     //  item = mAMails->firstChild();
     //   while (item)
     //   {
     //     KOPrefs::instance()->mAdditionalMails.append( item->text(0) );
     //     item = item->nextSibling();
     //   }
     KOPrefs::instance()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
     KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
     KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
     KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
+
+    KOPrefs::instance()->mFilterConflictEditItem = mFilterEditItem->currentText();
+    KOPrefs::instance()->mFilterConflictAllItem = mFilterAllItem->currentText();
 }
 
 void KOPrefsDialog::updateCategories()
 {
   mCategoryCombo->clear();
   mCategoryDict.clear();
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   updateCategoryColor();
 }
 
 void KOPrefsDialog::toggleEmailSettings(bool on)
 {
   if (on) {
     mEmailEdit->setEnabled(false);
     mNameEdit->setEnabled(false);
     mEmailLabel->setEnabled(false);
     mNameLabel->setEnabled(false);
 
     KEMailSettings settings;
     mNameEdit->setText(settings.getSetting(KEMailSettings::RealName));
     mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress));
   } else {
     mEmailEdit->setEnabled(true);
     mNameEdit->setEnabled(true);
     mEmailLabel->setEnabled(true);
     mNameLabel->setEnabled(true);
   }
 }
 
 void KOPrefsDialog::addItem()
 {
  //  aEmailsEdit->setEnabled(true);
 //   QListViewItem *item = new QListViewItem(mAMails);
 //   mAMails->insertItem(item);
 //   mAMails->setSelected(item,true);
 //   aEmailsEdit->setText(i18n("(EmptyEmail)"));
 }
 
 void KOPrefsDialog::removeItem()
 {
 //   QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   mAMails->takeItem(item);
 //   item = mAMails->selectedItem();
 //   if (!item) {
 //     aEmailsEdit->setText("");
 //     aEmailsEdit->setEnabled(false);
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index baa6cf9..ee7a7aa 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -102,54 +102,56 @@ class KOPrefsDialog : public KPrefsDialog
     QComboBox *timeCombo;
     QComboBox *tzCombo;
 
     // widgets holding preferences data
     QLineEdit *mNameEdit;
     QLineEdit *mEmailEdit;
     QLabel *mNameLabel;
     QLabel *mEmailLabel;
     QLineEdit *mAdditionalEdit;
     QSpinBox  *mAutoSaveIntervalSpin;
     QSpinBox  *mPrioSpin;
     //   QListView *mAMails;
     QLineEdit *aEmailsEdit;
 
     QComboBox    *mTimeZoneCombo;
     QStringList  tzonenames;
     QSpinBox     *mStartTimeSpin;
     QSpinBox     *mDefaultDurationSpin;
     QComboBox    *mAlarmTimeCombo;
 
     QComboBox     *mCategoryCombo;
     KColorButton  *mCategoryButton;
     QDict<QColor> mCategoryDict;
 
     QSlider   *mHourSizeSlider;
 
     QSpinBox  *mNextXDaysSpin;
     QSpinBox  *mWhatsNextSpin;
 
     QLineEdit * mRemoteIPEdit;
     QLineEdit * mRemoteUser;
     QLineEdit * mRemotePassWd;
     QLineEdit * mRemoteFile;
     QLineEdit * mLocalTempFile;
     QWidget* mSetupSyncAlgTab;
     QLineEdit * mUserDateFormatLong;
     QLineEdit * mUserDateFormatShort;
 
     QSpinBox     *mTimezoneOffsetSpin;
     QSpinBox     *mDaylightsavingStart;
     QSpinBox     *mDaylightsavingEnd;
     KDateEdit* mStartDateSavingEdit;
     KDateEdit* mEndDateSavingEdit;
     QSpinBox     * mAlarmPlayBeeps;
     QSpinBox     * mAlarmSuspendTime;
     QSpinBox     * mAlarmSuspendCount;
     QSpinBox     * mAlarmBeepInterval;
 
+    QComboBox * mFilterEditItem, *mFilterAllItem;
+
     QLineEdit * mDefaultAlarmFile;
     int mSpacingHint;
     int mMarginHint;
 };
 
 #endif