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

List:       kde-commits
Subject:    branches/work/soc-pim/kdepim/kmail
From:       Ronny Yabar Aizcorbe <ronnycontacto () gmail ! com>
Date:       2010-07-05 22:40:23
Message-ID: 20100705224023.699DDAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1146405 by ronnyy:

Make use of the HeaderTheme class and methods instead of HeaderStrategy and HeaderStyle ones.

 M  +4 -5      kmcommands.cpp  
 M  +3 -6      kmcommands.h  
 M  +1 -2      kmmainwidget.cpp  
 M  +5 -12     kmreaderwin.cpp  
 M  +4 -9      kmreaderwin.h  
 M  +1 -2      messageactions.cpp  


--- branches/work/soc-pim/kdepim/kmail/kmcommands.cpp #1146404:1146405
@@ -1437,12 +1437,11 @@
 
 
 KMPrintCommand::KMPrintCommand( QWidget *parent, const Akonadi::Item &msg,
-                                MessageViewer::HeaderStyle *headerStyle,
-                                const MessageViewer::HeaderStrategy *headerStrategy,
+                                MessageViewer::HeaderTheme *headerTheme,
                                 bool htmlOverride, bool htmlLoadExtOverride,
                                 bool useFixedFont, const QString & encoding )
   : KMCommand( parent, msg ),
-    mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
+    mHeaderTheme( headerTheme ), 
     mAttachmentStrategy( 0 ),
     mHtmlOverride( htmlOverride ),
     mHtmlLoadExtOverride( htmlLoadExtOverride ),
@@ -1474,8 +1473,8 @@
   KMReaderWin *printerWin = new KMReaderWin( kmkernel->mainWin(), 0, 0 );
   printerWin->setPrinting( true );
   printerWin->readConfig();
-  if ( mHeaderStyle != 0 && mHeaderStrategy != 0 )
-    printerWin->setHeaderStyleAndStrategy( mHeaderStyle, mHeaderStrategy );
+  if ( mHeaderTheme != 0  )
+    printerWin->setHeaderTheme( mHeaderTheme );
   printerWin->setHtmlOverride( mHtmlOverride );
   printerWin->setHtmlLoadExtOverride( mHtmlLoadExtOverride );
   printerWin->setUseFixedFont( mUseFixedFont );
--- branches/work/soc-pim/kdepim/kmail/kmcommands.h #1146404:1146405
@@ -7,8 +7,7 @@
 #include <kmime/kmime_message.h>
 #include "messageviewer/viewer.h"
 #include "messageviewer/editorwatcher.h"
-#include "messageviewer/headerstrategy.h"
-#include "messageviewer/headerstyle.h"
+#include "messageviewer/headertheme.h"
 using MessageViewer::EditorWatcher;
 #include <messagecore/messagestatus.h>
 #include <messagelist/core/view.h>
@@ -487,8 +486,7 @@
 
 public:
   KMPrintCommand( QWidget *parent, const Akonadi::Item &msg,
-                  MessageViewer::HeaderStyle *headerStyle = 0,
-                  const MessageViewer::HeaderStrategy *headerStrategy = 0,
+                  MessageViewer::HeaderTheme *headerTheme = 0,
                   bool htmlOverride = false,
                   bool htmlLoadExtOverride = false,
                   bool useFixedFont = false,
@@ -500,8 +498,7 @@
 private:
   virtual Result execute();
 
-  MessageViewer::HeaderStyle *mHeaderStyle;
-  const MessageViewer::HeaderStrategy *mHeaderStrategy;
+  MessageViewer::HeaderTheme *mHeaderTheme;
   const MessageViewer::AttachmentStrategy *mAttachmentStrategy;
   bool mHtmlOverride;
   bool mHtmlLoadExtOverride;
--- branches/work/soc-pim/kdepim/kmail/kmmainwidget.cpp #1146404:1146405
@@ -66,8 +66,7 @@
 #include "messageviewer/globalsettings.h"
 #include "messageviewer/viewer.h"
 #include "messageviewer/attachmentstrategy.h"
-#include "messageviewer/headerstrategy.h"
-#include "messageviewer/headerstyle.h"
+#include "messageviewer/headertheme.h"
 #include "messageviewer/kcursorsaver.h"
 
 
--- branches/work/soc-pim/kdepim/kmail/kmreaderwin.cpp #1146404:1146405
@@ -34,8 +34,7 @@
 #include "mdnadvicedialog.h"
 #include <QByteArray>
 #include <QVBoxLayout>
-#include "messageviewer/headerstrategy.h"
-#include "messageviewer/headerstyle.h"
+#include "messageviewer/headertheme.h"
 #include "messageviewer/mailwebview.h"
 #include "messageviewer/globalsettings.h"
 
@@ -231,9 +230,8 @@
   mViewer->setAttachmentStrategy( strategy );
 }
 
