From a060d79c123e98baad8f1ea48600bd7449c9c66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 4 Dec 2014 01:05:49 +0100
Subject: GH-631, GH-658 Implement yellow status icon, refresh status icons in
 themes.

---
 resources/OSX/OSX.qrc                    |   1 +
 resources/OSX/scalable/news.svg          |  16 ++--
 resources/OSX/scalable/status-bad.svg    | 112 +++-----------------------
 resources/OSX/scalable/status-good.svg   | 131 +++++--------------------------
 resources/OSX/scalable/status-yellow.svg |  16 ++++
 5 files changed, 54 insertions(+), 222 deletions(-)
 create mode 100644 resources/OSX/scalable/status-yellow.svg

(limited to 'resources/OSX')

diff --git a/resources/OSX/OSX.qrc b/resources/OSX/OSX.qrc
index 24e1a0bf..20c71eb8 100644
--- a/resources/OSX/OSX.qrc
+++ b/resources/OSX/OSX.qrc
@@ -29,6 +29,7 @@
 		<file>scalable/settings.svg</file>
 		<file>scalable/status-bad.svg</file>
 		<file>scalable/status-good.svg</file>
+		<file>scalable/status-yellow.svg</file>
 		<file>scalable/viewfolder.svg</file>
 	</qresource>
 </RCC>
diff --git a/resources/OSX/scalable/news.svg b/resources/OSX/scalable/news.svg
index bd9a3f0b..b8ce3cd1 100644
--- a/resources/OSX/scalable/news.svg
+++ b/resources/OSX/scalable/news.svg
@@ -2,13 +2,15 @@
 <!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M13,13H7l-2,3l-2-3l0,0c-1.7,0-3-1.3-3-3V3c0-1.7,1.3-3,3-3h10
-	c1.7,0,3,1.3,3,3v7C16,11.7,14.7,13,13,13z"/>
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" d="M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v14c0,1.1,0.9,2,2,2h1.3
+	l2.7,4l2.7-4H26c1.1,0,2-0.9,2-2V6z"/>
 <g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#585858" d="M13,0H3C1.3,0,0,1.3,0,3v7c0,1.7,1.3,3,3,3l2,3l2-3h6
-			c1.7,0,3-1.3,3-3V3C16,1.3,14.7,0,13,0z M8,10H3V9h5V10z M13,8H3V7h10V8z M13,6H3V5h10V6z M13,4H3V3h10V4z"/>
-	</g>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#585858" d="M26,26H14l-4,6l-4-6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h20
+		c3.3,0,6,2.7,6,6v14C32,23.3,29.3,26,26,26z M28,6c0-1.1-0.9-2-2-2H6C4.9,4,4,4.9,4,6v14c0,1.1,0.9,2,2,2h1.3l2.7,4l2.7-4H26
+		c1.1,0,2-0.9,2-2V6z"/>
+	<rect x="8" y="12" fill-rule="evenodd" clip-rule="evenodd" fill="#585858" width="16" height="2"/>
+	<rect x="8" y="8" fill-rule="evenodd" clip-rule="evenodd" fill="#585858" width="16" height="2"/>
+	<rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#585858" width="8" height="2"/>
 </g>
 </svg>
diff --git a/resources/OSX/scalable/status-bad.svg b/resources/OSX/scalable/status-bad.svg
index 3449fea3..add7a6f7 100644
--- a/resources/OSX/scalable/status-bad.svg
+++ b/resources/OSX/scalable/status-bad.svg
@@ -1,103 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-bad.svg">
-  <metadata
-     id="metadata8">
-    <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>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#c10000;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#840000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#750000;stop-opacity:1" />
-      <stop
-         style="stop-color:#810000;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="19.535963"
-     inkscape:cy="27.534384"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12 0 C 5.352 0 0 5.352 0 12 L 0 52 C 0 58.648 5.352 64 12 64 L 52 64 C 58.648 64 64 58.648 64 52 L 64 12 C 64 5.352 58.648 0 52 0 L 12 0 z M 12 8 L 52 8 C 54.216 8 56 9.784 56 12 L 56 52 C 56 54.216 54.216 56 52 56 L 12 56 C 9.784 56 8 54.216 8 52 L 8 12 C 8 9.784 9.784 8 12 8 z M 23.09375 19 C 22.044339 19 20.988173 19.386827 20.1875 20.1875 C 18.586153 21.788847 18.586153 24.398653 20.1875 26 L 26.65625 32 L 20.1875 38 C 18.586153 39.601347 18.586153 42.211153 20.1875 43.8125 C 20.988173 44.613173 22.044339 45 23.09375 45 C 24.143161 45 25.199327 44.613173 26 43.8125 L 32 37.5 L 38 43.8125 C 38.800673 44.613173 39.856839 45 40.90625 45 C 41.955661 45 43.011827 44.613173 43.8125 43.8125 C 45.413847 42.211153 45.413847 39.601347 43.8125 38 L 37.34375 32 L 43.8125 26 C 45.413847 24.398653 45.413847 21.788847 43.8125 20.1875 C 43.011827 19.386827 41.955661 19 40.90625 19 C 39.856839 19 38.800673 19.386827 38 20.1875 L 32 26.5 L 26 20.1875 C 25.199327 19.386827 24.143161 19 23.09375 19 z "
-     id="rect2989" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#F2F2F2" d="M28,6c0-1.2-0.8-2-2-2H6C4.8,4,4,4.8,4,6v20c0,1.2,0.8,2,2,2h20c1.2,0,2-0.8,2-2V6z"/>
+<path fill="#585858" d="M26,32H6c-3.4,0-6-2.6-6-6V6c0-3.4,2.6-6,6-6h20c3.4,0,6,2.6,6,6v20C32,29.4,29.4,32,26,32z M28,6
+	c0-1.2-0.8-2-2-2H6C4.8,4,4,4.8,4,6v20c0,1.2,0.8,2,2,2h20c1.2,0,2-0.8,2-2V6z M21.6,21.6c-0.8,0.8-2,0.8-2.8,0L16,18.8l-2.8,2.8
+	c-0.8,0.8-2,0.8-2.8,0c-0.8-0.8-0.8-2,0-2.8l2.8-2.8l-2.8-2.8c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l2.8,2.8l2.8-2.8
+	c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L18.8,16l2.8,2.8C22.4,19.6,22.4,20.8,21.6,21.6z"/>
 </svg>
