From b5c36b8c2b7df579b19f559c9abb0977e7beecc8 Mon Sep 17 00:00:00 2001
From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Tue, 19 Apr 2016 11:20:26 +0200
Subject: [PATCH] Update regarding the new icons management mechanism.

---
 src/PartSet/PartSet_icons.qrc                     |   3 ---
 src/PrimitivesPlugin/CMakeLists.txt               |   1 +
 src/PrimitivesPlugin/box_widget.xml               |   8 ++++----
 src/{PartSet => PrimitivesPlugin}/icons/box.png   | Bin
 .../icons/box_2pt_32x32.png                       | Bin
 .../icons/box_dxyz_32x32.png                      | Bin
 src/PrimitivesPlugin/icons/point.png              | Bin 0 -> 486 bytes
 src/PrimitivesPlugin/plugin-Primitives.xml        |   2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)
 rename src/{PartSet => PrimitivesPlugin}/icons/box.png (100%)
 rename src/{PartSet => PrimitivesPlugin}/icons/box_2pt_32x32.png (100%)
 rename src/{PartSet => PrimitivesPlugin}/icons/box_dxyz_32x32.png (100%)
 create mode 100755 src/PrimitivesPlugin/icons/point.png

diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index 0dc7ccf6f..270a9428f 100644
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -2,9 +2,6 @@
  <qresource>
      <file>icons/activate.png</file>
      <file>icons/angle_32x32.png</file>
-     <file>icons/box.png</file>
-     <file>icons/box_2pt_32x32.png</file>
-     <file>icons/box_dxyz_32x32.png</file>
      <file>icons/color.png</file>
      <file>icons/deactivate.png</file>
      <file>icons/edit.png</file>
diff --git a/src/PrimitivesPlugin/CMakeLists.txt b/src/PrimitivesPlugin/CMakeLists.txt
index 2203b6201..0518f2e0a 100644
--- a/src/PrimitivesPlugin/CMakeLists.txt
+++ b/src/PrimitivesPlugin/CMakeLists.txt
@@ -34,6 +34,7 @@ TARGET_LINK_LIBRARIES(PrimitivesPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS PrimitivesPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Primitives)
 
 ADD_UNIT_TESTS(UnitTestBox.py
                UseTestBox.py)
\ No newline at end of file
diff --git a/src/PrimitivesPlugin/box_widget.xml b/src/PrimitivesPlugin/box_widget.xml
index 9034c482a..987bb52e5 100644
--- a/src/PrimitivesPlugin/box_widget.xml
+++ b/src/PrimitivesPlugin/box_widget.xml
@@ -2,7 +2,7 @@
 
 <source>
   <toolbox id="CreationMethod">
-    <box id="BoxByDimensions" title="By dimensions" icon=":icons/box_dxyz_32x32.png">
+    <box id="BoxByDimensions" title="By dimensions" icon="icons/Primitives/box_dxyz_32x32.png">
       <doublevalue
         id="dx"
         label="DX"
@@ -31,17 +31,17 @@
         tooltip="Dimension in Z">
       </doublevalue>
     </box>
-    <box id="BoxByTwoPoints" title="By two points" icon=":icons/box_2pt_32x32.png">
+    <box id="BoxByTwoPoints" title="By two points" icon="icons/Primitives/box_2pt_32x32.png">
       <shape_selector id="FirstPoint"
         label="First point"
-        icon=":icons/point.png"
+        icon="icons/Primitives/point.png"
         tooltip="Select a first point"
         shape_types="vertex">
         <validator id="GeomValidators_ShapeType" parameters="vertex"/>
       </shape_selector>
       <shape_selector id="SecondPoint"
         label="Second point"
-        icon=":icons/point.png"
+        icon="icons/Primitives/point.png"
         tooltip="Select a second point"
         shape_types="vertex">
         <validator id="GeomValidators_ShapeType" parameters="vertex"/>
diff --git a/src/PartSet/icons/box.png b/src/PrimitivesPlugin/icons/box.png
similarity index 100%
rename from src/PartSet/icons/box.png
rename to src/PrimitivesPlugin/icons/box.png
diff --git a/src/PartSet/icons/box_2pt_32x32.png b/src/PrimitivesPlugin/icons/box_2pt_32x32.png
similarity index 100%
rename from src/PartSet/icons/box_2pt_32x32.png
rename to src/PrimitivesPlugin/icons/box_2pt_32x32.png
diff --git a/src/PartSet/icons/box_dxyz_32x32.png b/src/PrimitivesPlugin/icons/box_dxyz_32x32.png
similarity index 100%
rename from src/PartSet/icons/box_dxyz_32x32.png
rename to src/PrimitivesPlugin/icons/box_dxyz_32x32.png
diff --git a/src/PrimitivesPlugin/icons/point.png b/src/PrimitivesPlugin/icons/point.png
new file mode 100755
index 0000000000000000000000000000000000000000..96149ebf38492cc735949b52e2f0233e28cb8a6d
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10b@x-K~y-6ty8}*Ltzv>r|oM}L_)mw{R1YGm^+A96WV99nutv-
zVj-INF|ZiKU@_R5#v)C-86+kN|AOEdbV9YhW8gJaRg${NH=KL#Ip6)xmrF_LBtjjr
z|3e_sDj9b(NstQ+>cTU_+`22|uA6(=?17V-UI9!`tk$>o5-Cqnx_y4*Rn+39gbTlz
zJN!bBR6hwf?Z(~AYJlyr^l`%VHUb=X(+AGz<WM8$iw6Sd{8~Bt(|aw2mK6>!w)3Fk
zSiPQ;@{#~Ras<$zlk&PhZeU(StdUTkfFuFQ7}`d%jbuZJ0*D2eAq_N7RTq#XfH6Ng
zyziItGkz&QBj_C9Nq{S`3Lsuv3VfPy6hFIM`pJVRs_O=3uQB)S8x!N+mJG@d{nobq
zSe>WQO_%9AeF~Seq;Bqt`Q5ex0N}XO69Q&Q)dYk<3I;p(rQCUQZ%cuCk)(dvwzdL)
ciH?`)9SSJ2sp2ZYhyVZp07*qoM6N<$f=AuWpa1{>

literal 0
HcmV?d00001

diff --git a/src/PrimitivesPlugin/plugin-Primitives.xml b/src/PrimitivesPlugin/plugin-Primitives.xml
index f26ce3a3a..cbc0af066 100644
--- a/src/PrimitivesPlugin/plugin-Primitives.xml
+++ b/src/PrimitivesPlugin/plugin-Primitives.xml
@@ -3,7 +3,7 @@
 <plugin> 
   <workbench id="Primitives" document="Part">
     <group id="Primitives">
-      <feature id="Box" title="Create a box" tooltip="Create a box" icon=":icons/box.png">
+      <feature id="Box" title="Create a box" tooltip="Create a box" icon="icons/Primitives/box.png">
         <source path="box_widget.xml"/>
       </feature>
     </group>
-- 
2.39.2