-rw-r--r-- | korganizer/koprefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 576edf9..bac8010 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -185,24 +185,25 @@ class KOPrefs : public KPimPrefs | |||
185 | bool mMonthViewWeek; | 185 | bool mMonthViewWeek; |
186 | bool mMonthViewWeekRowlayout; | 186 | bool mMonthViewWeekRowlayout; |
187 | QColor mAppColor1; | 187 | QColor mAppColor1; |
188 | QColor mAppColor2; | 188 | QColor mAppColor2; |
189 | bool mUseAppColors; | 189 | bool mUseAppColors; |
190 | 190 | ||
191 | int mDayBegins; | 191 | int mDayBegins; |
192 | int mHourSize; | 192 | int mHourSize; |
193 | int mAllDaySize; | 193 | int mAllDaySize; |
194 | bool mShowFullMenu; | 194 | bool mShowFullMenu; |
195 | bool mDailyRecur; | 195 | bool mDailyRecur; |
196 | bool mWeeklyRecur; | 196 | bool mWeeklyRecur; |
197 | bool mLongAllday; | ||
197 | bool mMonthDailyRecur; | 198 | bool mMonthDailyRecur; |
198 | bool mMonthWeeklyRecur; | 199 | bool mMonthWeeklyRecur; |
199 | bool mMonthShowIcons; | 200 | bool mMonthShowIcons; |
200 | bool mMonthShowTimes; | 201 | bool mMonthShowTimes; |
201 | bool mMonthShowShort; | 202 | bool mMonthShowShort; |
202 | bool mEnableToolTips; | 203 | bool mEnableToolTips; |
203 | bool mEnableMonthScroll; | 204 | bool mEnableMonthScroll; |
204 | bool mFullViewMonth; | 205 | bool mFullViewMonth; |
205 | bool mMonthViewUsesCategoryColor; | 206 | bool mMonthViewUsesCategoryColor; |
206 | bool mFullViewTodo; | 207 | bool mFullViewTodo; |
207 | bool mShowCompletedTodo; | 208 | bool mShowCompletedTodo; |
208 | bool mMarcusBainsEnabled; | 209 | bool mMarcusBainsEnabled; |
@@ -342,24 +343,25 @@ class KOPrefs : public KPimPrefs | |||
342 | bool mEVshowChanged; | 343 | bool mEVshowChanged; |
343 | bool mWTshowDetails; | 344 | bool mWTshowDetails; |
344 | bool mWTshowCreated; | 345 | bool mWTshowCreated; |
345 | bool mWTshowChanged; | 346 | bool mWTshowChanged; |
346 | 347 | ||
347 | int mCurrentDisplayedView; | 348 | int mCurrentDisplayedView; |
348 | QPtrList<KopiCalendarFile> mCalendars; | 349 | QPtrList<KopiCalendarFile> mCalendars; |
349 | int mNextAvailableCalendar; | 350 | int mNextAvailableCalendar; |
350 | bool mGlobalUpdateDisabled; | 351 | bool mGlobalUpdateDisabled; |
351 | 352 | ||
352 | 353 | ||
353 | bool mDetectConflicts; | 354 | bool mDetectConflicts; |
355 | bool mIncludeFree; | ||
354 | bool mCheckConflictsAllDayAllDay; | 356 | bool mCheckConflictsAllDayAllDay; |
355 | bool mCheckConflictsAllDayNonAD; | 357 | bool mCheckConflictsAllDayNonAD; |
356 | bool mCheckConflictsNonADAllDay; | 358 | bool mCheckConflictsNonADAllDay; |
357 | bool mCheckConflictsNonADNonAD; | 359 | bool mCheckConflictsNonADNonAD; |
358 | QString mFilterConflictEditItem; | 360 | QString mFilterConflictEditItem; |
359 | QString mFilterConflictAllItem; | 361 | QString mFilterConflictAllItem; |
360 | 362 | ||
361 | private: | 363 | private: |
362 | QDict<QColor> mCategoryColors; | 364 | QDict<QColor> mCategoryColors; |
363 | QArray<KopiCalendarFile*> mDefCalColors; | 365 | QArray<KopiCalendarFile*> mDefCalColors; |
364 | QColor mDefaultCategoryColor; | 366 | QColor mDefaultCategoryColor; |
365 | 367 | ||