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 a478ea7adbf1ca2494bc50d88323d966da1fff31..1475871c4750aa04572e491549f8cee079c95199 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -26,7 +26,7 @@
     <!-- Major module parameters -->
     <parameter name="name" value="Post-Pro"/>
     <parameter name="icon" value="ModuleVisu.png"/>
-    <parameter name="VISU_VERSION" value="@VERSION@"/>
+    <parameter name="version" value="@VERSION@"/>
     <!-- Other module preferences -->
     <parameter name="display_only"             value="false"/>
     <parameter name="show_preview"             value="false"/>
@@ -139,8 +139,8 @@
     <parameter name="point_sprite_results"   value="true"/>
     <parameter name="point_sprite_primitive_type"  value="0"  />
     <parameter name="point_sprite_clamp"           value="256"/>
-    <parameter name="point_sprite_main_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_texture.bmp" />
-    <parameter name="point_sprite_alpha_texture"   value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_alpha.bmp" />
+    <parameter name="point_sprite_main_texture"    value="%VISU_ROOT_DIR%/share/salome/resources/visu/sprite_texture.bmp" />
+    <parameter name="point_sprite_alpha_texture"   value="%VISU_ROOT_DIR%/share/salome/resources/visu/sprite_alpha.bmp" />
     <parameter name="point_sprite_alpha_threshold" value="0.5"/>
     <parameter name="point_sprite_min_size"      value="10" />
     <parameter name="point_sprite_max_size"      value="33" />
@@ -152,8 +152,8 @@
     <parameter name="geom_sphere_face_limit"     value="50000"/>
     <parameter name="inside_point_sprite_primitive_type"   value="0"  />
     <parameter name="inside_point_sprite_clamp"            value="256"/>
-    <parameter name="inside_point_sprite_main_texture"     value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_texture.bmp" />
-    <parameter name="inside_point_sprite_alpha_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_alpha.bmp" />
+    <parameter name="inside_point_sprite_main_texture"     value="%VISU_ROOT_DIR%/share/salome/resources/visu/sprite_texture.bmp" />
+    <parameter name="inside_point_sprite_alpha_texture"    value="%VISU_ROOT_DIR%/share/salome/resources/visu/sprite_alpha.bmp" />
     <parameter name="inside_point_sprite_alpha_threshold"  value="0.5"/>
     <parameter name="inside_point_sprite_min_size"         value="10" />
     <parameter name="inside_point_sprite_max_size"         value="33" />
@@ -163,8 +163,8 @@
     <parameter name="inside_geom_sphere_face_limit"        value="50000"/>
     <parameter name="outside_point_sprite_primitive_type"  value="0"  />
     <parameter name="outside_point_sprite_clamp"           value="256"/>
-    <parameter name="outside_point_sprite_main_texture"    value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_texture.bmp" />
-    <parameter name="outside_point_sprite_alpha_texture"   value="${VISU_ROOT_DIR}/share/salome/resources/visu/sprite_alpha.bmp" />
+    <parameter name="outside_point_sprite_main_texture"    value="%VISU_ROOT_DIR%/share/salome/resources/visu/sprite_texture.bmp" />
+    <parameter name="outside_point_sprite_alpha_texture"   value="%VISU_ROOT_DIR%/share/salome/resources/visu/sprite_alpha.bmp" />
     <parameter name="outside_point_sprite_alpha_threshold" value="0.5"/>
     <parameter name="outside_point_sprite_size"      value="25"  />
     <parameter name="outside_point_sprite_uniform"   value="true"/>
@@ -199,11 +199,11 @@
   </section>
   <section name="visu_help" >
     <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="${VISU_ROOT_DIR}/share/doc/salome/gui/VISU/index.html"/>
-    <parameter name="Developer's Guide" value="${VISU_ROOT_DIR}/share/doc/salome/tui/VISU/index.html"/>
+    <parameter name="User's Guide"      value="%VISU_ROOT_DIR%/share/doc/salome/gui/VISU/index.html"/>
+    <parameter name="Developer's Guide" value="%VISU_ROOT_DIR%/share/doc/salome/tui/VISU/index.html"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="VISU" value="${VISU_ROOT_DIR}/share/salome/resources/visu"/>
+    <parameter name="VISU" value="%VISU_ROOT_DIR%/share/salome/resources/visu"/>
   </section>
 </document>

diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx
index 7c97b09e4a590d636b1698f56f5e470eac560273..9e939d6d19455bf32bde084b32e7a0965e1df7a3 100644 (file)
--- a/src/VISUGUI/VisuGUI_Factory.cxx
+++ b/src/VISUGUI/VisuGUI_Factory.cxx
@@ -53,7 +53,7 @@ VISU_VISUGUI_EXPORT
 VISU_VISUGUI_EXPORT  
   char* getModuleVersion() 
   {
-    return VISU_VERSION_STR;
+    return (char*)VISU_VERSION_STR;
   }
 }