summaryrefslogtreecommitdiffstats
path: root/kmail/kmheaders.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/kmheaders.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/kmheaders.h')
-rw-r--r--kmail/kmheaders.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index f0f973d65..4055e3c3b 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -133,6 +133,15 @@ public:
/** Read color options and set palette. */
virtual void readColorConfig(void);
+ /**
+ * Same as KListView::restoreLayout(), only that this does _not_ restore the sort order.
+ * This is useful since restoreLayout() doesn't restore the sort order correctly, as
+ * KListView doesn't know about our extended sort order like date of arrival.
+ *
+ * Note that if you want to restore the sort order correctly, call readConfig().
+ */
+ void restoreColumnLayout( KConfig *config, const TQString &group );
+
/** Return the current message */
virtual KMMessage* currentMsg();
/** Return the current list view item */
@@ -197,6 +206,9 @@ public:
*/
bool isMessageCut( Q_UINT32 serNum ) const;
+ /** Write global config options. */
+ virtual void writeConfig(void);
+
signals:
/** emitted when the list view item corresponding to this message
has been selected */
@@ -294,8 +306,8 @@ protected:
*pixFullySigned, *pixPartiallySigned, *pixUndefinedSigned,
*pixFullyEncrypted, *pixPartiallyEncrypted, *pixUndefinedEncrypted,
*pixFiller, *pixEncryptionProblematic,
- *pixSignatureProblematic, *pixAttachment,
- *pixReadFwd, *pixReadReplied, *pixReadFwdReplied,*pixTodo;
+ *pixSignatureProblematic, *pixAttachment, *pixInvitation,
+ *pixReadFwd, *pixReadReplied, *pixReadFwdReplied, *pixTodo;
/** Look for color changes */
virtual bool event(TQEvent *e);
@@ -321,9 +333,6 @@ protected:
/** Write per-folder config options. */
virtual void writeFolderConfig(void);
- /** Write global config options. */
- virtual void writeConfig(void);
-
/** Handle shift and control selection */
virtual void contentsMousePressEvent(TQMouseEvent*);
virtual void contentsMouseReleaseEvent(TQMouseEvent* e);
@@ -389,6 +398,7 @@ private:
NestingPolicy nestingPolicy;
int mSortCol;
bool mSortDescending;
+ bool mIgnoreSortOrderChanges;
struct {
uint ascending : 1;