Improvements on previous commit and other commits published in #19. This removes the need for mIsPlainText caching and also avoid to reread the configuration every time a message is changed.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 4 insertions, 3 deletions

diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 0495041b6..c9f78aec6 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -5,7 +5,6 @@
 #ifndef KMREADERWIN_H
 #define KMREADERWIN_H
 
-#include <tdeactionclasses.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqstringlist.h>
@@ -246,6 +245,7 @@ public:
   // Action to reply to a message
   // but action( "some_name" ) some name could be used instead.
   TDEToggleAction *toggleFixFontAction() { return mToggleFixFontAction; }
+  TDEToggleAction *toggleMimePartTreeAction() { return mToggleMimePartTreeAction; }
   TDEAction *mailToComposeAction() { return mMailToComposeAction; }
   TDEAction *mailToReplyAction() { return mMailToReplyAction; }
   TDEAction *mailToForwardAction() { return mMailToForwardAction; }
@@ -257,7 +257,6 @@ public:
   TDEAction *urlOpenAction() { return mUrlOpenAction; }
   TDEAction *urlSaveAsAction() { return mUrlSaveAsAction; }
   TDEAction *addBookmarksAction() { return mAddBookmarksAction;}
-  TDEAction *toggleMimePartTreeAction() { return mToggleMimePartTreeAction; }
   TDEAction *startImChatAction() { return mStartIMChatAction; }
   // This function returns the complete data that were in this
   // message parts - *after* all encryption has been removed that
@@ -400,12 +399,13 @@ public slots:
   /** The user toggled the "Fixed Font" flag from the view menu. */
   void slotToggleFixedFont();
 
+  /** Show or hide the Mime Tree Viewer */
   void slotToggleMimePartTree();
 
   /** Copy the selected text to the clipboard */
   void slotCopySelectedText();
 
-   void slotUrlClicked();
+  void slotUrlClicked();
 
   /** Operations on mailto: URLs. */
   void slotMailtoReply();
@@ -586,6 +586,7 @@ private:
   TQStringList mTempFiles;
   TQStringList mTempDirs;
   int mMimeTreeMode;
+  int mMimeTreeModeOverride;
   bool mMimeTreeAtBottom;
   TQValueList<int> mSplitterSizes;
   partNode* mRootNode;