From 08f22abb700da791f8094621cb276b2d0821c811 Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Tue, 14 Aug 2018 12:43:22 +0300
Subject: [PATCH] Improve help system definition

---
 src/BuildPlugin/plugin-Build.xml              | 24 ++++----
 src/CollectionPlugin/plugin-Collection.xml    |  4 +-
 src/Config/Config_FeatureReader.cpp           |  4 +-
 .../plugin-Construction.xml                   |  6 +-
 src/ExchangePlugin/plugin-Exchange.xml        |  6 +-
 src/FeaturesPlugin/plugin-Features.xml        | 52 ++++++++--------
 src/GDMLPlugin/plugin-GDML.xml                |  4 +-
 src/ParametersPlugin/plugin-Parameters.xml    |  4 +-
 src/PrimitivesPlugin/plugin-Primitives.xml    | 10 ++--
 src/PythonAddons/macros/rectangle/widget.xml  |  2 +-
 src/SketchPlugin/plugin-Sketch.xml            | 60 +++++++++----------
 11 files changed, 89 insertions(+), 87 deletions(-)

diff --git a/src/BuildPlugin/plugin-Build.xml b/src/BuildPlugin/plugin-Build.xml
index e54004fcd..af32a2c62 100644
--- a/src/BuildPlugin/plugin-Build.xml
+++ b/src/BuildPlugin/plugin-Build.xml
@@ -23,55 +23,55 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="Build" document="Part">
     <group id="Generate">
       <feature id="Vertex" title="Vertex" tooltip ="Create a vertex from sketch vertex and vertex objects" icon="icons/Build/feature_vertex.png"
-               helpfile="BuildPlugin/vertexFeature.html">
+               helpfile="vertexFeature.html">
         <source path="vertex_widget.xml"/>
       </feature>
       <feature id="Edge" title="Edge" tooltip ="Create an edge from sketch edges and edge objects" icon="icons/Build/feature_edge.png"
-               helpfile="BuildPlugin/edgeFeature.html">
+               helpfile="edgeFeature.html">
         <source path="edge_widget.xml"/>
       </feature>
       <feature id="Interpolation" title="Interpolation" tooltip ="Create an interpolation curve from points" icon="icons/Build/feature_interpolation.png"
-               helpfile="BuildPlugin/interpolationFeature.html">
+               helpfile="interpolationFeature.html">
         <source path="interpolation_widget.xml"/>
       </feature>
       <feature id="Wire" title="Wire" tooltip ="Create a wire from sketch edges, edges and wires objects" icon="icons/Build/feature_wire.png"
-               helpfile="BuildPlugin/wireFeature.html">
+               helpfile="wireFeature.html">
         <source path="wire_widget.xml"/>
       </feature>
       <feature id="Polyline" title="Polyline" tooltip ="Create a polyline from points" icon="icons/Build/feature_polyline.png"
-               helpfile="BuildPlugin/polylineFeature.html">
+               helpfile="polylineFeature.html">
         <source path="polyline_widget.xml"/>
       </feature>
       <feature id="Face" title="Face" tooltip ="Create a face from sketch edges, edges and wires objects" icon="icons/Build/feature_face.png"
-               helpfile="BuildPlugin/faceFeature.html">
+               helpfile="faceFeature.html">
         <source path="face_widget.xml"/>
       </feature>
       <feature id="Shell" title="Shell" tooltip ="Create a shell from faces or shells objects" icon="icons/Build/feature_shell.png"
-               helpfile="BuildPlugin/shellFeature.html">
+               helpfile="shellFeature.html">
         <source path="shell_widget.xml"/>
       </feature>
       <feature id="Solid" title="Solid" tooltip ="Create a solid from faces or shells" icon="icons/Build/feature_solid.png"
-               helpfile="BuildPlugin/solidFeature.html">
+               helpfile="solidFeature.html">
         <source path="solid_widget.xml"/>
       </feature>
       <feature id="CompSolid" title="CompSolid" tooltip ="Create a compsolid from solids or another compsolids" icon="icons/Build/feature_compsolid.png"
-               helpfile="BuildPlugin/compsolidFeature.html">
+               helpfile="compsolidFeature.html">
         <source path="compsolid_widget.xml"/>
       </feature>
       <feature id="Compound" title="Compound" tooltip ="Create a compound of objects" icon="icons/Build/feature_compound.png"
-               helpfile="BuildPlugin/compoundFeature.html">
+               helpfile="compoundFeature.html">
         <source path="compound_widget.xml"/>
       </feature>
     </group>
     <group id="Modify">
       <feature id="SubShapes" title="Sub-Shapes" tooltip ="Allows to add or to remove sub-shapes of the selected shape" icon="icons/Build/feature_subshapes.png"
