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

diff --git a/configure.ac b/configure.ac
index 19620c172148bce57d5597270cf9b268b0266916..79f2f59f574f1f582fa581e611ddd512f6da7ebc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,7 @@ AC_OUTPUT([ \
   src/SierpinskyGUI/Makefile \
   resources/Makefile \
   resources/SIERPINSKYCatalog.xml \
+  resources/SalomeApp.xml \
   idl/Makefile \
   SIERPINSKY_version.h \
   Makefile \

diff --git a/resources/Makefile.am b/resources/Makefile.am
index dfd7ab0d8c014496053bc94675a9379a1152153e..83d7cb0a06da446d5fd03a2219d2e760c82e306f 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -29,7 +29,7 @@ dist_salomeres_DATA = \
        go.png \
        graph1.xml \
        graph2.xml \
-       SalomeApp.xml
+       $(top_builddir)/resources/SalomeApp.xml
 
 # VSR: little trick to avoid putting if SIERPINSKYCatalog.xml to the distribution archive
 nodist_salomeres_SCRIPTS = SIERPINSKYCatalog.xml

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644 (file)
index cd8b881..0000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  Copyright (C) 2005-2011  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="SIERPINSKY">
-    <!-- Major module parameters -->
-    <parameter name="name" value="Sierpinsky"/>
-    <parameter name="icon" value="SIERPINSKY.png"/>
-  </section>
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="SIERPINSKY" value="${SIERPINSKY_ROOT_DIR}/share/salome/resources/sierpinsky"/>
-  </section>
-</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..edcff10
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,32 @@
+<!--
+  Copyright (C) 2005-2011  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="SIERPINSKY">
+    <!-- Major module parameters -->
+    <parameter name="name" value="Sierpinsky"/>
+    <parameter name="icon" value="SIERPINSKY.png"/>
+    <parameter name="SIERPINSKY_VERSION" value="@VERSION@"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="SIERPINSKY" value="${SIERPINSKY_ROOT_DIR}/share/salome/resources/sierpinsky"/>
+  </section>
+</document>

diff --git a/src/SierpinskyGUI/Makefile.am b/src/SierpinskyGUI/Makefile.am
index f8c13a77d2f92d27d09dd97fb43343b118f18b9a..a1cfe0e2922b91e9e499ca5ea0722d2db9bf6a13 100644 (file)
--- a/src/SierpinskyGUI/Makefile.am
+++ b/src/SierpinskyGUI/Makefile.am
@@ -63,6 +63,7 @@ libSIERPINSKY_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        -I$(srcdir)/../Sierpinsky \
+       -I$(top_builddir) \
        -I$(top_builddir)/idl
 
 libSIERPINSKY_la_LDFLAGS  = \

diff --git a/src/SierpinskyGUI/SierpinskyGUI.cxx b/src/SierpinskyGUI/SierpinskyGUI.cxx
index 0d35bfbe891a911b3a215cc9e33fd5ebe936448e..b0bb1e0ef1511a999864e063e3787cead5799e74 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI.cxx
@@ -25,6 +25,8 @@
 
 #include "SierpinskyGUI.h"
 
+#include <SIERPINSKY_version.h>
+
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Desktop.h>
@@ -158,4 +160,9 @@ extern "C" {
   {
     return new SierpinskyGUI();
   }
+  
+  char* getModuleVersion()
+  {
+    return SIERPINSKY_VERSION_STR;
+  }
 }