X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2Faxis_widget.xml;h=bdb7a148f57cbac91da12fa7ed7d6815528f6148;hb=3dba9bfac0fe2de547b60a58f68db0822b9865ab;hp=0042745695cfdb98d3a7011925caded1e206e97e;hpb=5ba89a77cdb9638a6d298c2aa5233d26576d9ed0;p=modules%2Fshaper.git

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index 004274569..bdb7a148f 100644
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -1,30 +1,33 @@
 <!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 <source>
-  <toolbox>
-    <box id="AxisByPointsCase" title="By two points">
-      <shape_selector id="firstPoint"
+  <toolbox id="CreationMethod">
+    <box id="AxisByPointsCase" title="By two points" icon=":icons/point.png">
+      <shape_selector id="FirstPoint"
         label="First point"
-        icon=":icons/point.png"
+        icon=":icons/by_two_points_32x32.png"
         tooltip="Select a first point"
         shape_types="vertex">
-        <selection_filter id="NoConstructionSubShapesFilter"/>
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
       </shape_selector>
-      <shape_selector id="secondPoint"
+      <shape_selector id="SecondPoint"
         label="Second point"
         icon=":icons/point.png"
         tooltip="Select a second point"
         shape_types="vertex">
-        <selection_filter id="NoConstructionSubShapesFilter"/>
-        <validator id="PartSet_DifferentShapes"/>
+        <validator id="GeomValidators_ConstructionComposite"/>
+        <validator id="GeomValidators_ShapeType" parameters="vertex"/>
+        <validator id="GeomValidators_DifferentShapes"/>
       </shape_selector>
     </box>
-    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face">
-      <shape_selector id="main_object" 
+    <box id="AxisByCylindricalFaceCase" title="As axis of cylindrical face" icon=":icons/circle.png">
+      <shape_selector id="CylindricalFace"
         label="Main object" 
-        icon=":icons/circle.png" 
+        icon=":icons/cylindrical_face_32x32.png" 
         tooltip="Select a cylindrical object"
         shape_types="face solid shell">
+        <validator id="GeomValidators_Face" parameters="cylinder"/>
       </shape_selector>
     </box>
   </toolbox>