[gnome-calculator] Revert "This reverts commit 1afbe22e2c9cd6a49d6c7913c7849cb27b88b6d5."

From: Robert Roth <robertroth src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-calculator] Revert "This reverts commit 1afbe22e2c9cd6a49d6c7913c7849cb27b88b6d5."
Date: Wed, 12 Sep 2018 11:56:18 +0000 (UTC)
commit 5ea0417003b2ab60f928afd51af33fbba3281ad4
Author: Robert Roth <robert roth off gmail com>
Date:   Thu Sep 6 00:57:31 2018 +0300

    Revert "This reverts commit 1afbe22e2c9cd6a49d6c7913c7849cb27b88b6d5."
    
    This reverts commit a407ae589044225278f84e8413d6935d977ca520.

 data/icons/gnome-calculator-src.svg                | 4187 --------------------
 data/icons/hicolor/16x16/apps/gnome-calculator.png |  Bin 424 -> 0 bytes
 data/icons/hicolor/22x22/apps/gnome-calculator.png |  Bin 595 -> 0 bytes
 data/icons/hicolor/24x24/apps/gnome-calculator.png |  Bin 620 -> 0 bytes
 .../hicolor/256x256/apps/gnome-calculator.png      |  Bin 32607 -> 0 bytes
 data/icons/hicolor/32x32/apps/gnome-calculator.png |  Bin 1640 -> 0 bytes
 data/icons/hicolor/48x48/apps/gnome-calculator.png |  Bin 1391 -> 0 bytes
 .../hicolor/512x512/apps/gnome-calculator.png      |  Bin 75277 -> 0 bytes
 .../hicolor/scalable/apps/org.gnome.Calculator.svg |  175 +
 .../apps/org.gnome.Calculator.svg}                 |    0
 data/meson.build                                   |    1 -
 data/org.gnome.Calculator.desktop.in               |    2 +-
 12 files changed, 176 insertions(+), 4189 deletions(-)
---
diff --git a/data/icons/hicolor/scalable/apps/org.gnome.Calculator.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.Calculator.svg
new file mode 100644
index 00000000..9ecea6a9
--- /dev/null
+++ b/data/icons/hicolor/scalable/apps/org.gnome.Calculator.svg
@@ -0,0 +1,175 @@
+<?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";
+   viewBox="0 0 128 128"
+   style="display:inline;enable-background:new"
+   version="1.0"
+   id="svg11300"
+   height="128"
+   width="128">
+  <title
+     id="title4162">Adwaita Icon Template</title>
+  <defs
+     id="defs3" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>GNOME Design Team</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; />
+        <dc:title>Adwaita Icon Template</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";>
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution"; />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice"; />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution"; />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike"; />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-172)"
+     style="display:inline"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="layer9">
+      <g
+         transform="rotate(-30,413.5026,270.49096)"
+         id="g1710"
+         style="display:inline;enable-background:new" />
+      <text
+         id="text1204"
+         y="390.00003"
+         x="107.99998"
+         
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;enable-background:new"
+         xml:space="preserve"><tspan
+           y="397.90536"
+           x="107.99998"
+           id="tspan1202" /></text>
+      <path
+         id="path1518"
+         d="M 60.003409,238 H 116 v 39.875 C 116,283.48425 113.41019,288 107.3339,288 H 59.996589 Z"
+         
style="opacity:1;fill:#c64600;fill-opacity:1;stroke:none;stroke-width:1.41549647;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
 />
+      <path
+         
style="display:inline;opacity:1;fill:#ff7800;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+         d="m 108.04004,184 c 4.432,0 8,3.568 8,8 v 84 c 0,4.432 -3.568,8 -8,8 H 60.040039 V 184 Z"
+         id="path1520" />
+      <rect
+         transform="matrix(0,1,1,0,0,0)"
+         y="80"
+         x="254"
+         height="20"
+         width="4"
+         id="rect1536"
+         
style="display:inline;opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
 />
+      <rect
+         transform="matrix(0,1,1,0,0,0)"
+         y="80"
+         x="262"
+         height="20"
+         width="4"
+         id="rect1538"
+         
style="display:inline;opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
 />
+      <rect
+         transform="matrix(0,1,1,0,0,0)"
+         y="80"
+         x="252"
+         height="20"
+         width="4"
+         id="rect1540"
+         
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
 />
+      <rect
+         transform="matrix(0,1,1,0,0,0)"
+         y="80"
+         x="260"
+         height="20"
+         width="4"
+         id="rect1542"
+         
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
 />
+      <path
+         
style="display:inline;opacity:1;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+         d="m 20.040039,188 c -4.432,0 -8,3.568 -8,8 v 84 c 0,4.432 3.568,8 8,8 h 44 V 188 Z"
+         id="path1522" />
+      <path
+         id="path1524"
+         d="m 20.040039,184 c -4.432,0 -8,3.568 -8,8 v 84 c 0,4.432 3.568,8 8,8 h 44 V 184 Z"
+         
style="display:inline;opacity:1;fill:#77767b;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
 />
+      <path
+         id="path1063"
+         d="m 36.000979,250 v 8 h -8 v 4 h 8 v 8 h 4 v -8 h 8 v -4 h -8 v -8 z"
+         
style="display:inline;opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
 />
+      <path
+         
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+         d="m 36.000979,248 v 8 h -8 v 4 h 8 v 8 h 4 v -8 h 8 v -4 h -8 v -8 z"
+         id="path1530" />
+      <rect
+         
style="display:inline;opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+         id="rect1532"
+         width="4"
+         height="20"
+         x="210"
+         y="28"
+         transform="matrix(0,1,1,0,0,0)" />
+      <rect
+         
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+         id="rect1534"
+         width="4"
+         height="20"
+         x="208"
+         y="28"
+         transform="matrix(0,1,1,0,0,0)" />
+      <path
+         id="path1086"
+         d="M 12,235 H 63.96337"
+         
style="fill:none;fill-rule:evenodd;stroke:#5e5c64;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/apps/gnome-calculator-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/org.gnome.Calculator.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/gnome-calculator-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/org.gnome.Calculator.svg
diff --git a/data/meson.build b/data/meson.build
index 55e8e426..0f85acd3 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,6 @@
 # Icons
 install_subdir('icons',
   install_dir: join_paths(get_option('datadir')),
-  exclude_files: [ 'gnome-calculator-src.svg' ],
 )
 
 # Desktop file
diff --git a/data/org.gnome.Calculator.desktop.in b/data/org.gnome.Calculator.desktop.in
index 42fe0e3e..442031d4 100644
--- a/data/org.gnome.Calculator.desktop.in
+++ b/data/org.gnome.Calculator.desktop.in
@@ -5,7 +5,7 @@ Comment=Perform arithmetic, scientific or financial calculations
 Keywords=calculation;arithmetic;scientific;financial;
 Exec=gnome-calculator
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-calculator
+Icon=org.gnome.Calculator
 Terminal=false
 Type=Application
 StartupNotify=true
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]