-void KMReaderWin::setHeaderStyleAndStrategy( HeaderStyle * style,
-                                             const HeaderStrategy * strategy ) {
-  mViewer->setHeaderStyleAndStrategy( style, strategy );
+void KMReaderWin::setHeaderTheme( HeaderTheme * theme ) {
+  mViewer->setHeaderTheme( theme );
 }
 //-----------------------------------------------------------------------------
 void KMReaderWin::setOverrideEncoding( const QString & encoding )
@@ -584,16 +582,11 @@
   return mViewer->selectAllAction();
 }
 
-const HeaderStrategy * KMReaderWin::headerStrategy() const
+HeaderTheme * KMReaderWin::headerTheme() const
 {
-  return mViewer->headerStrategy();
+  return mViewer->headerTheme();
 }
 
-HeaderStyle * KMReaderWin::headerStyle() const
-{
-  return mViewer->headerStyle();
-}
-
 KAction *KMReaderWin::copyURLAction()
 {
   return mViewer->copyURLAction();
--- branches/work/soc-pim/kdepim/kmail/kmreaderwin.h #1146404:1146405
@@ -39,8 +39,7 @@
 class KToggleAction;
 class KUrl;
 namespace MessageViewer {
-  class HeaderStrategy;
-  class HeaderStyle;
+  class HeaderTheme;
   class Viewer;
   class CSSHelper;
   class AttachmentStrategy;
@@ -70,14 +69,10 @@
   /** Read settings from app's config file. */
   void readConfig();
 
-  MessageViewer::HeaderStyle * headerStyle() const;
+  MessageViewer::HeaderTheme * headerTheme() const;
 
-  /** Set the header style and strategy. We only want them to be set
-      together. */
-  void setHeaderStyleAndStrategy( MessageViewer::HeaderStyle * style,
-                                  const MessageViewer::HeaderStrategy * strategy );
-  /** Getthe message header strategy. */
-  const MessageViewer::HeaderStrategy * headerStrategy() const;
+  /** Set the headertheme */
+  void setHeaderTheme( MessageViewer::HeaderTheme * theme );
 
   /** Get/set the message attachment strategy. */
   const MessageViewer::AttachmentStrategy * attachmentStrategy() const;
--- branches/work/soc-pim/kdepim/kmail/messageactions.cpp #1146404:1146405
@@ -488,8 +488,7 @@
   const Akonadi::Item message = mMessageView ? mMessageView->message() : mCurrentItem;
   KMPrintCommand *command =
     new KMPrintCommand( mParent, message,
-                        mMessageView ? mMessageView->headerStyle() : 0,
-                        mMessageView ? mMessageView->headerStrategy() : 0,
+                        mMessageView ? mMessageView->headerTheme() : 0,
                         htmlOverride, htmlLoadExtOverride,
                         useFixedFont, overrideEncoding );
 
[prev in list] [next in list] [prev in thread] [next in thread]