summaryrefslogtreecommitdiffstats
path: root/kmail/configuredialog_p.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/configuredialog_p.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/configuredialog_p.h')
-rw-r--r--kmail/configuredialog_p.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 54db5c8e7..6a1f538e6 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -58,6 +58,7 @@ class KFontRequester;
class KIconButton;
class KKeyButton;
class TQSpinBox;
+class KComboBox;
namespace Kpgp {
class Config;
@@ -485,7 +486,6 @@ private: // data
TQButtonGroup *mMIMETreeModeGroup;
TQButtonGroup *mReaderWindowModeGroup;
TQCheckBox *mFavoriteFolderViewCB;
- TQCheckBox *mFolderQuickSearchCB;
};
class AppearancePageHeadersTab : public ConfigModuleTab {
@@ -505,7 +505,6 @@ private: // methods
void setDateDisplay( int id, const TQString & format );
private: // data
- TQCheckBox *mShowQuickSearch;
TQCheckBox *mMessageSizeCheck;
TQCheckBox *mAttachmentCheck;
TQCheckBox *mNestedMessagesCheck;
@@ -533,6 +532,7 @@ private:
void readCurrentOverrideCodec();
private: // data
+ TQCheckBox *mCloseAfterReplyOrForwardCheck;
TQCheckBox *mShowColorbarCheck;
TQCheckBox *mShowSpamStatusCheck;
TQCheckBox *mShowEmoticonsCheck;
@@ -611,13 +611,18 @@ private:
TQCheckBox *mAutoAppSignFileCheck;
TQCheckBox *mTopQuoteCheck;
TQCheckBox *mSmartQuoteCheck;
+ TQCheckBox *mStripSignatureCheck;
+ TQCheckBox *mQuoteSelectionOnlyCheck;
TQCheckBox *mAutoRequestMDNCheck;
- QCheckBox *mShowRecentAddressesInComposer;
+ TQCheckBox *mShowRecentAddressesInComposer;
TQCheckBox *mWordWrapCheck;
KIntSpinBox *mWrapColumnSpin;
+ TQCheckBox *mRecipientCheck;
+ KIntSpinBox *mRecipientSpin;
KIntSpinBox *mAutoSave;
TQCheckBox *mExternalEditorCheck;
KURLRequester *mEditorRequester;
+ KComboBox *mForwardTypeCombo;
};
class ComposerPagePhrasesTab : public ConfigModuleTab {
@@ -1020,6 +1025,7 @@ private:
TQCheckBox* mLegacyMangleFromTo;
TQCheckBox* mLegacyBodyInvites;
TQCheckBox* mExchangeCompatibleInvitations;
+ TQCheckBox* mOutlookCompatibleInvitationComments;
TQCheckBox* mAutomaticSending;
};