[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2003-01-19 22:56:00
[Download RAW message or body]

CVS commit by mutz: 

KMReaderWin provides, but doesn't yet use HeaderStrategy's


  M +20 -3     kmreaderwin.cpp   1.622
  M +8 -0      kmreaderwin.h   1.156


--- kdepim/kmail/kmreaderwin.cpp  #1.621:1.622
@@ -74,4 +74,6 @@ using KMail::PartMetaData;
 #include "attachmentstrategy.h"
 using KMail::AttachmentStrategy;
+#include "headerstrategy.h"
+using KMail::HeaderStrategy;
 #include "khtmlparthtmlwriter.h"
 using KMail::HtmlWriter;
@@ -777,5 +779,5 @@ void KMReaderWin::readConfig(void)
   mUseFixedFont = config->readBoolEntry( "useFixedFont", false );
   mHtmlMail = config->readBoolEntry( "htmlMail", false );
-  mHeaderStyle = (HeaderStyle)config->readNumEntry("hdr-style", HdrFancy);
+  setHeaderStyle( (HeaderStyle)config->readNumEntry("hdr-style", HdrFancy) );
   for (int ehs = HdrFancy-1; ehs < HdrAll;ehs++) {
     mShowAllHeaders[ehs] = \
config->readBoolEntry("showAllHeaders_"+QString::number(ehs+1), ehs+1 == HdrAll); @@ \
-957,6 +959,16 @@ void KMReaderWin::initHtmlWidget(void)  void \
KMReaderWin::setHeaderStyle(KMReaderWin::HeaderStyle aHeaderStyle)  {
+  if ( aHeaderStyle == mHeaderStyle ) return;
   mHeaderStyle = aHeaderStyle;
-  update(true);
+
+  if ( aHeaderStyle == HdrBrief )
+    setHeaderStrategy( HeaderStrategy::brief() );
+  else if ( aHeaderStyle == HdrAll )
+    setHeaderStrategy( HeaderStrategy::all() );
+  else if ( aHeaderStyle == HdrLong )
+    setHeaderStrategy( HeaderStrategy::rich() );
+  else
+    setHeaderStrategy( HeaderStrategy::standard() );
+
   writeConfig(true);   // added this so we can forward w/ full headers
 }
@@ -965,5 +977,10 @@ void KMReaderWin::setHeaderStyle(KMReade
 void KMReaderWin::setAttachmentStrategy( const AttachmentStrategy * strategy ) {
   mAttachmentStrategy = strategy ? strategy : AttachmentStrategy::smart() ;
-  update(true);
+  update( true );
+}
+
+void KMReaderWin::setHeaderStrategy( const HeaderStrategy * strategy ) {
+  mHeaderStrategy = strategy ? strategy : HeaderStrategy::standard() ;
+  update( true );
 }
 

--- kdepim/kmail/kmreaderwin.h  #1.155:1.156
@@ -38,4 +38,5 @@ namespace KMail {
   class ObjectTreeParser;
   class AttachmentStrategy;
+  class HeaderStrategy;
   class HtmlWriter;
   class KHtmlPartHtmlWriter;
@@ -100,4 +101,10 @@ public:
 
   /** Get/set the message attachment strategy. */
+  const KMail::HeaderStrategy * headerStrategy() const {
+    return mHeaderStrategy;
+  }
+  void setHeaderStrategy( const KMail::HeaderStrategy * strategy );
+
+  /** Get/set the message attachment strategy. */
   const KMail::AttachmentStrategy * attachmentStrategy() const {
     return mAttachmentStrategy;
@@ -425,4 +432,5 @@ protected:
   QStringList mHeadersShow[HdrAll];
   const KMail::AttachmentStrategy * mAttachmentStrategy;
+  const KMail::HeaderStrategy * mHeaderStrategy;
   bool mAutoDelete;
   QFont mBodyFont, mFixedFont;


[prev in list] [next in list] [prev in thread] [next in thread]