SVN commit 830993 by tmcguire:
Backport r830974 by tmcguire to the 4.1 branch:
Don't ignore a change in the header style when printing.
Patch by Daniel Burrows <dburrows at debian dot org>, thanks and sorry for the
delay.
CCBUG: 153669
CCMAIL: [EMAIL PROTECTED]
M +10 -4 kmcommands.cpp
M +8 -2 kmcommands.h
M +1 -0 kmmainwidget.cpp
M +1 -0 kmreadermainwin.cpp
--- branches/KDE/4.1/kdepim/kmail/kmcommands.cpp #830992:830993
@@ -1578,10 +1578,14 @@
}
-KMPrintCommand::KMPrintCommand( QWidget *parent,
- KMMessage *msg, bool htmlOverride, bool htmlLoadExtOverride,
- bool useFixedFont, const QString & encoding )
- : KMCommand( parent, msg ), mHtmlOverride( htmlOverride ),
+KMPrintCommand::KMPrintCommand( QWidget *parent, KMMessage *msg,
+ const KMail::HeaderStyle *headerStyle,
+ const KMail::HeaderStrategy *headerStrategy,
+ bool htmlOverride, bool htmlLoadExtOverride,
+ bool useFixedFont, const QString & encoding )
+ : KMCommand( parent, msg ),
+ mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
+ mHtmlOverride( htmlOverride ),
mHtmlLoadExtOverride( htmlLoadExtOverride ),
mUseFixedFont( useFixedFont ), mEncoding( encoding )
{
@@ -1599,6 +1603,8 @@
KMReaderWin printWin( 0, 0, 0 );
printWin.setPrinting( true );
printWin.readConfig();
+ if ( mHeaderStyle != 0 && mHeaderStrategy != 0 )
+ printWin.setHeaderStyleAndStrategy( mHeaderStyle, mHeaderStrategy );
printWin.setHtmlOverride( mHtmlOverride );
printWin.setHtmlLoadExtOverride( mHtmlLoadExtOverride );
printWin.setUseFixedFont( mUseFixedFont );
--- branches/KDE/4.1/kdepim/kmail/kmcommands.h #830992:830993
@@ -35,6 +35,8 @@
class Composer;
class FolderJob;
class EditorWatcher;
+ class HeaderStyle;
+ class HeaderStrategy;
}
namespace GpgME { class Error; }
namespace Kleo { class SpecialJob; }
@@ -578,8 +580,10 @@
public:
KMPrintCommand( QWidget *parent, KMMessage *msg,
- bool htmlOverride=false,
- bool htmlLoadExtOverride=false,
+ const KMail::HeaderStyle *headerStyle = 0,
+ const KMail::HeaderStrategy *headerStrategy = 0,
+ bool htmlOverride = false,
+ bool htmlLoadExtOverride = false,
bool useFixedFont = false,
const QString & encoding = QString() );
@@ -588,6 +592,8 @@
private:
virtual Result execute();
+ const KMail::HeaderStyle *mHeaderStyle;
+ const KMail::HeaderStrategy *mHeaderStrategy;
bool mHtmlOverride;
bool mHtmlLoadExtOverride;
bool mUseFixedFont;
--- branches/KDE/4.1/kdepim/kmail/kmmainwidget.cpp #830992:830993
@@ -1935,6 +1935,7 @@
: reader.readEntry( "useFixedFont", false );
KMCommand *command =
new KMPrintCommand( this, mHeaders->currentMsg(),
+ mMsgView->headerStyle(), mMsgView->headerStrategy(),
htmlOverride, htmlLoadExtOverride,
useFixedFont, overrideEncoding() );
command->start();
--- branches/KDE/4.1/kdepim/kmail/kmreadermainwin.cpp #830992:830993
@@ -165,6 +165,7 @@
void KMReaderMainWin::slotPrintMsg()
{
KMPrintCommand *command = new KMPrintCommand( this, mReaderWin->message(),
+ mReaderWin->headerStyle(), mReaderWin->headerStrategy(),
mReaderWin->htmlOverride(), mReaderWin->htmlLoadExtOverride(),
mReaderWin->isFixedFont(), mReaderWin->overrideEncoding() );
command->setOverrideFont( mReaderWin->cssHelper()->bodyFont(
mReaderWin->isFixedFont(), true /*printing*/ ) );
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
