From 4404c80afdf4392fc577c9e1e9031d88d1ad1eee Mon Sep 17 00:00:00 2001
From: Ingo Klcker <kloecker@kde.org>
Date: Tue, 8 Feb 2005 23:46:48 +0000
Subject: [PATCH] Propagate the current value of the Use Fixed Font option to
 the separate message window. CCBUG:56302

svn path=/trunk/kdepim/; revision=387579
---
 kmmainwidget.cpp    |  4 ++++
 kmreadermainwin.cpp | 14 ++++++++++----
 kmreadermainwin.h   |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index ec97fc02d..7197e855b 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -2034,6 +2034,10 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg)
 
   assert( msg != 0 );
   KMReaderMainWin *win = new KMReaderMainWin( mFolderHtmlPref, mFolderHtmlLoadExtPref );
+  KConfigGroup reader( KMKernel::config(), "Reader" );
+  bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
+                               : reader.readBoolEntry( "useFixedFont", false );
+  win->setUseFixedFont( useFixedFont );
   KMMessage *newMessage = new KMMessage(*msg);
   newMessage->setParent( msg->parent() );
   newMessage->setMsgSerNum( msg->getMsgSerNum() );
diff --git a/kmreadermainwin.cpp b/kmreadermainwin.cpp
index 2ad0fb960..19e341ebd 100644
--- a/kmreadermainwin.cpp
+++ b/kmreadermainwin.cpp
@@ -30,7 +30,7 @@
 
 #include "kmreadermainwin.h"
 
-KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, 
+KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride,
                                   char *name )
   : KMail::SecondaryWindow( name ? name : "readerwindow#" ),
     mMsg( 0 )
@@ -86,6 +86,12 @@ KMReaderMainWin::~KMReaderMainWin()
   saveMainWindowSettings( KMKernel::config(), "Separate Reader Window" );
 }
 
+//-----------------------------------------------------------------------------
+void KMReaderMainWin::setUseFixedFont( bool useFixedFont )
+{
+  mReaderWin->setUseFixedFont( useFixedFont );
+}
+
 //-----------------------------------------------------------------------------
 void KMReaderMainWin::showMsg( const QTextCodec *codec, KMMessage *msg )
 {
@@ -100,7 +106,7 @@ void KMReaderMainWin::showMsg( const QTextCodec *codec, KMMessage *msg )
 void KMReaderMainWin::slotPrintMsg()
 {
   KMCommand *command = new KMPrintCommand( this, mReaderWin->message(),
-      mReaderWin->htmlOverride(),  mReaderWin->htmlLoadExtOverride(), 
+      mReaderWin->htmlOverride(),  mReaderWin->htmlLoadExtOverride(),
       mReaderWin->overrideCodec() );
   command->start();
 }
@@ -291,7 +297,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const QPoi
   KPopupMenu * menu = new KPopupMenu;
   mUrl = aUrl;
   mMsg = &aMsg;
-  
+
   if(mReaderWin && !mReaderWin->copyText().isEmpty()) {
     mReaderWin->copyAction()->plug( menu );
     mReaderWin->selectAllAction()->plug( menu );
@@ -331,7 +337,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const QPoi
     QPopupMenu* copyMenu = new QPopupMenu(menu);
     KMMainWidget* mainwin = kmkernel->getKMMainWidget();
     if ( mainwin )
-      mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, 
+      mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
           &mMenuToFolder, copyMenu );
     menu->insertItem( i18n("&Copy To" ), copyMenu );
     menu->insertSeparator();
diff --git a/kmreadermainwin.h b/kmreadermainwin.h
index de5d1f0fb..d40516489 100644
--- a/kmreadermainwin.h
+++ b/kmreadermainwin.h
@@ -27,6 +27,9 @@ public:
     bool aHTML, const QString& aFileName, const QString& pname,
     const QTextCodec *codec, char *name = 0 );
   virtual ~KMReaderMainWin();
+
+  void setUseFixedFont( bool useFixedFont );
+
   // take ownership of and show @param msg
   void showMsg( const QTextCodec *codec, KMMessage *msg );