From 1d0d6dfe07b973b5cec2be69b4f7f60a97a4ca5f Mon Sep 17 00:00:00 2001
From: Przemo Firszt <przemo@firszt.eu>
Date: Tue, 28 Jul 2015 21:15:25 +0100
Subject: [PATCH] FEM: Tidy up icons ResultDisplacement, ResultStress and
 Result

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
---
 src/Mod/Fem/Gui/Resources/Fem.qrc             |   2 -
 .../Fem/Gui/Resources/icons/Fem_Result.svg    |   2 +-
 .../icons/Fem_ResultDisplacement.svg          | 181 ----------------
 .../Gui/Resources/icons/Fem_ResultStress.svg  | 194 ------------------
 src/Mod/Fem/MechanicalAnalysis.py             |   4 +-
 5 files changed, 3 insertions(+), 380 deletions(-)
 delete mode 100644 src/Mod/Fem/Gui/Resources/icons/Fem_ResultDisplacement.svg
 delete mode 100644 src/Mod/Fem/Gui/Resources/icons/Fem_ResultStress.svg

diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc
index 18f3f8bdf..1ada9e434 100755
--- a/src/Mod/Fem/Gui/Resources/Fem.qrc
+++ b/src/Mod/Fem/Gui/Resources/Fem.qrc
@@ -18,8 +18,6 @@
         <file>icons/Fem_Purge_Results.svg</file>
         <file>icons/Fem_Quick_Analysis.svg</file>
         <file>icons/Fem_Result.svg</file>
-        <file>icons/Fem_ResultDisplacement.svg</file>
-        <file>icons/Fem_ResultStress.svg</file>
         <file>icons/preferences-fem.svg</file>
         <file>translations/Fem_af.qm</file>
         <file>translations/Fem_de.qm</file>
diff --git a/src/Mod/Fem/Gui/Resources/icons/Fem_Result.svg b/src/Mod/Fem/Gui/Resources/icons/Fem_Result.svg
index e6410a173..e7ed09616 100644
--- a/src/Mod/Fem/Gui/Resources/icons/Fem_Result.svg
+++ b/src/Mod/Fem/Gui/Resources/icons/Fem_Result.svg
@@ -15,7 +15,7 @@
    id="svg2860"
    sodipodi:version="0.32"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Fem_ResultDisplacement.svg"
