File kde389592.patch of Package messagelib

Overview Repositories Revisions Requests Users Attributes Meta

File kde389592.patch of Package messagelib (Revision d0f970e8cb55a67dd996f9e31cd9f5f7)

Currently displaying revision d0f970e8cb55a67dd996f9e31cd9f5f7 , Show latest

From 8f34f7d882bbe21137c86a7d5d0f05d6d160d3c1 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Wed, 14 Feb 2018 08:55:25 +0100
Subject: Fix Bug 389592 - KMail2 View "disable Emoticons" option is not
 permanent

FIXED-IN: 5.8.0
BUG: 389592
---
 messageviewer/src/settings/messageviewer.kcfg.cmake | 4 ++++
 messageviewer/src/viewer/viewer_p.cpp               | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/messageviewer/src/settings/messageviewer.kcfg.cmake b/messageviewer/src/settings/messageviewer.kcfg.cmake
index 965b03c..c18dd21 100644
--- a/messageviewer/src/settings/messageviewer.kcfg.cmake
+++ b/messageviewer/src/settings/messageviewer.kcfg.cmake
@@ -51,6 +51,10 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/sta
      <default>false</default>
    </entry>
 
+   <entry name="ShowEmoticons" type="Bool">
+     <default>true</default>
+   </entry>
+
   <entry name="AutoImportKeys" type="Bool">
       <default>false</default>
     </entry>
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index 1dc2403..7a79027 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -1111,6 +1111,10 @@ void ViewerPrivate::readConfig()
     delete mCSSHelper;
     mCSSHelper = new CSSHelper(mViewer);
 
+    mForceEmoticons = MessageViewer::MessageViewerSettings::self()->showEmoticons();
+    if (mDisableEmoticonAction) {
+        mDisableEmoticonAction->setChecked(!mForceEmoticons);
+    }
     mUseFixedFont = MessageViewer::MessageViewerSettings::self()->useFixedFont();
     if (mToggleFixFontAction) {
         mToggleFixFontAction->setChecked(mUseFixedFont);
@@ -1166,6 +1170,7 @@ void ViewerPrivate::slotGeneralFontChanged()
 
 void ViewerPrivate::writeConfig(bool sync)
 {
+    MessageViewer::MessageViewerSettings::self()->setShowEmoticons(mForceEmoticons);
     MessageViewer::MessageViewerSettings::self()->setUseFixedFont(mUseFixedFont);
     if (attachmentStrategy()) {
         MessageViewer::MessageViewerSettings::self()->setAttachmentStrategy(QLatin1String(
-- 
cgit v0.11.2

Places

File kde389592.patch of Package messagelib (Revision d0f970e8cb55a67dd996f9e31cd9f5f7)

Places