From 2f93c118c80e57158ac7e8ccf281991f959f909d Mon Sep 17 00:00:00 2001
From: UshakovVasilii <UshakovVasilii@gmail.com>
Date: Thu, 10 Jul 2014 22:30:51 +0400
Subject: [PATCH] Improve icons

---
 .../extension.js                              |  17 +-
 ...an-symbolic.svg => freon-fan-symbolic.svg} |   0
 .../icons/freon-gpu-temperature-symbolic.svg  | 146 ++++++++++++++++++
 ...lic.svg => freon-temperature-symbolic.svg} |   0
 ...ymbolic.svg => freon-voltage-symbolic.svg} |   0
 5 files changed, 159 insertions(+), 4 deletions(-)
 rename freon@UshakovVasilii_Github.yahoo.com/icons/{sensors-fan-symbolic.svg => freon-fan-symbolic.svg} (100%)
 create mode 100644 freon@UshakovVasilii_Github.yahoo.com/icons/freon-gpu-temperature-symbolic.svg
 rename freon@UshakovVasilii_Github.yahoo.com/icons/{sensors-temperature-symbolic.svg => freon-temperature-symbolic.svg} (100%)
 rename freon@UshakovVasilii_Github.yahoo.com/icons/{sensors-voltage-symbolic.svg => freon-voltage-symbolic.svg} (100%)

