-rw-r--r-- | korganizer/koprefs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 9749ba3..576edf9 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -328,38 +328,47 @@ class KOPrefs : public KPimPrefs | |||
328 | int mAlarmPlayBeeps; | 328 | int mAlarmPlayBeeps; |
329 | int mAlarmSuspendTime; | 329 | int mAlarmSuspendTime; |
330 | int mAlarmSuspendCount; | 330 | int mAlarmSuspendCount; |
331 | int mAlarmBeepInterval; | 331 | int mAlarmBeepInterval; |
332 | int mOldLanguage; | 332 | int mOldLanguage; |
333 | int mOldLoadedLanguage; | 333 | int mOldLoadedLanguage; |
334 | 334 | ||
335 | 335 | ||
336 | QString mActiveSyncPort; | 336 | QString mActiveSyncPort; |
337 | QString mActiveSyncIP; | 337 | QString mActiveSyncIP; |
338 | 338 | ||
339 | // settings for eventviewer | 339 | // settings for eventviewer |
340 | bool mEVshowDetails; | 340 | bool mEVshowDetails; |
341 | bool mEVshowCreated; | 341 | bool mEVshowCreated; |
342 | bool mEVshowChanged; | 342 | bool mEVshowChanged; |
343 | bool mWTshowDetails; | 343 | bool mWTshowDetails; |
344 | bool mWTshowCreated; | 344 | bool mWTshowCreated; |
345 | bool mWTshowChanged; | 345 | bool mWTshowChanged; |
346 | 346 | ||
347 | int mCurrentDisplayedView; | 347 | int mCurrentDisplayedView; |
348 | QPtrList<KopiCalendarFile> mCalendars; | 348 | QPtrList<KopiCalendarFile> mCalendars; |
349 | int mNextAvailableCalendar; | 349 | int mNextAvailableCalendar; |
350 | bool mGlobalUpdateDisabled; | 350 | bool mGlobalUpdateDisabled; |
351 | 351 | ||
352 | |||
353 | bool mDetectConflicts; | ||
354 | bool mCheckConflictsAllDayAllDay; | ||
355 | bool mCheckConflictsAllDayNonAD; | ||
356 | bool mCheckConflictsNonADAllDay; | ||
357 | bool mCheckConflictsNonADNonAD; | ||
358 | QString mFilterConflictEditItem; | ||
359 | QString mFilterConflictAllItem; | ||
360 | |||
352 | private: | 361 | private: |
353 | QDict<QColor> mCategoryColors; | 362 | QDict<QColor> mCategoryColors; |
354 | QArray<KopiCalendarFile*> mDefCalColors; | 363 | QArray<KopiCalendarFile*> mDefCalColors; |
355 | QColor mDefaultCategoryColor; | 364 | QColor mDefaultCategoryColor; |
356 | 365 | ||
357 | QFont mDefaultTimeBarFont; | 366 | QFont mDefaultTimeBarFont; |
358 | QFont mDefaultViewFont; | 367 | QFont mDefaultViewFont; |
359 | QFont mDefaultMonthViewFont; | 368 | QFont mDefaultMonthViewFont; |
360 | 369 | ||
361 | QString mName; | 370 | QString mName; |
362 | QString mEmail; | 371 | QString mEmail; |
363 | }; | 372 | }; |
364 | 373 | ||
365 | #endif | 374 | #endif |