diff --git a/resources/OSX/scalable/status-good.svg b/resources/OSX/scalable/status-good.svg
index a5bf5c0b..f10da757 100644
--- a/resources/OSX/scalable/status-good.svg
+++ b/resources/OSX/scalable/status-good.svg
@@ -1,114 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="64"
-   height="64"
-   sodipodi:docname="status-good.png">
-  <metadata
-     id="metadata8">
-    <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>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3008">
-      <stop
-         style="stop-color:#00c016;stop-opacity:1"
-         offset="0"
-         id="stop3010" />
-      <stop
-         id="stop3022"
-         offset="0.21875"
-         style="stop-color:#00820f;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="0.37499997"
-         style="stop-color:#00730d;stop-opacity:1" />
-      <stop
-         style="stop-color:#007e0e;stop-opacity:1"
-         offset="0.734375"
-         id="stop3024" />
-      <stop
-         style="stop-color:#009511;stop-opacity:1"
-         offset="1"
-         id="stop3012" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3020"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,-9.9999994e-8)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3008"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-8,0)"
-       x1="20"
-       y1="0"
-       x2="20"
-       y2="64" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1613"
-     inkscape:window-height="1026"
-     id="namedview4"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="50.974601"
-     inkscape:cy="27.721167"
-     inkscape:window-x="1677"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987" />
-  </sodipodi:namedview>
-  <path
-     style="color:#000000;fill:url(#linearGradient3036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="M 12,0 C 5.352,0 0,5.352 0,12 l 0,40 c 0,6.648 5.352,12 12,12 l 40,0 c 6.648,0 12,-5.352 12,-12 L 64,12 C 64,5.352 58.648,0 52,0 L 12,0 z m 0,8 40,0 c 2.216,0 4,1.784 4,4 l 0,40 c 0,2.216 -1.784,4 -4,4 L 12,56 C 9.784,56 8,54.216 8,52 L 8,12 C 8,9.784 9.784,8 12,8 z m 32.5,11 c -1.15165,0 -2.30882,0.43382 -3.1875,1.3125 l -13.75,13.8125 -4.875,-4.8125 c -1.757359,-1.757359 -4.617641,-1.757359 -6.375,0 -1.757359,1.757359 -1.757359,4.617641 0,6.375 l 8,7.5 c 1.75736,1.757359 4.61764,1.757359 6.375,0 l 17,-16.5 c 1.75736,-1.757359 1.75736,-4.617641 0,-6.375 C 46.80882,19.43382 45.65165,19 44.5,19 z"
-     id="rect2989"
-     inkscape:connector-curvature="0" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#F2F2F2" d="M28,26c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z"/>
+<g>
+	<path fill="none" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26c0,1.2-0.8,2-2,2
+		H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l4.2,4.2
+		c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+</g>
+<g>
+	<g>
+		<path fill="#585858" d="M26,0H6C2.6,0,0,2.6,0,6v20c0,3.4,2.6,6,6,6h20c3.4,0,6-2.6,6-6V6C32,2.6,29.4,0,26,0z M28,26
+			c0,1.2-0.8,2-2,2H6c-1.2,0-2-0.8-2-2V6c0-1.2,0.8-2,2-2h20c1.2,0,2,0.8,2,2V26z M21,10.4l-7,7l-2.8-2.8c-0.8-0.8-2-0.8-2.8,0
+			s-0.8,2,0,2.8l4.2,4.2c0.8,0.8,2,0.8,2.8,0l8.4-8.4c0.8-0.8,0.8-2,0-2.8S21.8,9.6,21,10.4z"/>
+	</g>
+</g>
 </svg>
diff --git a/resources/OSX/scalable/status-yellow.svg b/resources/OSX/scalable/status-yellow.svg
new file mode 100644
index 00000000..fba697bc
--- /dev/null
+++ b/resources/OSX/scalable/status-yellow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#E3A333" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z M28,26
+		c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+</g>
+<path fill="#585858" d="M26,0H6C2.7,0,0,2.7,0,6v20c0,3.3,2.7,6,6,6h20c3.3,0,6-2.7,6-6V6C32,2.7,29.3,0,26,0z"/>
+<path fill="#F2F2F2" d="M28,26c0,1.1-0.9,2-2,2H6c-1.1,0-2-0.9-2-2V6c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z"/>
+<g>
+	<path fill="#585858" d="M6,20c0-5.8,2.4-7.9,5.8-7.9c2,0,3.4,0.7,5.3,1.9c1.6,1,2.5,1.5,3.3,1.5c0.7,0,1.2-0.7,1.3-3.1H26
+		c0.2,6.1-2.3,8-5.5,8c-2,0-3.5-0.8-5.3-1.9c-1.7-1-2.6-1.6-3.3-1.6c-0.8,0-1.4,0.5-1.6,3.2H6z"/>
+</g>
+</svg>
-- 
cgit v1.2.3