Implementation of the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About' dialog...

diff --git a/configure.ac b/configure.ac
index af9313f9d757ab5ab05bffe9be8741f14a990eb0..15d84b478f8c5ac63cdce3ccd9ca86ddd4dc140d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -467,6 +467,7 @@ AC_OUTPUT([ \
   src/VTKExport/Makefile \
   resources/Makefile \
   resources/GEOMCatalog.xml \
+  resources/SalomeApp.xml \
   idl/Makefile \
   Makefile \
 ])

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 957f96fa5f54aa0af157f15e6f3139a5f20cf387..a5711e81072be0c6c020cd1ef49c41eb6026fad9 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -28,7 +28,7 @@ dist_salomeres_DATA =         \
 GEOM_en.xml                    \
 GEOM_fr.xml                    \
 GEOM.config                    \
-SalomeApp.xml                  \
+$(top_builddir)/resources/SalomeApp.xml                        \
 Plugin                         \
 GEOMDS_Resources               \
 ImportExport                   \

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644 (file)
index 63843ab..0000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-
-  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
-<document>
-  <section name="GEOM">
-    <!-- Major module parameters -->
-    <parameter name="name" value="Geometry"/>
-    <parameter name="icon" value="ModuleGeom.png"/>
-    <parameter name="documentation" value="geom_help"/>
-  </section>
-  <section name="geom_help" >
-    <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="${GEOM_ROOT_DIR}/share/doc/salome/gui/GEOM/index.html"/>
-    <parameter name="Developer's Guide" value="${GEOM_ROOT_DIR}/share/doc/salome/tui/GEOM/index.html"/>
-  </section>
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
-  </section>
-  <section name="Geometry" >
-    <!-- Other module preferences -->
-    <parameter name="SettingsGeomStep"    value="10" />
-    <parameter name="display_mode"        value="0"  />
-    <parameter name="shading_color"       value="255, 255, 0" />
-    <parameter name="wireframe_color"     value="255, 255, 0" />
-    <parameter name="free_bound_color"    value="0, 255, 0" />
-    <parameter name="line_color"          value="255, 0, 0" />
-    <parameter name="point_color"         value="255, 255, 0" />
-    <parameter name="isos_color"          value="200, 200, 200" />
-    <parameter name="type_of_marker"      value="1"  />
-    <parameter name="deflection_coeff"    value="0.001"  />
-    <parameter name="auto_create_base_objects" value="false"  />
-    <parameter name="base_vectors_length" value="1"  />
-    <parameter name="marker_scale"        value="1"  />
-    <parameter name="geom_preview"        value="false"  />
-    <!-- Input field precisions -->
-    <parameter name="def_precision"       value="3"  />
-    <parameter name="length_precision"    value="6"  />
-    <parameter name="angle_precision"     value="3"  />
-    <parameter name="len_tol_precision"   value="-9"  />
-    <parameter name="ang_tol_precision"   value="-9"  />
-    <parameter name="weight_precision"    value="3"  />
-    <parameter name="density_precision"   value="3"  />
-    <parameter name="parametric_precision" value="6"  />
-    <parameter name="param_tol_precision" value="-9"  />
-  </section>
-</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..ee739d0
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,68 @@
+<!--
+  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+-->
+<document>
+  <section name="GEOM">
+    <!-- Major module parameters -->
+    <parameter name="name" value="Geometry"/>
+    <parameter name="icon" value="ModuleGeom.png"/>
+    <parameter name="documentation" value="geom_help"/>
+    <parameter name="GEOM_VERSION" value="@VERSION@"/>
+  </section>
+  <section name="geom_help" >
+    <parameter name="sub_menu"          value="%1 module"/>
+    <parameter name="User's Guide"      value="${GEOM_ROOT_DIR}/share/doc/salome/gui/GEOM/index.html"/>
+    <parameter name="Developer's Guide" value="${GEOM_ROOT_DIR}/share/doc/salome/tui/GEOM/index.html"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="GEOM" value="${GEOM_ROOT_DIR}/share/salome/resources/geom"/>
+  </section>
+  <section name="Geometry" >
+    <!-- Other module preferences -->
+    <parameter name="SettingsGeomStep"    value="10" />
+    <parameter name="display_mode"        value="0"  />
+    <parameter name="shading_color"       value="255, 255, 0" />
+    <parameter name="wireframe_color"     value="255, 255, 0" />
+    <parameter name="free_bound_color"    value="0, 255, 0" />
+    <parameter name="line_color"          value="255, 0, 0" />
+    <parameter name="point_color"         value="255, 255, 0" />
+    <parameter name="isos_color"          value="200, 200, 200" />
+    <parameter name="type_of_marker"      value="1"  />
+    <parameter name="deflection_coeff"    value="0.001"  />
+    <parameter name="auto_create_base_objects" value="false"  />
+    <parameter name="base_vectors_length" value="1"  />
+    <parameter name="marker_scale"        value="1"  />
+    <parameter name="geom_preview"        value="false"  />
+    <!-- Input field precisions -->
+    <parameter name="def_precision"       value="3"  />
+    <parameter name="length_precision"    value="6"  />
+    <parameter name="angle_precision"     value="3"  />
+    <parameter name="len_tol_precision"   value="-9"  />
+    <parameter name="ang_tol_precision"   value="-9"  />
+    <parameter name="weight_precision"    value="3"  />
+    <parameter name="density_precision"   value="3"  />
+    <parameter name="parametric_precision" value="6"  />
+    <parameter name="param_tol_precision" value="-9"  />
+  </section>
+</document>

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 969ce28d300470c7157bbde0c5273fde3100304f..0337045129689a4f10e9f8ef2345810f06754d42 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -98,12 +98,19 @@
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 
+#include <GEOM_version.h>
+
+
 #include "GEOMImpl_Types.hxx"
 
 extern "C" {
   Standard_EXPORT CAM_Module* createModule() {
     return new GeometryGUI();
   }
+
+  Standard_EXPORT char* getModuleVersion() {
+    return GEOM_VERSION_STR;
+  }
 }
 
 GeometryGUI::StudyTextureMap GeometryGUI::myTextureMap;

diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am
index a35b6f06a334c55a4dfbeaa0504707d92f4d4288..d65f42496cbf00a80ffd0dcfd3e279a6f9e045e6 100644 (file)
--- a/src/GEOMGUI/Makefile.am
+++ b/src/GEOMGUI/Makefile.am
@@ -75,7 +75,8 @@ libGEOM_la_CPPFLAGS =                         \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(srcdir)/../GEOMClient               \
        -I$(srcdir)/../GEOMImpl                 \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl                   \
+       -I$(top_builddir)
 
 libGEOM_la_LDFLAGS =                                           \
        $(PYTHON_LIBS)                                          \