Additional modifications for the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About...

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 133192ed8ad600942aae1351ef757bfce06a7cad..664c824b5917249d68a91a918a4b1fdde3fd9454 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -26,7 +26,7 @@
     <!-- Major module parameters -->
     <parameter name="name" value="Mesh"/>
     <parameter name="icon" value="ModuleMesh.png"/>
-    <parameter name="SMESH_VERSION" value="@VERSION@"/>
+    <parameter name="version" value="@VERSION@"/>
     <!-- Other module preferences -->
     <parameter name="node_color"                   value="255, 0,   0"/>
     <parameter name="fill_color"                   value="0, 170, 255"/>
@@ -93,21 +93,21 @@
   </section>
   <section name="smesh_help" >
     <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="${SMESH_ROOT_DIR}/share/doc/salome/gui/SMESH/index.html"/>
-    <parameter name="Developer's Guide" value="${SMESH_ROOT_DIR}/share/doc/salome/tui/SMESH/index.html"/>
+    <parameter name="User's Guide"      value="%SMESH_ROOT_DIR%/share/doc/salome/gui/SMESH/index.html"/>
+    <parameter name="Developer's Guide" value="%SMESH_ROOT_DIR%/share/doc/salome/tui/SMESH/index.html"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
-    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="SMESH"        value="%SMESH_ROOT_DIR%/share/salome/resources/smesh"/>
+    <parameter name="StdMeshers"   value="%SMESH_ROOT_DIR%/share/salome/resources/smesh"/>
     <!-- NETGENPlugin and GHS3DPlugin -->
     <!-- Here the environment variables are used as case-sensitive, -->
     <!-- In GUI/src/SalomeApp/resources/SalomeApp.xml upper-case notation is used. -->
     <!-- As a result, both variants are acceptable. -->
-    <parameter name="NETGENPlugin" value="${NETGENPlugin_ROOT_DIR}/share/salome/resources/netgenplugin"/>
-    <parameter name="GHS3DPlugin"  value="${GHS3DPlugin_ROOT_DIR}/share/salome/resources/ghs3dplugin"/>
-    <parameter name="BLSURFPlugin" value="${BLSURFPlugin_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="HexoticPlugin" value="${HexoticPLUGIN_ROOT_DIR}/share/salome/resources/hexoticplugin"/>
-    <parameter name="GHS3DPRLPlugin" value="${GHS3DPRLPLUGIN_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="NETGENPlugin" value="%NETGENPlugin_ROOT_DIR%/share/salome/resources/netgenplugin"/>
+    <parameter name="GHS3DPlugin"  value="%GHS3DPlugin_ROOT_DIR%/share/salome/resources/ghs3dplugin"/>
+    <parameter name="BLSURFPlugin" value="%BLSURFPlugin_ROOT_DIR%/share/salome/resources"/>
+    <parameter name="HexoticPlugin" value="%HexoticPLUGIN_ROOT_DIR%/share/salome/resources/hexoticplugin"/>
+    <parameter name="GHS3DPRLPlugin" value="%GHS3DPRLPLUGIN_ROOT_DIR%/share/salome/resources"/>
   </section>
 </document>

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 5d37f2aeb43cf8ce4d7c802d586787031d6a6c07..2fab514646611a79430b7039cc7a35be58c86885 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1593,7 +1593,7 @@ extern "C" {
   }
 
   SMESHGUI_EXPORT  char* getModuleVersion() {
-    return SMESH_VERSION_STR;
+    return (char*)SMESH_VERSION_STR;
   }
 }