From bd0f0feb2e1af8a346dc724c81f31214c52128e4 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 17 Aug 2005 22:44:12 +0000
Subject: conflict settings

---
(limited to 'korganizer/koprefs.cpp')

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 77f572c..571ca11 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -230,7 +230,15 @@ KOPrefs::KOPrefs() :
   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);
--
cgit v0.9.0.2