diff --git a/freon@UshakovVasilii_Github.yahoo.com/extension.js b/freon@UshakovVasilii_Github.yahoo.com/extension.js
index 0fc4e82..73a188f 100644
--- a/freon@UshakovVasilii_Github.yahoo.com/extension.js
+++ b/freon@UshakovVasilii_Github.yahoo.com/extension.js
@@ -40,9 +40,12 @@ const FreonMenuButton = new Lang.Class({
         this._settings = Convenience.getSettings();
 
         this._sensorIcons = {
-            temperature : Gio.icon_new_for_string(Me.path + '/icons/sensors-temperature-symbolic.svg'),
-            voltage : Gio.icon_new_for_string(Me.path + '/icons/sensors-voltage-symbolic.svg'),
-            fan : Gio.icon_new_for_string(Me.path + '/icons/sensors-fan-symbolic.svg')
+            'temperature' : Gio.icon_new_for_string(Me.path + '/icons/freon-temperature-symbolic.svg'),
+            'gpu-temperature' : Gio.icon_new_for_string(Me.path + '/icons/freon-gpu-temperature-symbolic.svg'),
+            'drive-temperature' : Gio.icon_new_for_string('drive-harddisk-symbolic'),
+            'temperature' : Gio.icon_new_for_string(Me.path + '/icons/freon-temperature-symbolic.svg'),
+            'voltage' : Gio.icon_new_for_string(Me.path + '/icons/freon-voltage-symbolic.svg'),
+            'fan' : Gio.icon_new_for_string(Me.path + '/icons/freon-fan-symbolic.svg')
         }
 
         this._menuLayout = new St.BoxLayout();
@@ -230,9 +233,15 @@ const FreonMenuButton = new Lang.Class({
 
             let sensors = [];
 
-            for each (let i in tempInfo){
+            for each (let i in gpuTempInfo){
+                sensors.push({type:'gpu-temperature', label: i.label, value:this._formatTemp(i.temp)});
+            }
+            for each (let i in sensorsTempInfo){
                 sensors.push({type:'temperature', label: i.label, value:this._formatTemp(i.temp)});
             }
+            for each (let i in driveTempInfo){
+                sensors.push({type:'drive-temperature', label: i.label, value:this._formatTemp(i.temp)});
+            }
 
             if (tempInfo.length > 0){
                 sensors.push({type : 'separator'});
diff --git a/freon@UshakovVasilii_Github.yahoo.com/icons/sensors-fan-symbolic.svg b/freon@UshakovVasilii_Github.yahoo.com/icons/freon-fan-symbolic.svg
similarity index 100%
rename from freon@UshakovVasilii_Github.yahoo.com/icons/sensors-fan-symbolic.svg
rename to freon@UshakovVasilii_Github.yahoo.com/icons/freon-fan-symbolic.svg
diff --git a/freon@UshakovVasilii_Github.yahoo.com/icons/freon-gpu-temperature-symbolic.svg b/freon@UshakovVasilii_Github.yahoo.com/icons/freon-gpu-temperature-symbolic.svg
new file mode 100644
index 0000000..e75e10a
--- /dev/null
+++ b/freon@UshakovVasilii_Github.yahoo.com/icons/freon-gpu-temperature-symbolic.svg
@@ -0,0 +1,146 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   height="16"
+   sodipodi:docname="sensors-temperature-symbolic.svg"
+   width="16">
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:object-paths="true"
+     inkscape:cy="6.8111905"
+     inkscape:current-layer="svg7384"
+     inkscape:window-width="959"
+     pagecolor="#555753"
+     showborder="false"
+     showguides="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     showgrid="true"
+     inkscape:object-nodes="true"
+     inkscape:pageshadow="2"
+     inkscape:guide-bbox="true"
+     inkscape:window-x="960"
+     inkscape:snap-bbox="true"
+     bordercolor="#666666"
+     id="namedview88"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     inkscape:window-y="27"
+     gridtolerance="10"
+     inkscape:zoom="29.86819"
+     inkscape:window-height="1014"
+     borderopacity="1"
+     guidetolerance="10"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:cx="11.158975"
+     inkscape:bbox-paths="false"
+     inkscape:snap-grids="true"
+     inkscape:pageopacity="1"
+     inkscape:snap-to-guides="true">
+    <inkscape:grid
+       visible="true"
+       spacingx="1px"
+       type="xygrid"
+       spacingy="1px"
+       id="grid4866"
+       empspacing="2"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <path
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     d="M 8.5 0 C 7.6715729 -1.4802974e-16 7 0.67157284 7 1.5 L 7 11.5 C 6.3881928 11.955718 6 12.678476 6 13.5 C 6 14.880712 7.1192882 16 8.5 16 C 9.8807118 16 11 14.880712 11 13.5 C 11 12.678476 10.611807 11.955718 10 11.5 L 10 10 L 9 10 L 9 12.09375 C 9.586412 12.29759 10 12.844162 10 13.5 C 10 14.328427 9.3284271 15 8.5 15 C 7.6715729 15 7 14.328427 7 13.5 C 7 12.844162 7.413588 12.29759 8 12.09375 L 8 1.5 C 8 1.2238576 8.2238576 1 8.5 1 C 8.7761424 1 9 1.2238576 9 1.5 L 9 3 L 10 3 L 10 1.5 C 10 0.67157284 9.3284271 -1.4802974e-16 8.5 0 z M 9 4 L 9 6 L 10 6 L 10 4 L 9 4 z M 9 7 L 9 9 L 10 9 L 10 7 L 9 7 z "
+     id="path2996" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline" />
+  <g
+     transform="translate(-261,-277)"
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline" />
+  <path
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     d="M 8.5 5.90625 C 8.4323857 5.90625 8.4010746 5.9421069 8.375 6 C 8.3656131 6.0208415 8.34375 6.0381589 8.34375 6.0625 L 8.34375 13.03125 C 8.1487143 13.099435 8 13.281698 8 13.5 C 8 13.776142 8.2238576 14 8.5 14 C 8.7761424 14 9 13.776142 9 13.5 C 9 13.281698 8.8512857 13.099435 8.65625 13.03125 L 8.65625 6.0625 C 8.65625 6.0381589 8.6343869 6.0208415 8.625 6 C 8.5989254 5.9421069 8.5676143 5.90625 8.5 5.90625 z "
+     id="rect3817" />
+  <path
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     d="M 6,11 6,4 2,4 2,14 5,14 5,13 3,13 3,5 5,5 5,11 z"
+     id="path2997"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccc" />
+  <path
+     style="fill:#bebebe;fill-opacity:1;stroke:none"
+     d="m 12,14 1,0 0,-11 1,0 0,-1 -2,0 z"
+     id="path3767"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <rect
+     style="opacity:0.6;fill:#bebebe;fill-opacity:1;stroke:none"
+     id="rect3769"
+     width="1"
+     height="7"
+     x="13"
+     y="5" />
+</svg>
diff --git a/freon@UshakovVasilii_Github.yahoo.com/icons/sensors-temperature-symbolic.svg b/freon@UshakovVasilii_Github.yahoo.com/icons/freon-temperature-symbolic.svg
similarity index 100%
rename from freon@UshakovVasilii_Github.yahoo.com/icons/sensors-temperature-symbolic.svg
rename to freon@UshakovVasilii_Github.yahoo.com/icons/freon-temperature-symbolic.svg
diff --git a/freon@UshakovVasilii_Github.yahoo.com/icons/sensors-voltage-symbolic.svg b/freon@UshakovVasilii_Github.yahoo.com/icons/freon-voltage-symbolic.svg
similarity index 100%
rename from freon@UshakovVasilii_Github.yahoo.com/icons/sensors-voltage-symbolic.svg
rename to freon@UshakovVasilii_Github.yahoo.com/icons/freon-voltage-symbolic.svg