-               helpfile="BuildPlugin/subShapesFeature.html">
+               helpfile="subShapesFeature.html">
         <source path="subshapes_widget.xml"/>
       </feature>
     </group>
     <group id="Advanced">
       <feature id="Filling" title="Filling" tooltip="Create face from list of edges" icon="icons/Build/feature_filling.png"
-               helpfile="BuildPlugin/fillingFeature.html">
+               helpfile="fillingFeature.html">
         <source path="filling_widget.xml"/>
       </feature>
     </group>
diff --git a/src/CollectionPlugin/plugin-Collection.xml b/src/CollectionPlugin/plugin-Collection.xml
index fcab1b940..87d7d70ef 100644
--- a/src/CollectionPlugin/plugin-Collection.xml
+++ b/src/CollectionPlugin/plugin-Collection.xml
@@ -27,7 +27,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         tooltip="Create named collection of geometry entities"
         icon="icons/Collection/shape_group.png"
         apply_continue="true"
-        helpfile="CollectionPlugin/groupFeature.html">
+        helpfile="groupFeature.html">
         <source path="group_widget.xml"/>
       </feature>
 
@@ -35,7 +35,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Field"
         tooltip="Create fields for selected shapes"
         icon="icons/Collection/field.png"
-        helpfile="CollectionPlugin/fieldFeature.html">
+        helpfile="fieldFeature.html">
         <field-panel id="selected"
           filter_points="false" >
           <validator id="GeomValidators_BodyShapes"/>
diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index c76aee821..377cb364e 100644
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -183,7 +183,9 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
                                                       getProperty(theFeatureNode, FEATURE_TOOLTIP));
   outFeatureMessage->setIcon(getProperty(theFeatureNode, FEATURE_ICON));
   outFeatureMessage->setKeysequence(getProperty(theFeatureNode, FEATURE_KEYSEQUENCE));
-  outFeatureMessage->setHelpFileName(getProperty(theFeatureNode, HELP_FILE));
+  std::string aHelpFile = getProperty(theFeatureNode, HELP_FILE);
+  if (!aHelpFile.empty())
+    outFeatureMessage->setHelpFileName(myLibraryName + "/" + aHelpFile);
 
   std::string aGroupName = restoreAttribute(NODE_GROUP, _ID);
   std::string aWBNName = restoreAttribute(NODE_WORKBENCH, _ID);
diff --git a/src/ConstructionPlugin/plugin-Construction.xml b/src/ConstructionPlugin/plugin-Construction.xml
index 023015bca..f0d46b5fc 100644
--- a/src/ConstructionPlugin/plugin-Construction.xml
+++ b/src/ConstructionPlugin/plugin-Construction.xml
@@ -27,7 +27,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Point"
         tooltip="Create point"
         icon="icons/Construction/point.png"
-        helpfile="ConstructionPlugin/pointFeature.html">
+        helpfile="pointFeature.html">
         <source path="point_widget.xml" />
       </feature>
       <feature
@@ -35,7 +35,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Axis"
         tooltip="Create axis"
         icon="icons/Construction/axis.png"
-        helpfile="ConstructionPlugin/axisFeature.html">
+        helpfile="axisFeature.html">
         <source path="axis_widget.xml" />
       </feature>
       <feature
@@ -43,7 +43,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Plane"
         tooltip="Create plane"
         icon="icons/Construction/plane.png"
-        helpfile="ConstructionPlugin/planeFeature.html">
+        helpfile="planeFeature.html">
         <source path="plane_widget.xml" />
       </feature>
     </group>
diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml
index 30e7f7d45..e8e915661 100755
--- a/src/ExchangePlugin/plugin-Exchange.xml
+++ b/src/ExchangePlugin/plugin-Exchange.xml
@@ -23,17 +23,17 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="Part">
     <group id="Exchange">
       <feature id="Import" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png" document="Part"
-               helpfile="ExchangePlugin/importFeature.html">
+               helpfile="importFeature.html">
         <file_selector id="file_path" title="Import file" path="">
           <validator id="ExchangePlugin_ImportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES,XAO:XAO" />
         </file_selector>
       </feature>
       <feature id="Export" title="Export" tooltip="Export to file" icon="icons/Exchange/export.png"
-               helpfile="ExchangePlugin/exportFeature.html">
+               helpfile="exportFeature.html">
         <source path="export_widget.xml" />
       </feature>
       <feature id="Dump" title="Dump" tooltip="Dump python script" icon="icons/Exchange/dump.png"
