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

List:       kde-commits
Subject:    [kdepim-addons/Applications/16.08] plugins/messageviewerheaderplugins/fancyheaderstyleplugin: Fix Bu
From:       Montel Laurent <montel () kde ! org>
Date:       2016-08-28 7:19:10
Message-ID: E1bduN4-0006Ey-UF () code ! kde ! org
[Download RAW message or body]

Git commit cbfa7ded0ec2249bf1bf546d3c96c81065238324 by Montel Laurent.
Committed on 28/08/2016 at 07:18.
Pushed by mlaurent into branch 'Applications/16.08'.

Fix Bug 367858 - Fancy message headers not-so-fancy if dspam information is shown

FIXED-IN: 5.3.1
BUG: 367858

M  +6    -3    plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp


http://commits.kde.org/kdepim-addons/cbfa7ded0ec2249bf1bf546d3c96c81065238324

diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp \
                index 783afd0..63c6a80 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
@@ -221,13 +221,16 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
                          .arg(mHeaderStyleUtil.strToHtml(to)));
     }
 
+    if (!spamHTML.isEmpty())
+        headerStr.append(QStringLiteral("<tr><td colspan=\"2\"><div \
class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: \
20px;\">%3</span></div></td></tr>\n") +                         .arg(subjectDir, \
i18n("Spam Status:"), spamHTML)); +
     headerStr.append(QLatin1String("<tr><td colspan=\"2\"><div \
id=\"attachmentInjectionPoint\"></div></td></tr>")); +
+
     headerStr.append(
         QStringLiteral("</table></td><td \
align=\"center\">%1</td></tr></table>\n").arg(userHTML));  
-    if (!spamHTML.isEmpty())
-        headerStr.append(QStringLiteral("<div class=\"spamheader\" \
                dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: \
                20px;\">%3</span></div>\n")
-                         .arg(subjectDir, i18n("Spam Status:"), spamHTML));
 
     headerStr += QLatin1String("</div>\n\n");
     return headerStr;


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