author | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
commit | 2cde25d8061acd536bccd698722952ce8555f5db (patch) (side-by-side diff) | |
tree | 70f905e5de57b44c3503883b2f98925d9c92ef8b /korganizer/koprefs.h | |
parent | 645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff) | |
download | kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2 |
conflict res fix
-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 @@ -189,16 +189,17 @@ class KOPrefs : public KPimPrefs bool mUseAppColors; int mDayBegins; int mHourSize; int mAllDaySize; bool mShowFullMenu; bool mDailyRecur; bool mWeeklyRecur; + bool mLongAllday; bool mMonthDailyRecur; bool mMonthWeeklyRecur; bool mMonthShowIcons; bool mMonthShowTimes; bool mMonthShowShort; bool mEnableToolTips; bool mEnableMonthScroll; bool mFullViewMonth; @@ -346,16 +347,17 @@ class KOPrefs : public KPimPrefs int mCurrentDisplayedView; QPtrList<KopiCalendarFile> mCalendars; int mNextAvailableCalendar; bool mGlobalUpdateDisabled; bool mDetectConflicts; + bool mIncludeFree; bool mCheckConflictsAllDayAllDay; bool mCheckConflictsAllDayNonAD; bool mCheckConflictsNonADAllDay; bool mCheckConflictsNonADNonAD; QString mFilterConflictEditItem; QString mFilterConflictAllItem; private: |