-               helpfile="ExchangePlugin/dumpFeature.html">
+               helpfile="dumpFeature.html">
         <export_file_selector id="file_path"
                               type="save"
                               title="Dump to file"
diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index e5b261cbc..ed44680a2 100644
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -23,85 +23,85 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="Features" document="Part">
     <group id="Transformation">
       <feature id="Scale" title="Scale" tooltip="Perform scale objects"
-               icon="icons/Features/scale.png" helpfile="FeaturesPlugin/transformationFeature.html">
+               icon="icons/Features/scale.png" helpfile="transformationFeature.html">
         <source path="scale_widget.xml"/>
       </feature>
     </group>
     <group id="Extrusion">
       <feature id="Extrusion" title="Extrusion" tooltip="Create a solid by extrusion of a face"
-               icon="icons/Features/extrusion.png" helpfile="FeaturesPlugin/extrusionFeature.html">
+               icon="icons/Features/extrusion.png" helpfile="extrusionFeature.html">
           <source path="extrusion_widget.xml"/>
       </feature>
       <feature id="ExtrusionCut" title="ExtrusionCut" tooltip=""
-               icon="icons/Features/extrusion_cut.png" helpfile="FeaturesPlugin/extrusionCutFeature.html">
+               icon="icons/Features/extrusion_cut.png" helpfile="extrusionCutFeature.html">
         <source path="extrusioncut_widget.xml"/>
       </feature>
       <feature id="ExtrusionFuse" title="ExtrusionFuse" tooltip=""
-               icon="icons/Features/extrusion_fuse.png" helpfile="FeaturesPlugin/extrusionFuseFeature.html">
+               icon="icons/Features/extrusion_fuse.png" helpfile="extrusionFuseFeature.html">
         <source path="extrusionfuse_widget.xml"/>
       </feature>
     </group>
     <group id="Revolution">
       <feature id="Revolution" title="Revolution" tooltip="Create a solid by revolution of a face"
-               icon="icons/Features/revol.png" helpfile="FeaturesPlugin/revolutionFeature.html">
+               icon="icons/Features/revol.png" helpfile="revolutionFeature.html">
           <source path="revolution_widget.xml"/>
       </feature>
       <feature id="RevolutionCut" title="RevolutionCut" tooltip=""
-               icon="icons/Features/revol_cut.png" helpfile="FeaturesPlugin/revolutionCutFeature.html">
+               icon="icons/Features/revol_cut.png" helpfile="revolutionCutFeature.html">
         <source path="revolutioncut_widget.xml"/>
       </feature>
       <feature id="RevolutionFuse" title="RevolutionFuse" tooltip=""
-               icon="icons/Features/revol_fuse.png" helpfile="FeaturesPlugin/revolutionFuseFeature.html">
+               icon="icons/Features/revol_fuse.png" helpfile="revolutionFuseFeature.html">
         <source path="revolutionfuse_widget.xml"/>
       </feature>
     </group>
     <group id="Pipe">
       <feature id="Pipe" title="Pipe" tooltip="Generates extrusion along a path"
-               icon="icons/Features/pipe.png" helpfile="FeaturesPlugin/pipeFeature.html">
+               icon="icons/Features/pipe.png" helpfile="pipeFeature.html">
         <source path="pipe_widget.xml"/>
       </feature>
     </group>
     <group id="Boolean" toolbar="yes">
       <feature id="Cut" title="Cut" tooltip="Perform boolean cut operation with objects"
-               icon="icons/Features/bool_cut.png" helpfile="FeaturesPlugin/cutFeature.html"
+               icon="icons/Features/bool_cut.png" helpfile="cutFeature.html"
                auto_preview="false">
           <source path="boolean_widget.xml"/>
       </feature>
       <feature id="Fuse" title="Fuse" tooltip="Perform boolean fuse operation with objects"
-               icon="icons/Features/bool_fuse.png" helpfile="FeaturesPlugin/fuseFeature.html"
+               icon="icons/Features/bool_fuse.png" helpfile="fuseFeature.html"
                auto_preview="false">
           <source path="boolean_widget.xml"/>
       </feature>
       <feature id="Common" title="Common" tooltip="Perform boolean common operation with objects"
-               icon="icons/Features/bool_common.png"  helpfile="FeaturesPlugin/commonFeature.html"
+               icon="icons/Features/bool_common.png"  helpfile="commonFeature.html"
                auto_preview="false">
           <source path="boolean_widget.xml"/>
       </feature>
       <feature id="Smash" title="Smash" tooltip="Perform boolean smash operation with objects"
