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

diff --git a/configure.ac b/configure.ac
index 7b169f528dd13ad83331ce4b3cd153b3a5c0305b..b1c763d26baa9035efbebc4a2e0e0005d2dd994e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,7 @@ AC_OUTPUT([ \
   src/PYHELLO/Makefile \
   src/PYHELLOGUI/Makefile \
   resources/Makefile \
+  resources/SalomeApp.xml \
   resources/PYHELLOCatalog.xml \
   idl/Makefile \
   Makefile \

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 674b4e655afc31019f6ae57dea83b7d01b32a69f..490b3dcda2accc6a06870ca3228e315562fe7b7d 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -30,7 +30,7 @@ dist_salomeres_DATA = \
        ExecPYHELLO.png \
        handshake.png \
        stop.png \
-       SalomeApp.xml
+       $(top_builddir)/resources/SalomeApp.xml
 
 # VSR: little trick to avoid putting if PYHELLOCatalog.xml to the distribution archive
 nodist_salomeres_SCRIPTS = PYHELLOCatalog.xml

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644 (file)
index 96f8454..0000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,40 +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="PYHELLO">
-    <!-- Major module parameters -->
-    <parameter name="name"            value="PyHello"/>
-    <parameter name="icon"            value="PYHELLO.png"/>
-    <parameter name="library"         value="SalomePyQtGUI"/>
-    <parameter name="documentation"   value="pyhello_help"/>
-  </section>
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="PYHELLO"         value="${PYHELLO_ROOT_DIR}/share/salome/resources/pyhello"/>
-  </section>
-  <section name="pyhello_help" >
-    <parameter name="sub_menu"        value="Samples"/>
-    <parameter name="%1 User's Guide" value="${PYHELLO_ROOT_DIR}/share/doc/salome/gui/PYHELLO/index.html"/>
-  </section>
-</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..58b304e
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,41 @@
+<!--
+  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="PYHELLO">
+    <!-- Major module parameters -->
+    <parameter name="name"            value="PyHello"/>
+    <parameter name="icon"            value="PYHELLO.png"/>
+    <parameter name="library"         value="SalomePyQtGUI"/>
+    <parameter name="documentation"   value="pyhello_help"/>
+    <parameter name="PYHELLO_VERSION" value="@VERSION@"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="PYHELLO"         value="${PYHELLO_ROOT_DIR}/share/salome/resources/pyhello"/>
+  </section>
+  <section name="pyhello_help" >
+    <parameter name="sub_menu"        value="Samples"/>
+    <parameter name="%1 User's Guide" value="${PYHELLO_ROOT_DIR}/share/doc/salome/gui/PYHELLO/index.html"/>
+  </section>
+</document>