From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Tue, 19 Apr 2016 09:20:26 +0000 (+0200)
Subject: Update regarding the new icons management mechanism.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b5c36b8c2b7df579b19f559c9abb0977e7beecc8;p=modules%2Fshaper.git

Update regarding the new icons management mechanism.
---

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/PartSet/icons/box.png b/src/PartSet/icons/box.png
deleted file mode 100644
index 104a1edde..000000000
Binary files a/src/PartSet/icons/box.png and /dev/null differ
diff --git a/src/PartSet/icons/box_2pt_32x32.png b/src/PartSet/icons/box_2pt_32x32.png
deleted file mode 100644
index 874d20c5d..000000000
Binary files a/src/PartSet/icons/box_2pt_32x32.png and /dev/null differ
diff --git a/src/PartSet/icons/box_dxyz_32x32.png b/src/PartSet/icons/box_dxyz_32x32.png
deleted file mode 100644
index 26ce8aa6d..000000000
Binary files a/src/PartSet/icons/box_dxyz_32x32.png and /dev/null differ
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/PrimitivesPlugin/icons/box.png b/src/PrimitivesPlugin/icons/box.png
new file mode 100644
index 000000000..104a1edde
Binary files /dev/null and b/src/PrimitivesPlugin/icons/box.png differ
diff --git a/src/PrimitivesPlugin/icons/box_2pt_32x32.png b/src/PrimitivesPlugin/icons/box_2pt_32x32.png
new file mode 100644
index 000000000..874d20c5d
Binary files /dev/null and b/src/PrimitivesPlugin/icons/box_2pt_32x32.png differ
diff --git a/src/PrimitivesPlugin/icons/box_dxyz_32x32.png b/src/PrimitivesPlugin/icons/box_dxyz_32x32.png
new file mode 100644
index 000000000..26ce8aa6d
Binary files /dev/null and b/src/PrimitivesPlugin/icons/box_dxyz_32x32.png differ
diff --git a/src/PrimitivesPlugin/icons/point.png b/src/PrimitivesPlugin/icons/point.png
new file mode 100755
index 000000000..96149ebf3
Binary files /dev/null and b/src/PrimitivesPlugin/icons/point.png differ
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>