-               icon="icons/Features/bool_smash.png" helpfile="FeaturesPlugin/smashFeature.html"
+               icon="icons/Features/bool_smash.png" helpfile="smashFeature.html"
                auto_preview="false">
           <source path="boolean_smash_widget.xml"/>
       </feature>
       <feature id="Intersection" title="Intersection" tooltip="Intersect objects with tools"
-               icon="icons/Features/intersection.png" helpfile="FeaturesPlugin/intersectionFeature.html">
+               icon="icons/Features/intersection.png" helpfile="intersectionFeature.html">
         <source path="intersection_widget.xml"/>
       </feature>
       <feature id="Partition" title="Partition" tooltip="Perform partition operations with solids"
-               icon="icons/Features/partition.png" helpfile="FeaturesPlugin/partitionFeature.html"
+               icon="icons/Features/partition.png" helpfile="partitionFeature.html"
                auto_preview="false">
           <source path="partition_widget.xml"/>
       </feature>
       <feature id="Fill" title="Fill" tooltip="Perform boolean fill operation with objects"
-               icon="icons/Features/bool_fill.png" helpfile="FeaturesPlugin/fillFeature.html"
+               icon="icons/Features/bool_fill.png" helpfile="fillFeature.html"
                auto_preview="false">
           <source path="boolean_widget.xml"/>
       </feature>
       <feature id="Union" title="Union" tooltip="Perform union operations with shapes"
-               icon="icons/Features/union.png" helpfile="FeaturesPlugin/unionFeature.html">
+               icon="icons/Features/union.png" helpfile="unionFeature.html">
           <source path="union_widget.xml"/>
       </feature>
       <feature id="Remove_SubShapes" title="Remove Sub-Shapes" tooltip="Allows to remove sub-shapes from wires, shells, compsolids and compounds"
-               icon="icons/Features/remove_subshapes.png" helpfile="FeaturesPlugin/removeSubShapesFeature.html">
+               icon="icons/Features/remove_subshapes.png" helpfile="removeSubShapesFeature.html">
           <source path="remove_subshapes_widget.xml"/>
       </feature>
     </group>
@@ -110,13 +110,13 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Recover"
         tooltip="Visualize concealed objects"
         icon="icons/Features/recover.png"
-        helpfile="FeaturesPlugin/recoverFeature.html">
+        helpfile="recoverFeature.html">
         <source path="recover_widget.xml"/>
       </feature>
     </group>
     <group id="Fillet">
       <feature id="Fillet" title="Fillet" tooltip="Perform fillet on face or edge"
-               icon="icons/Features/fillet.png" auto_preview="true" helpfile="FeaturesPlugin/filletFeature.html">
+               icon="icons/Features/fillet.png" auto_preview="true" helpfile="filletFeature.html">
         <source path="fillet_widget.xml"/>
       </feature>
     </group>
@@ -124,33 +124,33 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="Part">
     <group id="Movement">
       <feature id="Placement" title="Placement" tooltip="Place an objects relatively to another one"
-               icon="icons/Features/placement.png" helpfile="FeaturesPlugin/placementFeature.html">
+               icon="icons/Features/placement.png" helpfile="placementFeature.html">
         <source path="placement_widget.xml"/>
       </feature>
       <feature id="Translation" title="Translation" tooltip="Perform translation of an objects along the axis to specified distance"
-               icon="icons/Features/movement.png" helpfile="FeaturesPlugin/translationFeature.html">
+               icon="icons/Features/movement.png" helpfile="translationFeature.html">
         <source path="translation_widget.xml"/>
       </feature>
       <feature id="Rotation" title="Rotation" tooltip="Perform rotation of an objects around the axis to specified angle"
-               icon="icons/Features/rotation.png" helpfile="FeaturesPlugin/rotationFeature.html">
+               icon="icons/Features/rotation.png" helpfile="rotationFeature.html">
         <source path="rotation_widget.xml"/>
       </feature>
       <feature id="Symmetry" title="Symmetry" tooltip="Perform symmetry with respect to a point, an axis or a plane"
-               icon="icons/Features/symmetry.png" helpfile="FeaturesPlugin/symmetryFeature.html">
+               icon="icons/Features/symmetry.png" helpfile="symmetryFeature.html">
         <source path="symmetry_widget.xml"/>
       </feature>
       <feature id="LinearCopy" title="Linear copy" tooltip="Perform copy and translate"
-               icon="icons/Features/multitranslation.png" helpfile="FeaturesPlugin/linearCopyFeature.html">
+               icon="icons/Features/multitranslation.png" helpfile="linearCopyFeature.html">
         <source path="multitranslation_widget.xml"/>
       </feature>
       <feature id="AngularCopy" title="Angular Copy" tooltip="Perform copy and rotate"
