From bf485006fe3c41732393066a0e7f4b51df056fd0 Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Tue, 27 Aug 2019 16:12:22 +0300
Subject: [PATCH] Make code style checker work with multi-line strings
 correctly.

---
 src/BuildPlugin/plugin-Build.xml              |  6 ++--
 src/FeaturesPlugin/plugin-Features.xml        |  6 ++--
 .../InitializationPlugin_PyInterp.cpp         | 34 ++++++++++---------
 src/SketchPlugin/plugin-Sketch.xml            |  4 +--
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/BuildPlugin/plugin-Build.xml b/src/BuildPlugin/plugin-Build.xml
index b46aa51b1..be1d59997 100644
--- a/src/BuildPlugin/plugin-Build.xml
+++ b/src/BuildPlugin/plugin-Build.xml
@@ -1,11 +1,11 @@
 <plugin>
   <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"
+      <feature id="Vertex" title="Vertex" tooltip ="Create vertices from sketch point or other vertex objects" icon="icons/Build/feature_vertex.png"
                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"
+      <feature id="Edge" title="Edge" tooltip ="Create edges from sketch edges or other edge objects" icon="icons/Build/feature_edge.png"
                helpfile="edgeFeature.html">
         <source path="edge_widget.xml"/>
       </feature>
@@ -33,7 +33,7 @@
                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"
+      <feature id="CompSolid" title="CompSolid" tooltip ="Create a compsolid from solids or other compsolids" icon="icons/Build/feature_compsolid.png"
                helpfile="compsolidFeature.html">
         <source path="compsolid_widget.xml"/>
       </feature>
diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index cec9dd59e..215de85d7 100644
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -114,15 +114,15 @@
   </workbench>
   <workbench id="Part">
     <group id="Movement">
-      <feature id="Placement" title="Placement" tooltip="Place an objects relatively to another one"
+      <feature id="Placement" title="Placement" tooltip="Place objects relatively to another one"
                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"
+      <feature id="Translation" title="Translation" tooltip="Perform translation of objects along the axis to specified distance"
                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"
+      <feature id="Rotation" title="Rotation" tooltip="Perform rotation of objects around the axis to specified angle"
                icon="icons/Features/rotation.png" helpfile="rotationFeature.html">
         <source path="rotation_widget.xml"/>
       </feature>
diff --git a/src/InitializationPlugin/InitializationPlugin_PyInterp.cpp b/src/InitializationPlugin/InitializationPlugin_PyInterp.cpp
index a2f99d56a..57ef46d48 100644
--- a/src/InitializationPlugin/InitializationPlugin_PyInterp.cpp
+++ b/src/InitializationPlugin/InitializationPlugin_PyInterp.cpp
@@ -228,22 +228,24 @@ bool InitializationPlugin_PyInterp::initContext()
   Py_INCREF(_local_context);
 
   // to avoid "help()" hang in the python console
-  PyRun_SimpleString("def help(): print(\"Available modules:\\n\
-  salome.shaper.model : higher level access to features and data model\\n\
-  BuildAPI            : Build plugin features allowing to build shapes\\n\
-  ConfigAPI           : configuration management: preferences and XML properties\\n\
-  ConstructionAPI     : Construction plugin for auxiliary features creation\\n\
-  EventsAPI           : application events receiving and emitting manager\\n\
-  ExchangeAPI         : Exchange plugin with import/export features\\n\
-  FeaturesAPI         : Features plugin with general 3D features\\n\
-  GeomAlgoAPI         : geometrical algorithms\\n\
-  GeomAPI             : geometrical data structures\\n\
-  GeomDataAPI         : specific geometrical data structures stored in the data model\\n\
-  ModelAPI            : general low-level interface to access data model\\n\
-  ModelHighAPI        : general high-level interface to access data model\\n\
-  ParametersAPI       : Parameters plugin for parameters feature management\\n\
-  PartSetAPI          : PartSet plugin for management Parts features\\n\
-  SketchAPI           : Sketch plugin with all sketch features\")");
+  const static char* aHelpTxt = "def help(): print(\"Available modules:\\n"
+    "  salome.shaper.model : higher level access to features and data model\\n"
+    "  BuildAPI            : Build plugin features allowing to build shapes\\n"
+    "  ConfigAPI           : configuration management: preferences and XML properties\\n"
+    "  ConstructionAPI     : Construction plugin for auxiliary features creation\\n"
+    "  EventsAPI           : application events receiving and emitting manager\\n"
+    "  ExchangeAPI         : Exchange plugin with import/export features\\n"
+    "  FeaturesAPI         : Features plugin with general 3D features\\n"
+    "  GeomAlgoAPI         : geometrical algorithms\\n"
+    "  GeomAPI             : geometrical data structures\\n"
+    "  GeomDataAPI         : specific geometrical data structures stored in the data model\\n"
+    "  ModelAPI            : general low-level interface to access data model\\n"
+    "  ModelHighAPI        : general high-level interface to access data model\\n"
+    "  ParametersAPI       : Parameters plugin for parameters feature management\\n"
+    "  PartSetAPI          : PartSet plugin for management Parts features\\n"
+    "  SketchAPI           : Sketch plugin with all sketch features\")";
+
+  PyRun_SimpleString(aHelpTxt);
 
   return PyRun_SimpleString("from math import *") == 0;
 }
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index a2e09b0f5..118bec3ac 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -301,7 +301,7 @@
       <!--  SketchFillet  -->
       <feature id="SketchFillet"
                title="Fillet"
-               tooltip="Create constraint defining fillet between two objects"
+               tooltip="Create constraint defining fillet between two connected segments"
                icon="icons/Sketch/fillet.png"
                helpfile="filletFeature.html">
         <sketch_shape_selector id="fillet_point"
@@ -947,7 +947,7 @@
       </feature>
 
       <!--  SketchConstraintTangent  -->
-      <feature id="SketchConstraintTangent" title="Tangent" tooltip="Create constraint defining tangency of two objects with common coincident point" icon="icons/Sketch/tangent.png"
+      <feature id="SketchConstraintTangent" title="Tangent" tooltip="Create constraint defining tangency of two segments with common coincident point" icon="icons/Sketch/tangent.png"
                helpfile="tangentFeature.html">
         <sketch_shape_selector id="ConstraintEntityA"
             label="First object" tooltip="Select line or arc" shape_types="edge">
-- 
2.39.2