Use white close icon and add more padding to message widget

This commit is contained in:
Janek Bevendorff 2017-02-25 21:42:55 +01:00
parent 84f2520924
commit 9ba88838ba
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53
4 changed files with 67 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 457 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 457 B

View File

@ -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>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -91,7 +91,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
QAction *closeAction = new QAction(q); QAction *closeAction = new QAction(q);
closeAction->setText(KMessageWidget::tr("&Close")); closeAction->setText(KMessageWidget::tr("&Close"));
closeAction->setToolTip(KMessageWidget::tr("Close message")); 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())); QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(animatedHide()));
@ -293,11 +293,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
} }
// Colors // Colors
#ifdef Q_OS_MAC
fg = palette().light().color(); fg = palette().light().color();
#else
fg = palette().highlightedText().color();
#endif
bg0 = bg1.lighter(110); bg0 = bg1.lighter(110);
bg2 = bg1.darker(110); bg2 = bg1.darker(110);
border = darkShade(bg1); border = darkShade(bg1);
@ -311,6 +307,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
"border-radius: 5px;" "border-radius: 5px;"
"border: 1px solid %4;" "border: 1px solid %4;"
"margin: %5px;" "margin: %5px;"
"padding: 5px;"
"}" "}"
".QLabel { color: %6; }" ".QLabel { color: %6; }"
)) ))