-               icon="icons/Features/multirotation.png" helpfile="FeaturesPlugin/angularCopyFeature.html">
+               icon="icons/Features/multirotation.png" helpfile="angularCopyFeature.html">
         <source path="multirotation_widget.xml"/>
       </feature>
     </group>
     <group id="Measurement">
       <feature id="Measurement" title="Measurement" tooltip="Calculate properties of objects"
-               icon="icons/Features/measurement.png" helpfile="FeaturesPlugin/measurementFeature.html">
+               icon="icons/Features/measurement.png" helpfile="measurementFeature.html">
         <source path="measurement_widget.xml"/>
       </feature>
     </group>
diff --git a/src/GDMLPlugin/plugin-GDML.xml b/src/GDMLPlugin/plugin-GDML.xml
index 66bc4a0cf..47e3075cc 100644
--- a/src/GDMLPlugin/plugin-GDML.xml
+++ b/src/GDMLPlugin/plugin-GDML.xml
@@ -23,11 +23,11 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="GDML" document="Part">
     <group id="GDML">
       <feature id="ConeSegment" title="Cone segment" tooltip="Create a GDML Cone Segment" icon="icons/GDML/cone_segment.png"
-               helpfile="GDMLPlugin/coneFeature.html">
+               helpfile="coneFeature.html">
         <source path="conesegment_widget.xml"/>
       </feature>
       <feature id="Ellipsoid" title="Ellipsoid" tooltip="Create a GDML Ellipsoid" icon="icons/GDML/ellipsoid.png"
-               helpfile="GDMLPlugin/ellipsoidFeature.html">
+               helpfile="ellipsoidFeature.html">
         <source path="ellipsoid_widget.xml"/>
       </feature>
     </group>
diff --git a/src/ParametersPlugin/plugin-Parameters.xml b/src/ParametersPlugin/plugin-Parameters.xml
index f5aff33e0..1b6c7d245 100644
--- a/src/ParametersPlugin/plugin-Parameters.xml
+++ b/src/ParametersPlugin/plugin-Parameters.xml
@@ -23,7 +23,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="Part">
     <group id="Parameters">
       <feature id="Parameter" title="Parameter" tooltip="Create a parameter" icon=":icons/expression.png"
-               helpfile="ParametersPlugin/parameterFeature.html">
+               helpfile="parameterFeature.html">
         <stringvalue id="variable" label="Name" icon=":icons/expression.png" placeholder="Please input the parameter name">
           <validator id="Parameters_VariableValidator"/>
         </stringvalue>
@@ -34,7 +34,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       </feature>
 
       <feature id="ParametersMgr" title="Parameters" tooltip="Manage parameters" icon=":icons/paper_roll.png" modal="true"
-               helpfile="ParametersPlugin/managerFeature.html">
+               helpfile="managerFeature.html">
         <parameters-manager/>
       </feature>
     </group>
diff --git a/src/PrimitivesPlugin/plugin-Primitives.xml b/src/PrimitivesPlugin/plugin-Primitives.xml
index a4e85ce55..c7d5a4b62 100644
--- a/src/PrimitivesPlugin/plugin-Primitives.xml
+++ b/src/PrimitivesPlugin/plugin-Primitives.xml
@@ -23,31 +23,31 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
   <workbench id="Primitives" document="Part">
     <group id="Primitives">
       <feature id="Box" title="Box" tooltip="Create a box" icon="icons/Primitives/box.png"
-               helpfile="PrimitivesPlugin/boxFeature.html">
+               helpfile="boxFeature.html">
         <source path="box_widget.xml"/>
       </feature>
     </group>
     <group id="Primitives">
       <feature id="Cylinder" title="Cylinder" tooltip="Create a cylinder" icon="icons/Primitives/cylinder.png"
-               helpfile="PrimitivesPlugin/cylinderFeature.html">
+               helpfile="cylinderFeature.html">
         <source path="cylinder_widget.xml"/>
       </feature>
     </group>
     <group id="Primitives">
       <feature id="Sphere" title="Sphere" tooltip="Create a sphere" icon="icons/Primitives/sphere.png"
-               helpfile="PrimitivesPlugin/sphereFeature.html">
+               helpfile="sphereFeature.html">
         <source path="sphere_widget.xml"/>
       </feature>
     </group>
     <group id="Primitives">
       <feature id="Torus" title="Torus" tooltip="Create a Torus" icon="icons/Primitives/torus.png"
-               helpfile="PrimitivesPlugin/torusFeature.html">
+               helpfile="torusFeature.html">
         <source path="torus_widget.xml"/>
       </feature>
     </group>
     <group id="Primitives">
       <feature id="Cone" title="Cone" tooltip="Create a Cone" icon="icons/Primitives/cone.png"