+   sodipodi:docname="Fem_Result.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
diff --git a/src/Mod/Fem/Gui/Resources/icons/Fem_ResultDisplacement.svg b/src/Mod/Fem/Gui/Resources/icons/Fem_ResultDisplacement.svg
deleted file mode 100644
index 8d2ae9817..000000000
--- a/src/Mod/Fem/Gui/Resources/icons/Fem_ResultDisplacement.svg
+++ /dev/null
@@ -1,181 +0,0 @@
-<?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"
-   width="64px"
-   height="64px"
-   id="svg2860"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Fem_ResultStress.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2862">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="radialGradient3692"
-       cx="45.883327"
-       cy="28.869568"
-       fx="45.883327"
-       fy="28.869568"
-       r="19.467436"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         offset="0"
-         style="stop-color:#faff2b;stop-opacity:1;" />
-      <stop
-         id="stop3381"
-         offset="1"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2868" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-8"
-       id="radialGradient3703-7"
-       gradientUnits="userSpaceOnUse"
-       cx="135.38333"
-       cy="97.369568"
-       fx="135.38333"
-       fy="97.369568"
-       r="19.467436"
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
-    <linearGradient
-       id="linearGradient3377-8">
-      <stop
-         id="stop3379-0"
-         offset="0"
-         style="stop-color:#faff2b;stop-opacity:1;" />
-      <stop
-         id="stop3381-6"
-         offset="1"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="radialGradient3703-1"
-       gradientUnits="userSpaceOnUse"
-       cx="135.38333"
-       cy="97.369568"
-       fx="135.38333"
-       fy="97.369568"
-       r="19.467436"
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
-    <linearGradient
-       id="linearGradient3377-6">
-      <stop
-         style="stop-color:#00ff00;stop-opacity:1;"
-         offset="0"
-         id="stop3784" />
-      <stop
-         id="stop3786"
-         offset="0.5"
-         style="stop-color:#0003f8;stop-opacity:1;" />
-      <stop
-         id="stop3381-5"
-         offset="1"
-         style="stop-color:#ff0000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="linearGradient3788"
-       x1="-0.01679256"
-       y1="14.293757"
-       x2="64.0868"
-       y2="14.293757"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="linearGradient3814"
-       x1="163.77647"
-       y1="96.396309"
-       x2="179.47777"
-       y2="96.396309"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="linearGradient3816"
-       x1="12.594974"
-       y1="31.093735"
-       x2="53.898453"
-       y2="32.617771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.01411218,-1.3055708,0.47684233,0.03863846,2.7992781,72.628276)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.7393979"
-     inkscape:cx="24.04931"
-     inkscape:cy="35.562796"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="1042"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2865">
-    <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>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient3816);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.32764792;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 32.832072,62.324169 4.4283805,62.316628 4.7673371,2.7654535 32.561212,3.0451464 z"
-       id="rect3520-7"
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1.51256716px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 13.110404,79.471866 c 0.09167,0 0.183347,0 0,0 z"
-       id="path2394"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffad00;fill-opacity:1;stroke:#000000;stroke-width:2.15225554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 41.368413,56.44961 48.632684,9.5952235 55.77787,56.958895 z"
-       id="path3822-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/Fem_ResultStress.svg b/src/Mod/Fem/Gui/Resources/icons/Fem_ResultStress.svg
deleted file mode 100644
index 457800825..000000000
--- a/src/Mod/Fem/Gui/Resources/icons/Fem_ResultStress.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?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"
-   width="64px"
-   height="64px"
-   id="svg2860"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Fem_Result.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2862">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="radialGradient3692"
-       cx="45.883327"
-       cy="28.869568"
-       fx="45.883327"
-       fy="28.869568"
-       r="19.467436"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         offset="0"
-         style="stop-color:#faff2b;stop-opacity:1;" />
-      <stop
-         id="stop3381"
-         offset="1"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2868" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-8"
-       id="radialGradient3703-7"
-       gradientUnits="userSpaceOnUse"
-       cx="135.38333"
-       cy="97.369568"
-       fx="135.38333"
-       fy="97.369568"
-       r="19.467436"
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
-    <linearGradient
-       id="linearGradient3377-8">
-      <stop
-         id="stop3379-0"
-         offset="0"
-         style="stop-color:#faff2b;stop-opacity:1;" />
-      <stop
-         id="stop3381-6"
-         offset="1"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="radialGradient3703-1"
-       gradientUnits="userSpaceOnUse"
-       cx="135.38333"
-       cy="97.369568"
-       fx="135.38333"
-       fy="97.369568"
-       r="19.467436"
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
-    <linearGradient
-       id="linearGradient3377-6">
-      <stop
-         style="stop-color:#00ff00;stop-opacity:1;"
-         offset="0"
-         id="stop3784" />
-      <stop
-         id="stop3786"
-         offset="0.5"
-         style="stop-color:#0003f8;stop-opacity:1;" />
-      <stop
-         id="stop3381-5"
-         offset="1"
-         style="stop-color:#ff0000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="linearGradient3788"
-       x1="-0.01679256"
-       y1="14.293757"
-       x2="64.0868"
-       y2="14.293757"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="linearGradient3814"
-       x1="163.77647"
-       y1="96.396309"
-       x2="179.47777"
-       y2="96.396309"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377-6"
-       id="linearGradient3816"
-       x1="12.594974"
-       y1="31.093735"
-       x2="53.898453"
-       y2="32.617771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.01411218,-1.3055708,0.47684233,0.03863846,2.7992781,72.628276)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.7393979"
-     inkscape:cx="24.04931"
-     inkscape:cy="35.562796"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="1042"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2865">
-    <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>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient3816);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.32764792;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 32.832072,62.324169 4.4283805,62.316628 4.7673371,2.7654535 32.561212,3.0451464 z"
-       id="rect3520-7"
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1.51256716px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 13.110404,79.471866 c 0.09167,0 0.183347,0 0,0 z"
-       id="path2394"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ffff00;stroke:#241c1c"
-       id="rect3818"
-       width="18.536747"
-       height="22.656023"
-       x="38.675434"
-       y="23.036079" />
-    <path
-       style="fill:#ffad00;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 40.792285,19.202863 47.77217,8.6758225 54.637632,19.317287 z"
-       id="path3822-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#ffad00;fill-opacity:1;stroke:#000000;stroke-width:1.00258374px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 41.136849,49.268555 6.978582,10.583484 6.864181,-10.698521 z"
-       id="path3822-2-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py
index a97708096..79dc10054 100644
--- a/src/Mod/Fem/MechanicalAnalysis.py
+++ b/src/Mod/Fem/MechanicalAnalysis.py
@@ -183,9 +183,9 @@ class _CommandMechanicalShowResult:
     "the Fem JobControl command definition"
     def GetResources(self):
         return {'Pixmap': 'Fem_Result',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_ResultDisplacement", "Show result"),
+                'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_Result", "Show result"),
                 'Accel': "S, R",
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_ResultDisplacement", "Show result information of an analysis")}
+                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_Result", "Show result information of an analysis")}
 
     def Activated(self):
         self.result_object = None