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

List:       kde-bugs-dist
Subject:    [Bug 84425] KMail ignores character encoding in preview
From:       Till Adam <adam () kde ! org>
Date:       2004-09-19 15:30:40
Message-ID: 20040919153040.5698.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
        
http://bugs.kde.org/show_bug.cgi?id=84425        




------- Additional Comments From adam kde org  2004-09-19 17:30 -------
CVS commit by tilladam: 

Use the override codec for printing from the main readerwindow and from a
standalone readerwindow if one is set.

Ingo, backport?

CCMAIL: 84425 bugs kde org


  M +3 -2      kmcommands.cpp   1.171
  M +3 -1      kmcommands.h   1.49
  M +3 -2      kmmainwidget.cpp   1.264
  M +1 -1      kmreadermainwin.cpp   1.32


--- kdepim/kmail/kmcommands.cpp  #1.170:1.171
 @ -1286,6 +1286,6  @ KMCommand::Result KMBounceCommand::execu
 
 KMPrintCommand::KMPrintCommand( QWidget *parent,
-  KMMessage *msg, bool htmlOverride )
-  : KMCommand( parent, msg ), mHtmlOverride( htmlOverride )
+  KMMessage *msg, bool htmlOverride, const QTextCodec* codec )
+  : KMCommand( parent, msg ), mHtmlOverride( htmlOverride ), mCodec( codec )
 {
 }
 @ -1297,4 +1297,5  @ KMCommand::Result KMPrintCommand::execut
   printWin.readConfig();
   printWin.setHtmlOverride( mHtmlOverride );
+  printWin.setOverrideCodec( mCodec );
   printWin.setMsg(retrievedMessage(), TRUE);
   printWin.printMsg();

--- kdepim/kmail/kmcommands.h  #1.48:1.49
 @ -512,5 +512,6  @ class KMPrintCommand : public KMCommand
 
 public:
-  KMPrintCommand( QWidget *parent, KMMessage *msg, bool htmlOverride=false );
+  KMPrintCommand( QWidget *parent, KMMessage *msg, 
+                  bool htmlOverride=false, const QTextCodec *codec = 0 );
 
 private:
 @ -518,4 +519,5  @ private:
 
   bool mHtmlOverride;
+  const QTextCodec *mCodec;
 };
 

--- kdepim/kmail/kmmainwidget.cpp  #1.263:1.264
 @ -1479,6 +1479,7  @ void KMMainWidget::slotPrintMsg()
 {
   bool htmlOverride = mMsgView ? mMsgView->htmlOverride() : false;
-  KMCommand *command = new KMPrintCommand( this, mHeaders->currentMsg(),
-      htmlOverride );
+  KMCommand *command = 
+    new KMPrintCommand( this, mHeaders->currentMsg(),
+                        htmlOverride, mCodec );
   command->start();
 }

--- kdepim/kmail/kmreadermainwin.cpp  #1.31:1.32
 @ -95,5 +95,5  @ void KMReaderMainWin::slotPrintMsg()
 {
   KMCommand *command = new KMPrintCommand( this, mReaderWin->message(),
-      mReaderWin->htmlOverride() );
+      mReaderWin->htmlOverride(), mReaderWin->overrideCodec() );
   command->start();
 }
[prev in list] [next in list] [prev in thread] [next in thread]