-               helpfile="PrimitivesPlugin/coneFeature.html">
+               helpfile="coneFeature.html">
         <source path="cone_widget.xml"/>
       </feature>
     </group>
diff --git a/src/PythonAddons/macros/rectangle/widget.xml b/src/PythonAddons/macros/rectangle/widget.xml
index 5b36b6d0c..45d5ef793 100644
--- a/src/PythonAddons/macros/rectangle/widget.xml
+++ b/src/PythonAddons/macros/rectangle/widget.xml
@@ -29,7 +29,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Rectangle"
         tooltip="Create rectangle"
         icon="icons/Addons/rectangle.png"
-        helpfile="SketchPlugin/rectangleFeature.html">
+        helpfile="rectangleFeature.html">
         <sketch-2dpoint_selector id="RectStartPoint" accept_expressions="0" title="Start point" tooltip="Start point coordinates"
                                  enable_value="enable_by_preferences"/>
         <sketch-2dpoint_selector id="RectEndPoint" accept_expressions="0" title="End point" tooltip="End point coordinates"
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 72e0ef181..12c37661d 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -41,7 +41,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Sketch"
         tooltip="Create sketch"
         icon="icons/Sketch/sketch.png"
-        helpfile="SketchPlugin/sketchPlugin.html">
+        helpfile="SketchPlugin.html">
         <sketch-start-label id="External" title="Select a plane on which to create a sketch" tooltip="Select a plane on which to create a sketch">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </sketch-start-label>
@@ -52,7 +52,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!-- SketchPoint -->
       <feature id="SketchPoint" title="Point" tooltip="Create point" icon="icons/Sketch/point.png"
-                helpfile="SketchPlugin/pointFeature.html">
+                helpfile="pointFeature.html">
         <sketch-2dpoint_selector id="PointCoordinates" accept_expressions="0" title="Point" tooltip="Point coordinates"
                                  enable_value="enable_by_preferences"/>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
@@ -60,7 +60,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!-- SketchLine -->
       <feature id="SketchLine" title="Line" tooltip="Create line" icon="icons/Sketch/line.png"
-               helpfile="SketchPlugin/lineFeature.html">
+               helpfile="lineFeature.html">
         <sketch-2dpoint_selector id="StartPoint" accept_expressions="0" title="Start point" tooltip="Start point coordinates"
                                  enable_value="enable_by_preferences"/>
         <sketch-2dpoint_selector id="EndPoint" accept_expressions="0" title="End point" tooltip="End point coordinates"
@@ -98,7 +98,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                icon="icons/Sketch/circle.png"
                title="Circle"
                tooltip="Create circle"
-               helpfile="SketchPlugin/circleFeature.html">
+               helpfile="circleFeature.html">
         <toolbox id="circle_type" modified_in_edit="edit_circle_type">
           <box id="circle_type_by_center_and_passed_points"
                icon="icons/Sketch/circle_pt_rad_32x32.png"
@@ -218,7 +218,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Arc"
         tooltip="Create arc"
         icon="icons/Sketch/arc.png"
-        helpfile="SketchPlugin/arcFeature.html">
+        helpfile="arcFeature.html">
         <toolbox id="arc_type" modified_in_edit="edit_arc_type">
           <box id="by_center_and_points"
                icon="icons/Sketch/arc_base_32x32.png"
@@ -324,7 +324,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                title="Fillet"
                tooltip="Create constraint defining fillet between two objects"
                icon="icons/Sketch/fillet.png"
-               helpfile="SketchPlugin/filletFeature.html">
+               helpfile="filletFeature.html">
         <sketch_shape_selector id="fillet_point"
                                label="Point"
                                tooltip="Select point for fillet (should be shared by two entities only)"
@@ -337,7 +337,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <feature id="SketchSplit" title="Split"
                tooltip="Cut selected segment arc or circle on existing coincident points"
                icon="icons/Sketch/split.png"
-               helpfile="SketchPlugin/splitFeature.html">
+               helpfile="splitFeature.html">
         <sketch_feature_point_selector
             id="SelectedObject"
             selection_attributes="SelectedObject SelectedPoint PreviewObject PreviewPoint"
@@ -353,7 +353,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <feature id="SketchTrim" title="Trim"
                tooltip="Trim selected segment arc or circle on intersection points nearest to the graphic selection"
                icon="icons/Sketch/trim.png"
-               helpfile="SketchPlugin/trimFeature.html">
+               helpfile="trimFeature.html">
         <sketch_feature_point_selector
             id="SelectedObject"
             selection_attributes="SelectedObject SelectedPoint PreviewObject PreviewPoint"
