| author | zautrix <zautrix> | 2005-08-17 22:44:12 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-08-17 22:44:12 (UTC) |
| commit | bd0f0feb2e1af8a346dc724c81f31214c52128e4 (patch) (side-by-side diff) | |
| tree | 7234e97f485901026e37a2deab734e9d431002f2 /korganizer/koprefsdialog.h | |
| parent | 671857b232224314ad7720ad4bc037758a90fa4b (diff) | |
| download | kdepimpi-bd0f0feb2e1af8a346dc724c81f31214c52128e4.zip kdepimpi-bd0f0feb2e1af8a346dc724c81f31214c52128e4.tar.gz kdepimpi-bd0f0feb2e1af8a346dc724c81f31214c52128e4.tar.bz2 | |
conflict settings
| -rw-r--r-- | korganizer/koprefsdialog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index baa6cf9..ee7a7aa 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h @@ -134,22 +134,24 @@ class KOPrefsDialog : public KPrefsDialog 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 |