From 9ba88838ba99ab104dc0149006089045327e2737 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Sat, 25 Feb 2017 21:42:55 +0100
Subject: [PATCH] Use white close icon and add more padding to message widget

---
 .../16x16/actions/message-close.png           | Bin 0 -> 457 bytes
 .../22x22/actions/message-close.png           | Bin 0 -> 457 bytes
 share/icons/svg/message-close.svg             |  65 ++++++++++++++++++
 src/gui/KMessageWidget.cpp                    |   7 +-
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 share/icons/application/16x16/actions/message-close.png
 create mode 100644 share/icons/application/22x22/actions/message-close.png
 create mode 100644 share/icons/svg/message-close.svg

diff --git a/share/icons/application/16x16/actions/message-close.png b/share/icons/application/16x16/actions/message-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b2f9ca4d7840c5c8a181bddcf779c88f1bee2b7
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000{i000{i0R)_2F8}}l8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Y*tgK~y-6wUtdy0znXkU%L^)MqC1M?IBEz9zZ>T(Rc?!;7lrb
z3nc1N-70%V!L6SQddQ@yo*9Ptl3C2WuCITptHvoJU|-UOq%%o}k~-d+N_v&_AZh5F
zo5dI*unr7>FN&1_eV|?hZ2^xZfT3Q1gBY{}Oe;WBeFAN3`%hayQ%!(c7CeXyTI4_$
zeoUy|D*LP_Y63KX;|P4=y@ml#fTn;OBk%_}^%EZf-+_0M@#aSSm4KmPtXAa#>B_Bd
zmhJ?+M@$P|1`6<|$X2pi9ZSLXvzqUeDo2Te_fWt8dKC91p_?S{R=~Ak<Xx$}tC;FC
zEs!KIwkePqu$N}KZv<B@>29`H)FOj6)tGD(^6)mx)>l;@K+C?Y%SJ!00DUIb=!0YF
zv7S&%GoTCXh8&kOK~vJXf2^PBNYcnTmss(Cf&p^D#659M00000NkvXXu0mjfp<%a#

literal 0
HcmV?d00001

diff --git a/share/icons/application/22x22/actions/message-close.png b/share/icons/application/22x22/actions/message-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b2f9ca4d7840c5c8a181bddcf779c88f1bee2b7
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000{i000{i0R)_2F8}}l8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Y*tgK~y-6wUtdy0znXkU%L^)MqC1M?IBEz9zZ>T(Rc?!;7lrb
z3nc1N-70%V!L6SQddQ@yo*9Ptl3C2WuCITptHvoJU|-UOq%%o}k~-d+N_v&_AZh5F
zo5dI*unr7>FN&1_eV|?hZ2^xZfT3Q1gBY{}Oe;WBeFAN3`%hayQ%!(c7CeXyTI4_$
zeoUy|D*LP_Y63KX;|P4=y@ml#fTn;OBk%_}^%EZf-+_0M@#aSSm4KmPtXAa#>B_Bd
zmhJ?+M@$P|1`6<|$X2pi9ZSLXvzqUeDo2Te_fWt8dKC91p_?S{R=~Ak<Xx$}tC;FC
zEs!KIwkePqu$N}KZv<B@>29`H)FOj6)tGD(^6)mx)>l;@K+C?Y%SJ!00DUIb=!0YF
zv7S&%GoTCXh8&kOK~vJXf2^PBNYcnTmss(Cf&p^D#659M00000NkvXXu0mjfp<%a#

literal 0
HcmV?d00001

diff --git a/share/icons/svg/message-close.svg b/share/icons/svg/message-close.svg
new file mode 100644
index 000000000..44b643072
--- /dev/null
+++ b/share/icons/svg/message-close.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="tab-close.svg"
+   inkscape:version="0.92.1 r">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="791"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="1301"
+     inkscape:window-y="443"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     class="ColorScheme-NegativeText"
+     d="M 8,2 A 6,6 0 0 0 2,8 6,6 0 0 0 8,14 6,6 0 0 0 14,8 6,6 0 0 0 8,2 Z M 5.70703,5 8,7.29297 10.29297,5 11,5.70703 8.70703,8 11,10.29297 10.29297,11 8,8.70703 5.70703,11 5,10.29297 7.29297,8 5,5.70703 5.70703,5 Z"
+     id="path4" />
+</svg>
diff --git a/src/gui/KMessageWidget.cpp b/src/gui/KMessageWidget.cpp
index a6bfa04bc..b88c3bc12 100644
--- a/src/gui/KMessageWidget.cpp
+++ b/src/gui/KMessageWidget.cpp
@@ -91,7 +91,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
     QAction *closeAction = new QAction(q);
     closeAction->setText(KMessageWidget::tr("&Close"));
     closeAction->setToolTip(KMessageWidget::tr("Close message"));
-    closeAction->setIcon(FilePath::instance()->icon("actions", "dialog-close"));
+    closeAction->setIcon(FilePath::instance()->icon("actions", "message-close", false));
     
     QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(animatedHide()));
     
@@ -293,11 +293,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
     }
     
     // Colors
-#ifdef Q_OS_MAC
     fg = palette().light().color();
-#else
-    fg = palette().highlightedText().color();
-#endif
     bg0 = bg1.lighter(110);
     bg2 = bg1.darker(110);
     border = darkShade(bg1);
@@ -311,6 +307,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
         "border-radius: 5px;"
         "border: 1px solid %4;"
         "margin: %5px;"
+        "padding: 5px;"
         "}"
         ".QLabel { color: %6; }"
         ))