@@ -408,7 +408,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                icon="icons/Sketch/ellipse.png"
                title="Ellipse"
                tooltip="Create ellipse"
-               helpfile="SketchPlugin/ellipseFeature.html">
+               helpfile="ellipseFeature.html">
         <sketch-2dpoint_selector id="center_point"
                                  reference_attribute="center_point_ref"
                                  title="Center point"
@@ -466,7 +466,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Projection"
         tooltip="Project feature onto sketch plane"
         icon="icons/Sketch/projection.png"
-        helpfile="SketchPlugin/projectionFeature.html">
+        helpfile="projectionFeature.html">
         <sketch_shape_selector
               id="ExternalFeature"
               label="Object"
@@ -487,7 +487,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Intersection"
         tooltip="Intersect edge with sketch plane"
         icon="icons/Sketch/intersection.png"
-        helpfile="SketchPlugin/intersectionFeature.html">
+        helpfile="intersectionFeature.html">
         <sketch_shape_selector
               id="ExternalFeature"
               label="Object"
@@ -509,7 +509,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         id="SketchConstraintMirror"
         title="Mirror copy" icon="icons/Sketch/mirror.png"
         tooltip="Create constraint, mirroring group of objects"
-        helpfile="SketchPlugin/mirrorFeature.html">
+        helpfile="mirrorFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="Mirror line" tooltip="Select mirror line" shape_types="edge">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -531,7 +531,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         id="SketchMultiTranslation"
         title="Linear copy" icon="icons/Sketch/translate.png"
         tooltip="Copy objects and move"
-        helpfile="SketchPlugin/translationFeature.html">
+        helpfile="translationFeature.html">
         <sketch_multi_selector id="MultiTranslationList"
             label="Segments:"
             tooltip="Select list of objects to be translated"
@@ -600,7 +600,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         id="SketchMultiRotation"
         title="Angular copy" icon="icons/Sketch/rotate.png"
         tooltip="Copy objects and rotate"
-        helpfile="SketchPlugin/rotationFeature.html">
+        helpfile="rotationFeature.html">
         <sketch_multi_selector id="MultiRotationList"
             label="Segments:"
             tooltip="Select list of objects to be rotated"
@@ -666,7 +666,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Distance"
         tooltip="Set fixed distance from a point to an object"
         icon="icons/Sketch/distance.png"
-        helpfile="SketchPlugin/distanceFeature.html">
+        helpfile="distanceFeature.html">
         <label title="Select objects for distance definition. Following objects can be accepted: point, line or arc end point, center of circle or arc."/>
         <sketch_shape_selector
               id="ConstraintEntityA"
@@ -715,7 +715,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Horizontal Distance"
         tooltip="Set horizontal distance between two points"
         icon="icons/Sketch/distance_h.png"
-        helpfile="SketchPlugin/horizontalDistFeature.html">
+        helpfile="horizontalDistFeature.html">
         <label title="Select points for distance definition."/>
         <sketch_shape_selector
               id="ConstraintEntityA"
@@ -760,7 +760,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         title="Vertical Distance"
         tooltip="Set vertical distance between two points"
         icon="icons/Sketch/distance_v.png"
-        helpfile="SketchPlugin/verticalDistFeature.html">
+        helpfile="verticalDistFeature.html">
         <label title="Select points for distance definition."/>
         <sketch_shape_selector
               id="ConstraintEntityA"
@@ -801,7 +801,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintLength  -->
       <feature id="SketchConstraintLength" title="Length" tooltip="Set fixed length of a line segment" icon="icons/Sketch/length.png"
-               helpfile="SketchPlugin/lengthFeature.html">
+               helpfile="lengthFeature.html">
         <label title="Select a line on which to calculate length" tooltip="Select a line on which to calculate length"/>
         <shape_selector id="ConstraintEntityA" label="Line" tooltip="Select a line" shape_types="edge" >
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -825,7 +825,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintAngle  -->
       <feature id="SketchConstraintAngle" title="Angle" tooltip="Set fixed angle between two line segments" icon="icons/Sketch/angle_constr.png"
-               helpfile="SketchPlugin/angleFeature.html">
+               helpfile="angleFeature.html">
         <sketch_shape_selector id="ConstraintEntityA" label="Line 1" tooltip="Select a line" shape_types="edge" >
           <validator id="GeomValidators_ShapeType" parameters="line"/>
           <validator id="PartSet_DifferentObjects"/>
@@ -863,7 +863,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintRadius  -->
       <feature id="SketchConstraintRadius" title="Radius" tooltip="Set fixed radius of a circle or an arc" icon="icons/Sketch/radius_constr.png"
