Merge commit 'f709219506b7cd587e94abc5ebed18d629df92d8'

[modules/shaper.git] / src / SketchPlugin / plugin-Sketch.xml

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 813607e5112b7f31239523d043d26dfd15761ab2..6f665a49e1749ac83761fec2eb1d94beddc474ed 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -7,7 +7,7 @@
                 SketchCircle SketchMacroCircle SketchArc SketchMacroArc
                 SketchEllipse SketchMacroEllipse SketchEllipticArc SketchMacroEllipticArc
                 SketchBSpline SketchMacroBSpline SketchMacroBSplinePeriodic SketchBSplinePeriodic
-                SketchRectangle SketchMacroRectangle
+                SketchRectangle
                 SketchProjection
                 SketchCurveFitting
                 SketchConstraintLength SketchConstraintRadius SketchConstraintDistance SketchConstraintDistanceHorizontal SketchConstraintDistanceVertical
@@ -52,78 +52,6 @@
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0" change_visual_attributes="true"/>
         <validator id="GeomValidators_Different" parameters="StartPoint,EndPoint"/>
       </feature>
-      <!-- SketchRectangle is a hidden feature. It is created inside SketchMacroRectangle. -->
-      <feature
-        id="SketchRectangle"
-        title="Rectangle"
-        tooltip="Create rectangle"
-        icon="icons/Addons/rectangle.png"
-        helpfile="rectangleFeature.html"
-        internal="1">
-        <sketch-2dpoint_selector id="rectangle_start_point"
-                                 accept_expressions="0"
-                                 title="Rectangle start point"
-                                 tooltip="Start point coordinates"
-                                 enable_value="enable_by_preferences"/>
-        <sketch-2dpoint_selector id="rectangle_end_point"
-                                 accept_expressions="0"
-                                 title="Rectangle end point"
-                                 tooltip="End point coordinates"
-                                 enable_value="enable_by_preferences"/>
-        <validator id="GeomValidators_Different" parameters="rectangle_start_point,rectangle_end_point"/>
-        <boolvalue id="Auxiliary"
-                   label="Auxiliary"
-                   default="false"
-                   tooltip="Construction element"
-                   obligatory="0"
-                   change_visual_attributes="true"/>
-      </feature>
-      <!-- SketchMacroRectangle -->
-      <feature
-        id="SketchMacroRectangle"
-        title="Rectangle"
-        tooltip="Create rectangle"
-        icon="icons/Addons/rectangle.png"
-        helpfile="rectangleFeature.html">
-        <toolbox id="rectangle_type" modified_in_edit="edit_rectangle_type">
-          <box id="rectangle_type_by_start_and_end_points"
-               icon="icons/Sketch/rectangle_pt_rad_32x32.png"
-               title="Start and end points">
-            <sketch-2dpoint_selector id="rectangle_start_point1"                                     
-                                     accept_expressions="0"
-                                     title="Rectangle start point"
-                                     tooltip="Start point coordinates"
-                                     enable_value="enable_by_preferences"/>
-            <sketch-2dpoint_selector id="rectangle_end_point1"
-                                     accept_expressions="0"
-                                     title="Rectangle end point"
-                                     tooltip="End point coordinates"
-                                     enable_value="enable_by_preferences"/>
-            <validator id="GeomValidators_Different" parameters="rectangle_start_point1,rectangle_end_point1"/>
-         </box>
-         <box id="rectangle_type_by_center_and_end_points"
-              icon="icons/Sketch/rectangle_pt_rad_32x32.png"
-              title="Center and end points">
-           <sketch-2dpoint_selector id="rectangle_center_point"
-                                    accept_expressions="0"
-                                    title="Rectangle center point"
-                                    tooltip="Center point coordinates"
-                                    enable_value="enable_by_preferences"/>
-           <sketch-2dpoint_selector id="rectangle_end_point2"
-                                    accept_expressions="0"
-                                    title="Rectangle end point"
-                                    tooltip="End point coordinates"
-                                    enable_value="enable_by_preferences"/>
-           <validator id="GeomValidators_Different" parameters="rectangle_end_point2,rectangle_center_point"/>
-        </box>
-       </toolbox>
-       <boolvalue id="Auxiliary"
-                  label="Auxiliary"
-                  default="false"
-                  tooltip="Construction element"
-                  obligatory="0"
-                  change_visual_attributes="true"/>
-      </feature>
     </group>
     <group id="Conical geometry">
       <!-- SketchCircle is a hidden feature. It is created inside SketchMacroCircle. -->
@@ -1092,6 +1020,17 @@
                tooltip="Offset a curve to a distance"
                icon="icons/Sketch/offset.png"
                helpfile="offsetFeature.html">
+        <toolbox id="offset_joint">
+           <box id="KeepDistance"
+               icon="icons/Sketch/offset_keep_distance_32x32.png"
+               title="Keep distance"/>
+           <box id="Arcs"
+               icon="icons/Sketch/offset_arcs_32x32.png"
+               title="Arcs"/>
+           <box id="Lines"
+               icon="icons/Sketch/offset_lines_32x32.png"
+               title="Lines"/>
+        </toolbox>
         <sketch_multi_selector id="segments"
                                label="Edges"
                                tooltip="Select edges to offset"
@@ -1112,6 +1051,11 @@
                    tooltip="Reverse the offset"
                    default="false"
                    obligatory="0"/>
+        <boolvalue id="approx"
+                   label="Approx by segments and arcs"
+                   tooltip="Approx by segments and arcs"
+                   default="false"
+                   obligatory="0"/>
         <action id="add_wire"
                 label="Select wire"
                 tooltip="Add the list of segments composing a wire with the selected items through the coincidence by boundary points"/>