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

diff --git a/configure.ac b/configure.ac
index 21c22acc6a4979da769b0569c328ec845f28eb61..51bcc3f365a7dd007ff58c89b62e478eb0651c34 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,7 @@ AC_OUTPUT([ \
   bin/VERSION \
   bin/Makefile \
   resources/Makefile \
+  resources/SalomeApp.xml \
   src/Makefile \
   src/ATOMICGUI/Makefile \
   ATOMIC_version.h \

diff --git a/resources/Makefile.am b/resources/Makefile.am
index fda2d089c8c20e98eaa8b68d8fba16160fd65da9..f81451ccaa3535fb3f19532de7891446cab91e7e 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -26,5 +26,5 @@ dist_salomeres_DATA = \
        atom_remove.png \
        atom_rename.png \
        LightApp.xml \
-       SalomeApp.xml \
+       $(top_builddir)/resources/SalomeApp.xml \
        sample.xml

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644 (file)
index 7e5442d..0000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE document>
-<!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-
-  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="launch" >
-  <parameter name="modules" value="ATOMIC" />
- </section>
- <section name="ATOMIC" >
-  <parameter name="name" value="Atomic" />
-  <parameter name="icon" value="ATOMIC.png" />
- </section>
- <section name="resources" >
-  <parameter name="ATOMIC" value="${ATOMIC_ROOT_DIR}/share/salome/resources/atomic" />
- </section>
-</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..d1dd817
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,34 @@
+<!DOCTYPE document>
+<!--
+  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  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="launch" >
+  <parameter name="modules" value="ATOMIC" />
+ </section>
+ <section name="ATOMIC" >
+  <parameter name="name" value="Atomic" />
+  <parameter name="icon" value="ATOMIC.png" />
+  <parameter name="ATOMIC_VERSION" value="@VERSION@" />
+ </section>
+ <section name="resources" >
+  <parameter name="ATOMIC" value="${ATOMIC_ROOT_DIR}/share/salome/resources/atomic" />
+ </section>
+</document>

diff --git a/src/ATOMICGUI/ATOMICGUI.cxx b/src/ATOMICGUI/ATOMICGUI.cxx
index 9c9cf1d8b6ba9ffd81c0a5b27da0281759564e1f..189ab7c797da89da8aa3e685b25759d24042ed98 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI.cxx
+++ b/src/ATOMICGUI/ATOMICGUI.cxx
@@ -30,6 +30,8 @@ using namespace std;
 #include "ATOMICGUI_RenameOp.h"
 #include "ATOMICGUI_DeleteOp.h"
 
+#include <ATOMIC_version.h>
+
 #include <LightApp_Application.h>
 #include <LightApp_DataOwner.h>
 #include <LightApp_SelectionMgr.h>
@@ -235,4 +237,8 @@ extern "C" {
   ATOMICGUI_EXPORT CAM_Module* createModule() {
     return new ATOMICGUI();
   }
+  
+  ATOMICGUI_EXPORT char* getModuleVersion() {
+    return ATOMIC_VERSION_STR;
+  }
 }

diff --git a/src/ATOMICGUI/Makefile.am b/src/ATOMICGUI/Makefile.am
index bf9d7e2d81369ad89002be8e4803d522d42720f2..92b82eaa9807521c02ea605a9d626c8c7449e266 100644 (file)
--- a/src/ATOMICGUI/Makefile.am
+++ b/src/ATOMICGUI/Makefile.am
@@ -69,7 +69,8 @@ libATOMIC_la_CPPFLAGS = \
        $(VTK_INCLUDES) \
        $(CAS_CPPFLAGS) \
        $(PYTHON_INCLUDES) \
-       $(GUI_CXXFLAGS)
+       $(GUI_CXXFLAGS) \
+       -I$(top_builddir)
 
 # additionnal linkage flags
 libATOMIC_la_LDFLAGS = \