-               helpfile="SketchPlugin/radiusFeature.html">
+               helpfile="radiusFeature.html">
         <label title="Select a circle or an arc on which to calculate radius" tooltip="Select a circle or an arc on which to calculate radius"/>
         <shape_selector id="ConstraintEntityA" label="Circle or Arc" tooltip="Select a circle or an arc"
             shape_types="edge">
@@ -893,7 +893,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintHorizontal  -->
       <feature id="SketchConstraintHorizontal" title="Horizontal" tooltip="Create constraint defining horizontal line" icon="icons/Sketch/horisontal.png"
-               helpfile="SketchPlugin/horizontalFeature.html">
+               helpfile="horizontalFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -904,7 +904,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintVertical  -->
       <feature id="SketchConstraintVertical" title="Vertical" tooltip="Create constraint defining vertical line" icon="icons/Sketch/vertical.png"
-               helpfile="SketchPlugin/verticalFeature.html">
+               helpfile="verticalFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -915,7 +915,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintRigid  -->
       <feature id="SketchConstraintRigid" title="Fixed" tooltip="Fix an object" icon="icons/Sketch/fixed.png"
-               helpfile="SketchPlugin/rigidFeature.html">
+               helpfile="rigidFeature.html">
         <sketch_shape_selector id="ConstraintEntityA" label="Object"
                         tooltip="Select point, line end point, line, center of circle or arc."
                         shape_types="edge vertex">
@@ -927,7 +927,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintParallel  -->
       <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines"
-               icon="icons/Sketch/parallel.png" helpfile="SketchPlugin/parallelFeature.html">
+               icon="icons/Sketch/parallel.png" helpfile="parallelFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First line" tooltip="Select a line" shape_types="edge">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
@@ -948,7 +948,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <feature id="SketchConstraintPerpendicular" title="Perpendicular"
                tooltip="Create constraint defining two perpendicular lines"
                icon="icons/Sketch/perpendicular.png"
-               helpfile="SketchPlugin/perpendicularFeature.html">
+               helpfile="perpendicularFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First line" tooltip="Select a line"
             shape_types="edge">
@@ -969,7 +969,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintTangent  -->
       <feature id="SketchConstraintTangent" title="Tangent" tooltip="Create constraint defining tangency of two objects with common coincident point" icon="icons/Sketch/tangent.png"
-               helpfile="SketchPlugin/tangentFeature.html">
+               helpfile="tangentFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First object" tooltip="Select line or arc" shape_types="edge">
           <validator id="SketchPlugin_TangentAttr" parameters="ConstraintEntityB"/>
@@ -986,7 +986,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
 
       <!--  SketchConstraintCoincidence  -->
       <feature id="SketchConstraintCoincidence" title="Coincident" tooltip="Create constraint for the coincidence of two points or point on line or circle" icon="icons/Sketch/coincedence.png"
-               helpfile="SketchPlugin/coincedenceFeature.html">
+               helpfile="coincedenceFeature.html">
         <sketch_shape_selector id="ConstraintEntityA" label="First object" tooltip="Select a first object" shape_types="vertex edge">
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityB"/>
@@ -1002,7 +1002,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <!--  SketchConstraintMiddle  -->
       <feature id="SketchConstraintMiddle" title="Middle point" tooltip="Create constraint for setting middle point on a line"
                icon="icons/Sketch/middlepoint.png"
-               helpfile="SketchPlugin/middleFeature.html">
+               helpfile="middleFeature.html">
         <sketch_shape_selector id="ConstraintEntityA" label="First object" tooltip="Select a first object" shape_types="vertex edge">
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityB"/>
@@ -1020,7 +1020,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
       <feature id="SketchConstraintEqual" title="Equal"
         tooltip="Create constraint defining equal lengths of two lines or line and arc or equal radii of two arcs or two circles or arc and circle"
         icon="icons/Sketch/equal.png"
-               helpfile="SketchPlugin/equalFeature.html">
+               helpfile="equalFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First object" tooltip="Select line, circle or arc" shape_types="edge">
           <validator id="PartSet_DifferentObjects"/>
@@ -1039,7 +1039,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
     <!--  SketchConstraintCollinear  -->
       <feature id="SketchConstraintCollinear" title="Collinear" tooltip="Create constraint defining collinearity of two lines"
                icon="icons/Sketch/collinear.png"
-               helpfile="SketchPlugin/collinearFeature.html">
+               helpfile="collinearFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First line" tooltip="Select a line" shape_types="edge">
           <validator id="GeomValidators_ShapeType" parameters="line"/>
-- 
2.39.2