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

List:       kde-commits
Subject:    [kmail] src: Merge remote-tracking branch 'origin/Applications/18.08'
From:       Laurent Montel <null () kde ! org>
Date:       2018-08-08 11:37:10
Message-ID: E1fnMm6-0002F0-0P () code ! kde ! org
[Download RAW message or body]

Git commit cc51cdb42bd52590c73b43f5b19accfd79c8f52a by Laurent Montel.
Committed on 08/08/2018 at 11:37.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/Applications/18.08'

M  +6    -6    src/kmmainwidget.cpp
M  +5    -0    src/messageactions.cpp

https://commits.kde.org/kmail/cc51cdb42bd52590c73b43f5b19accfd79c8f52a

diff --cc src/messageactions.cpp
index 330663786,13a183a79..8b1d0167c
--- a/src/messageactions.cpp
+++ b/src/messageactions.cpp
@@@ -580,22 -583,16 +583,24 @@@ void MessageActions::printMessage(bool 
              const QString overrideEncoding = \
MessageCore::MessageCoreSettings::self()->overrideCharacterEncoding();  
              const Akonadi::Item message = mCurrentItem;
 +            KMPrintCommandInfo commandInfo;
 +            commandInfo.mMsg = message;
 +            commandInfo.mHeaderStylePlugin = \
mMessageView->viewer()->headerStylePlugin();  +            commandInfo.mFormat = \
mMessageView->viewer()->displayFormatMessageOverwrite();  +            \
commandInfo.mHtmlLoadExtOverride =  mMessageView->viewer()->htmlLoadExternal();  +    \
commandInfo.mPrintPreview = preview;  +            commandInfo.mUseFixedFont = \
useFixedFont;  +            commandInfo.mOverrideFont = overrideEncoding;
 +            commandInfo.mShowSignatureDetails = \
mMessageView->viewer()->showSignatureDetails() || \
MessageViewer::MessageViewerSettings::self()->alwaysShowEncryptionSignatureDetails(); \
+            commandInfo.mShowEncryptionDetails = \
mMessageView->viewer()->showEncryptionDetails() || \
MessageViewer::MessageViewerSettings::self()->alwaysShowEncryptionSignatureDetails(); \
+  +
              KMPrintCommand *command
 -                = new KMPrintCommand(mParent, message,
 -                                     mMessageView->viewer()->headerStylePlugin(),
 -                                     \
mMessageView->viewer()->displayFormatMessageOverwrite(), \
                mMessageView->viewer()->htmlLoadExternal(),
 -                                     useFixedFont, overrideEncoding);
 -            command->setPrintPreview(preview);
 +                = new KMPrintCommand(mParent, commandInfo);
              command->start();
          }
+     } else {
+         qCWarning(KMAIL_LOG) << "MessageActions::printMessage impossible to do it \
if we don't have a viewer";  }
  }
  


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