From: rnv Date: Tue, 13 Sep 2011 09:06:02 +0000 (+0000) Subject: Implementation of the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About' dialog... X-Git-Tag: V6_main_20110914 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=09e7b09dba5dbbab0ad88a05e15b67801bb71095;p=modules%2Fvisu.git Implementation of the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About' dialog box" issue. --- diff --git a/configure.ac b/configure.ac index 8808187e..ddb29aae 100644 --- a/configure.ac +++ b/configure.ac @@ -401,6 +401,7 @@ AC_OUTPUT([ \ doc/salome/tui/static/header.html \ idl/Makefile \ resources/VISUCatalog.xml \ + resources/SalomeApp.xml \ resources/Makefile \ src/Makefile \ src/CONVERTOR/Makefile \ diff --git a/resources/Makefile.am b/resources/Makefile.am index 101622c4..66b2d85e 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_salomeres_DATA = \ ModuleVisu.png \ -SalomeApp.xml \ +$(top_builddir)/resources/SalomeApp.xml \ sprite_alpha.bmp \ sprite_texture.bmp \ Vertex_Program_ARB.txt \ diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml deleted file mode 100644 index c004ea36..00000000 --- a/resources/SalomeApp.xml +++ /dev/null @@ -1,208 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - -
-
- - -
-
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in new file mode 100644 index 00000000..a478ea7a --- /dev/null +++ b/resources/SalomeApp.xml.in @@ -0,0 +1,209 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ + +
+
diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am index 7a0d5a4a..dde34229 100644 --- a/src/VISUGUI/Makefile.am +++ b/src/VISUGUI/Makefile.am @@ -187,7 +187,7 @@ libVISU_la_CPPFLAGS= \ $(GUI_CXXFLAGS) \ $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ -I$(srcdir)/../OBJECT -I$(srcdir)/../VISU_I \ - -I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE + -I$(top_builddir) -I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE libVISU_la_LDFLAGS= \ $(QWT_LIBS) \ diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx index 66878e75..7c97b09e 100644 --- a/src/VISUGUI/VisuGUI_Factory.cxx +++ b/src/VISUGUI/VisuGUI_Factory.cxx @@ -30,6 +30,8 @@ #include "CAM_Module.h" +#include + #ifdef WNT #if defined VISU_VISUGUI_EXPORTS || defined VISU_EXPORTS #define VISU_VISUGUI_EXPORT __declspec(dllexport) @@ -47,5 +49,11 @@ VISU_VISUGUI_EXPORT { return new VisuGUI_Module(); } + +VISU_VISUGUI_EXPORT + char* getModuleVersion() + { + return VISU_VERSION_STR; + } }