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

List:       kde-commits
Subject:    [kdepim-addons/Applications/16.08] plugins/messageviewerheaderplugins: Show emoticon in these themes
From:       Montel Laurent <montel () kde ! org>
Date:       2016-10-03 11:23:30
Message-ID: E1br1LG-0005kc-Oi () code ! kde ! org
[Download RAW message or body]

Git commit c7b8bffe5df6ca663cc1308bf336c15e0562d30e by Montel Laurent.
Committed on 03/10/2016 at 11:23.
Pushed by mlaurent into branch 'Applications/16.08'.

Show emoticon in these themes

CCBUG: 369555

M  +7    -2    plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
 M  +7    -1    plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp


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

diff --git a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp \
                index 89a2f3b..3703833 100644
--- a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.cpp
@@ -34,7 +34,7 @@
 #include "briefheaderstyle.h"
 #include "messageviewer/headerstyle.h"
 #include "messageviewer/headerstyle_util.h"
-
+#include "messageviewer/messageviewersettings.h"
 #include "messageviewer/headerstrategy.h"
 
 #include <MessageCore/StringUtil>
@@ -78,10 +78,15 @@ QString BriefHeaderStyle::format(KMime::Message *message) const
     QString headerStr = QLatin1String("<div class=\"header\" dir=\"") + dir + \
QLatin1String("\">\n");  
     if (strategy->showHeader(QStringLiteral("subject"))) {
+        KTextToHTML::Options flags = KTextToHTML::PreserveSpaces;
+        if (MessageViewer::MessageViewerSettings::self()->showEmoticons()) {
+            flags |= KTextToHTML::ReplaceSmileys;
+        }
+
         headerStr += QLatin1String("<div dir=\"") + subjectDir + \
QLatin1String("\">\n") +  QLatin1String("<b style=\"font-size:130%\">");
 
-        headerStr += mHeaderStyleUtil.subjectString(message) + \
QLatin1String("</b></div>\n"); +        headerStr += \
mHeaderStyleUtil.subjectString(message, flags) + QLatin1String("</b></div>\n");  }
     QStringList headerParts;
 
diff --git a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
 index e22f6fe..7397ff7 100644
--- a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
                
+++ b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
 @@ -19,6 +19,7 @@
 
 #include "enterpriseheaderstyle.h"
 #include "messageviewer/headerstyle_util.h"
+#include "messageviewer/messageviewersettings.h"
 
 #include "messageviewer/headerstrategy.h"
 
@@ -99,11 +100,16 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) \
const  
     // subject
     if (strategy->showHeader(QStringLiteral("subject"))) {
+        KTextToHTML::Options flags = KTextToHTML::PreserveSpaces;
+        if (MessageViewer::MessageViewerSettings::self()->showEmoticons()) {
+            flags |= KTextToHTML::ReplaceSmileys;
+        }
+
         headerStr +=
             QLatin1String("     <tr> \n"
                           "      <td style=\"font-size: 0.5em; text-align: right; \
padding-left: 5px; padding-right: 24px; ") + borderSettings + QLatin1String("\"></td> \
                \n"
                                   "      <td style=\"font-weight: bolder; font-size: \
                120%; padding-right: 91px; ") + borderSettings + \
                QLatin1String("\">");
-        headerStr += mHeaderStyleUtil.subjectString(message) + QLatin1String("</td> \
\n" +        headerStr += mHeaderStyleUtil.subjectString(message, flags) + \
QLatin1String("</td> \n"  "     </tr> \n");
     }
 


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