6 files changed, 201 insertions, 171 deletions

diff --git a/cad/salome-gui/Makefile b/cad/salome-gui/Makefile
index f887dfcaa9cf..6eb5279e5d8e 100644
--- a/cad/salome-gui/Makefile
+++ b/cad/salome-gui/Makefile
@@ -8,6 +8,7 @@ CATEGORIES=	cad science
 
 MASTERDIR=	${.CURDIR}/../salome
 
+PORTNAME=	salome
 PKGNAMESUFFIX=	-gui
 SAL_MODULE_UPPER=	GUI
 
diff --git a/cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx
new file mode 100644
index 000000000000..21d5f49ff8f8
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx
@@ -0,0 +1,10 @@
+--- src/DDS/DDS_DicGroup.cxx.orig	2010-06-06 21:31:11.000000000 +0700
++++ src/DDS/DDS_DicGroup.cxx	2010-06-06 21:31:56.000000000 +0700
+@@ -20,6 +20,7 @@
+ //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+ 
++#include <cstdio>
+ #include "DDS_DicGroup.h"
+ 
+ #include "DDS_Dictionary.h"
diff --git a/cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx
new file mode 100644
index 000000000000..146dcd46b67c
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx
@@ -0,0 +1,11 @@
+--- src/DDS/DDS_DicItem.cxx.orig	2010-06-06 21:37:52.000000000 +0700
++++ src/DDS/DDS_DicItem.cxx	2010-06-06 21:38:04.000000000 +0700
+@@ -19,7 +19,7 @@
+ //
+ //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+-
++#include <cstdio>
+ #include "DDS_DicItem.h"
+ #include "DDS_Dictionary.h"
+ 
diff --git a/cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx b/cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx
new file mode 100644
index 000000000000..d901b26a2ea4
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx
@@ -0,0 +1,10 @@
+--- src/QDS/QDS_Datum.cxx.orig	2010-06-06 21:40:20.000000000 +0700
++++ src/QDS/QDS_Datum.cxx	2010-06-06 21:40:29.000000000 +0700
+@@ -20,6 +20,7 @@
+ //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+ 
++#include <cstdio>
+ #include "QDS_Datum.h"
+ 
+ #include <QLayout>
diff --git a/cad/salome-gui/files/patch-GUI_check_GUI.m4 b/cad/salome-gui/files/patch-GUI_check_GUI.m4
deleted file mode 100644
index 7a0eea1416ca..000000000000
--- a/cad/salome-gui/files/patch-GUI_check_GUI.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- adm_local/unix/config_files/check_GUI.m4.orig	2009-08-15 21:44:17.000000000 +0700
-+++ adm_local/unix/config_files/check_GUI.m4	2009-08-15 21:44:37.000000000 +0700
-@@ -59,7 +59,7 @@
-   SalomeGUI_ok=yes
-   AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
- 
--  if test "x${GUI_ROOT_DIR}" == "x" ; then
-+  if test "x${GUI_ROOT_DIR}" = "x" ; then
-     GUI_ROOT_DIR=${SALOME_GUI_DIR}
-   fi
- 
diff --git a/cad/salome-gui/pkg-plist b/cad/salome-gui/pkg-plist
index 2a9a9f86647c..fbafde9732e0 100644
--- a/cad/salome-gui/pkg-plist
+++ b/cad/salome-gui/pkg-plist
@@ -15,7 +15,6 @@ adm_local/unix/config_files/check_SalomeObject.m4
 adm_local/unix/config_files/check_SupervGraphViewer.m4
 adm_local/unix/config_files/check_TestRecorder.m4
 adm_local/unix/config_files/check_VTKViewer.m4
-adm_local/unix/config_files/check_corba_in_GUI.m4
 adm_local/unix/config_files/check_disable_Corba.m4
 adm_local/unix/config_files/check_msg2qm.m4
 adm_local/unix/config_files/check_opengl.m4
@@ -39,10 +38,6 @@ bin/salome/test_big_table.py
 bin/salome/test_many_objects.py
 bin/salome/test_remove_ref.py
 bin/salome/test_table.py
-%%CPPUNIT%%bin/salome/TestSalomeApp
-%%CPPUNIT%%bin/salome/TestSalomeApp.py
-%%CPPUNIT%%bin/salome/TestSalomeApp.pyc
-%%CPPUNIT%%bin/salome/TestSalomeApp.pyo
 idl/salome/SalomeApp_Engine.idl
 include/salome/CAF.h
 include/salome/CAF_Application.h
@@ -139,6 +134,7 @@ include/salome/OCCViewer_AxialScaleDlg.h
 include/salome/OCCViewer_ClippingDlg.h
 include/salome/OCCViewer_CreateRestoreViewDlg.h
 include/salome/OCCViewer_SetRotationPointDlg.h
+include/salome/OCCViewer_ToolTip.h
 include/salome/OCCViewer_Trihedron.h
 include/salome/OCCViewer_VService.h
 include/salome/OCCViewer_ViewManager.h
@@ -147,6 +143,8 @@ include/salome/OCCViewer_ViewPort.h
 include/salome/OCCViewer_ViewPort3d.h
 include/salome/OCCViewer_ViewSketcher.h
 include/salome/OCCViewer_ViewWindow.h
+include/salome/OpenGLUtils.h
+include/salome/OpenGLUtils_FrameBuffer.h
 include/salome/Plot2d.h
 include/salome/Plot2d_Curve.h
 include/salome/Plot2d_FitDataDlg.h
@@ -373,12 +371,18 @@ include/salome/VTKViewer_AppendFilter.h
 include/salome/VTKViewer_ArcBuilder.h
 include/salome/VTKViewer_CellLocationsArray.h
 include/salome/VTKViewer_ConvexTool.h
+include/salome/VTKViewer_DataSetMapper.h
 include/salome/VTKViewer_ExtractUnstructuredGrid.h
 include/salome/VTKViewer_Filter.h
 include/salome/VTKViewer_FramedTextActor.h
 include/salome/VTKViewer_Functor.h
 include/salome/VTKViewer_GeometryFilter.h
 include/salome/VTKViewer_InteractorStyle.h
+include/salome/VTKViewer_MarkerDef.h
+include/salome/VTKViewer_MarkerDlg.h
+include/salome/VTKViewer_MarkerUtils.h
+include/salome/VTKViewer_MarkerWidget.h
+include/salome/VTKViewer_PolyDataMapper.h
 include/salome/VTKViewer_RenderWindow.h
 include/salome/VTKViewer_RenderWindowInteractor.h
 include/salome/VTKViewer_ShrinkFilter.h
@@ -390,10 +394,12 @@ include/salome/VTKViewer_ViewManager.h
 include/salome/VTKViewer_ViewModel.h
 include/salome/VTKViewer_ViewWindow.h
 include/salome/libSALOME_Swig.i
-%%CPPUNIT%%include/salome/SalomeAppTest.hxx
 %%PYTHON_SITELIBDIR%%/salome/SalomeApp/__init__.py
 %%PYTHON_SITELIBDIR%%/salome/SalomeApp_Engine_idl.py
 %%PYTHON_SITELIBDIR%%/salome/SalomeApp__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/salome/salome_pluginsmanager.py
+%%PYTHON_SITELIBDIR%%/salome/salome_pluginsmanager.pyc
+%%PYTHON_SITELIBDIR%%/salome/salome_pluginsmanager.pyo
 %%PYTHON_SITELIBDIR%%/salome/shared_modules/SALOMEGUI_shared_modules.py
 %%PYTHON_SITELIBDIR%%/salome/shared_modules/SALOMEGUI_shared_modules.pyc
 %%PYTHON_SITELIBDIR%%/salome/shared_modules/SALOMEGUI_shared_modules.pyo
@@ -428,6 +434,9 @@ lib/salome/libOCCViewer.so.0
 lib/salome/libObjBrowser.la
 lib/salome/libObjBrowser.so
 lib/salome/libObjBrowser.so.0
+lib/salome/libOpenGLUtils.la
+lib/salome/libOpenGLUtils.so
+lib/salome/libOpenGLUtils.so.0
 lib/salome/libPlot2d.la
 lib/salome/libPlot2d.so
 lib/salome/libPlot2d.so.0
@@ -506,161 +515,161 @@ lib/salome/libstd.so.0
 lib/salome/libsuit.la
 lib/salome/libsuit.so
 lib/salome/libsuit.so.0
-%%CPPUNIT%%lib/salome/libSalomeAppTest.la
-%%CPPUNIT%%lib/salome/libSalomeAppTest.so
-%%CPPUNIT%%lib/salome/libSalomeAppTest.so.0
-share/salome/resources/gui/CAF_msg_en.qm
-share/salome/resources/gui/CAM_msg_en.qm
-share/salome/resources/gui/GLViewer_images.qm
-share/salome/resources/gui/GLViewer_msg_en.qm
-share/salome/resources/gui/LightApp.ini
-share/salome/resources/gui/LightApp.xml
-share/salome/resources/gui/LightApp_images.qm
-share/salome/resources/gui/LightApp_msg_en.qm
-share/salome/resources/gui/LogWindow_msg_en.qm
-share/salome/resources/gui/OB_msg_en.qm
-share/salome/resources/gui/OCCViewer_images.qm
-share/salome/resources/gui/OCCViewer_msg_en.qm
-share/salome/resources/gui/Plot2d_images.qm
-share/salome/resources/gui/Plot2d_msg_en.qm
-share/salome/resources/gui/PyConsole_msg_en.qm
-share/salome/resources/gui/QDS_msg_en.qm
-share/salome/resources/gui/QxSceneViewer_images.qm
-share/salome/resources/gui/QxSceneViewer_msg_en.qm
-share/salome/resources/gui/STD_images.qm
-share/salome/resources/gui/STD_msg_en.qm
-share/salome/resources/gui/SUITApp_msg_en.qm
-share/salome/resources/gui/SUIT_msg_en.qm
-share/salome/resources/gui/SUPERVGraph_images.qm
-share/salome/resources/gui/SUPERVGraph_msg_en.qm
-share/salome/resources/gui/SVTK_images.qm
-share/salome/resources/gui/SVTK_msg_en.qm
-share/salome/resources/gui/SalomeApp.ini
-share/salome/resources/gui/SalomeApp.xml
-share/salome/resources/gui/SalomeApp_images.qm
-share/salome/resources/gui/SalomeApp_msg_en.qm
-share/salome/resources/gui/SalomeStyle.xml
-share/salome/resources/gui/ToolsGUI_msg_en.qm
-share/salome/resources/gui/VTKViewer_images.qm
-share/salome/resources/gui/VTKViewer_msg_en.qm
-share/salome/resources/gui/cascade.png
-share/salome/resources/gui/close.png
-share/salome/resources/gui/copy.png
-share/salome/resources/gui/cut.png
-share/salome/resources/gui/delete.png
-share/salome/resources/gui/gl_cursor_rotate.png
-share/salome/resources/gui/gl_cursor_sketch.png
-share/salome/resources/gui/gl_cursor_zoom.png
-share/salome/resources/gui/gl_view_dump.png
-share/salome/resources/gui/gl_view_fitall.png
-share/salome/resources/gui/gl_view_fitarea.png
-share/salome/resources/gui/gl_view_fitselect.png
-share/salome/resources/gui/gl_view_glpan.png
-share/salome/resources/gui/gl_view_pan.png
-share/salome/resources/gui/gl_view_reset.png
-share/salome/resources/gui/gl_view_zoom.png
-share/salome/resources/gui/help.png
-share/salome/resources/gui/htile.png
-share/salome/resources/gui/icon_about.png
-share/salome/resources/gui/icon_applogo.png
-share/salome/resources/gui/icon_default.png
-share/salome/resources/gui/icon_module.png
-share/salome/resources/gui/icon_module_big.png
-share/salome/resources/gui/icon_select.png
-share/salome/resources/gui/new.png
-share/salome/resources/gui/occ_view_ambient.png
-share/salome/resources/gui/occ_view_back.png
-share/salome/resources/gui/occ_view_bottom.png
-share/salome/resources/gui/occ_view_camera_dump.png
-share/salome/resources/gui/occ_view_clipping.png
-share/salome/resources/gui/occ_view_clipping_pressed.png
-share/salome/resources/gui/occ_view_clone.png
-share/salome/resources/gui/occ_view_fitall.png
-share/salome/resources/gui/occ_view_fitarea.png
-share/salome/resources/gui/occ_view_front.png
-share/salome/resources/gui/occ_view_glpan.png
-share/salome/resources/gui/occ_view_left.png
-share/salome/resources/gui/occ_view_pan.png
-share/salome/resources/gui/occ_view_presets.png
-share/salome/resources/gui/occ_view_reset.png
-share/salome/resources/gui/occ_view_right.png
-share/salome/resources/gui/occ_view_rotate.png
-share/salome/resources/gui/occ_view_rotation_point.png
-share/salome/resources/gui/occ_view_scaling.png
-share/salome/resources/gui/occ_view_shoot.png
-share/salome/resources/gui/occ_view_top.png
-share/salome/resources/gui/occ_view_triedre.png
-share/salome/resources/gui/occ_view_zoom.png
-share/salome/resources/gui/open.png
-share/salome/resources/gui/paste.png
-share/salome/resources/gui/plot2d_camera_dump.png
-share/salome/resources/gui/plot2d_clone.png
-share/salome/resources/gui/plot2d_fitall.png
-share/salome/resources/gui/plot2d_fitarea.png
-share/salome/resources/gui/plot2d_glpan.png
-share/salome/resources/gui/plot2d_legend.png
-share/salome/resources/gui/plot2d_linear.png
-share/salome/resources/gui/plot2d_linear_y.png
-share/salome/resources/gui/plot2d_lines.png
-share/salome/resources/gui/plot2d_log.png
-share/salome/resources/gui/plot2d_log_y.png
-share/salome/resources/gui/plot2d_pan.png
-share/salome/resources/gui/plot2d_points.png
-share/salome/resources/gui/plot2d_settings.png
-share/salome/resources/gui/plot2d_splines.png
-share/salome/resources/gui/plot2d_zoom.png
-share/salome/resources/gui/print.png
-share/salome/resources/gui/qx_view_fitall.png
-share/salome/resources/gui/qx_view_fitarea.png
-share/salome/resources/gui/qx_view_glpan.png
-share/salome/resources/gui/qx_view_pan.png
-share/salome/resources/gui/qx_view_reset.png
-share/salome/resources/gui/qx_view_zoom.png
-share/salome/resources/gui/redo.png
-share/salome/resources/gui/reset.png
-share/salome/resources/gui/save.png
-share/salome/resources/gui/std.ini
-share/salome/resources/gui/superv_view_pan.png
-share/salome/resources/gui/superv_view_reset.png
-share/salome/resources/gui/undo.png
-share/salome/resources/gui/vtile.png
-share/salome/resources/gui/vtk_view_back.png
-share/salome/resources/gui/vtk_view_bottom.png
-share/salome/resources/gui/vtk_view_camera_dump.png
-share/salome/resources/gui/vtk_view_fitall.png
-share/salome/resources/gui/vtk_view_fitarea.png
-share/salome/resources/gui/vtk_view_front.png
-share/salome/resources/gui/vtk_view_glpan.png
-share/salome/resources/gui/vtk_view_graduated_axes.png
-share/salome/resources/gui/vtk_view_left.png
-share/salome/resources/gui/vtk_view_pan.png
-share/salome/resources/gui/vtk_view_parallel.png
-share/salome/resources/gui/vtk_view_parameters.png
-share/salome/resources/gui/vtk_view_perspective.png
-share/salome/resources/gui/vtk_view_recording_pause.png
-share/salome/resources/gui/vtk_view_recording_play.png
-share/salome/resources/gui/vtk_view_recording_start.png
-share/salome/resources/gui/vtk_view_recording_stop.png
-share/salome/resources/gui/vtk_view_reset.png
-share/salome/resources/gui/vtk_view_right.png
-share/salome/resources/gui/vtk_view_rotate.png
-share/salome/resources/gui/vtk_view_rotation_point.png
-share/salome/resources/gui/vtk_view_scaling.png
-share/salome/resources/gui/vtk_view_style_switch.png
-share/salome/resources/gui/vtk_view_top.png
-share/salome/resources/gui/vtk_view_triedre.png
-share/salome/resources/gui/vtk_view_update_rate.png
-share/salome/resources/gui/vtk_view_zoom.png
-@dirrm share/salome/resources/gui
-@dirrmtry share/salome/resources
-@dirrmtry share/salome
-@dirrmtry lib/salome
+%%DATADIR%%/resources/gui/CAF_msg_en.qm
+%%DATADIR%%/resources/gui/CAM_msg_en.qm
+%%DATADIR%%/resources/gui/GLViewer_images.qm
+%%DATADIR%%/resources/gui/GLViewer_msg_en.qm
+%%DATADIR%%/resources/gui/LightApp.ini
+%%DATADIR%%/resources/gui/LightApp.xml
+%%DATADIR%%/resources/gui/LightApp_images.qm
+%%DATADIR%%/resources/gui/LightApp_msg_en.qm
+%%DATADIR%%/resources/gui/LogWindow_msg_en.qm
+%%DATADIR%%/resources/gui/OB_msg_en.qm
+%%DATADIR%%/resources/gui/OCCViewer_images.qm
+%%DATADIR%%/resources/gui/OCCViewer_msg_en.qm
+%%DATADIR%%/resources/gui/Plot2d_images.qm
+%%DATADIR%%/resources/gui/Plot2d_msg_en.qm
+%%DATADIR%%/resources/gui/PyConsole_msg_en.qm
+%%DATADIR%%/resources/gui/QDS_msg_en.qm
+%%DATADIR%%/resources/gui/QxSceneViewer_images.qm
+%%DATADIR%%/resources/gui/QxSceneViewer_msg_en.qm
+%%DATADIR%%/resources/gui/STD_images.qm
+%%DATADIR%%/resources/gui/STD_msg_en.qm
+%%DATADIR%%/resources/gui/SUITApp_msg_en.qm
+%%DATADIR%%/resources/gui/SUIT_msg_en.qm
+%%DATADIR%%/resources/gui/SUPERVGraph_images.qm
+%%DATADIR%%/resources/gui/SUPERVGraph_msg_en.qm
+%%DATADIR%%/resources/gui/SVTK_images.qm
+%%DATADIR%%/resources/gui/SVTK_msg_en.qm
+%%DATADIR%%/resources/gui/SalomeApp.ini
+%%DATADIR%%/resources/gui/SalomeApp.xml
+%%DATADIR%%/resources/gui/SalomeApp_images.qm
+%%DATADIR%%/resources/gui/SalomeApp_msg_en.qm
+%%DATADIR%%/resources/gui/SalomeStyle.xml
+%%DATADIR%%/resources/gui/ToolsGUI_msg_en.qm
+%%DATADIR%%/resources/gui/VTKViewer_images.qm
+%%DATADIR%%/resources/gui/VTKViewer_msg_en.qm
+%%DATADIR%%/resources/gui/cascade.png
+%%DATADIR%%/resources/gui/close.png
+%%DATADIR%%/resources/gui/copy.png
+%%DATADIR%%/resources/gui/cut.png
+%%DATADIR%%/resources/gui/delete.png
+%%DATADIR%%/resources/gui/gl_cursor_rotate.png
+%%DATADIR%%/resources/gui/gl_cursor_sketch.png
+%%DATADIR%%/resources/gui/gl_cursor_zoom.png
+%%DATADIR%%/resources/gui/gl_view_dump.png
+%%DATADIR%%/resources/gui/gl_view_fitall.png
+%%DATADIR%%/resources/gui/gl_view_fitarea.png
+%%DATADIR%%/resources/gui/gl_view_fitselect.png
+%%DATADIR%%/resources/gui/gl_view_glpan.png
+%%DATADIR%%/resources/gui/gl_view_pan.png
+%%DATADIR%%/resources/gui/gl_view_reset.png
+%%DATADIR%%/resources/gui/gl_view_zoom.png
+%%DATADIR%%/resources/gui/help.png
+%%DATADIR%%/resources/gui/htile.png
+%%DATADIR%%/resources/gui/icon_about.png
+%%DATADIR%%/resources/gui/icon_applogo.png
+%%DATADIR%%/resources/gui/icon_default.png
+%%DATADIR%%/resources/gui/icon_module.png
+%%DATADIR%%/resources/gui/icon_module_big.png
+%%DATADIR%%/resources/gui/icon_select.png
+%%DATADIR%%/resources/gui/marker_1.png
+%%DATADIR%%/resources/gui/marker_2.png
+%%DATADIR%%/resources/gui/marker_3.png
+%%DATADIR%%/resources/gui/marker_4.png
+%%DATADIR%%/resources/gui/marker_5.png
+%%DATADIR%%/resources/gui/marker_6.png
+%%DATADIR%%/resources/gui/marker_7.png
+%%DATADIR%%/resources/gui/marker_8.png
+%%DATADIR%%/resources/gui/marker_9.png
+%%DATADIR%%/resources/gui/new.png
+%%DATADIR%%/resources/gui/occ_view_ambient.png
+%%DATADIR%%/resources/gui/occ_view_back.png
+%%DATADIR%%/resources/gui/occ_view_bottom.png
+%%DATADIR%%/resources/gui/occ_view_camera_dump.png
+%%DATADIR%%/resources/gui/occ_view_clipping.png
+%%DATADIR%%/resources/gui/occ_view_clipping_pressed.png
+%%DATADIR%%/resources/gui/occ_view_clone.png
+%%DATADIR%%/resources/gui/occ_view_fitall.png
+%%DATADIR%%/resources/gui/occ_view_fitarea.png
+%%DATADIR%%/resources/gui/occ_view_front.png
+%%DATADIR%%/resources/gui/occ_view_glpan.png
+%%DATADIR%%/resources/gui/occ_view_left.png
+%%DATADIR%%/resources/gui/occ_view_pan.png
+%%DATADIR%%/resources/gui/occ_view_presets.png
+%%DATADIR%%/resources/gui/occ_view_reset.png
+%%DATADIR%%/resources/gui/occ_view_right.png
+%%DATADIR%%/resources/gui/occ_view_rotate.png
+%%DATADIR%%/resources/gui/occ_view_rotation_point.png
+%%DATADIR%%/resources/gui/occ_view_scaling.png
+%%DATADIR%%/resources/gui/occ_view_shoot.png
+%%DATADIR%%/resources/gui/occ_view_top.png
+%%DATADIR%%/resources/gui/occ_view_triedre.png
+%%DATADIR%%/resources/gui/occ_view_zoom.png
+%%DATADIR%%/resources/gui/open.png
+%%DATADIR%%/resources/gui/paste.png
+%%DATADIR%%/resources/gui/plot2d_camera_dump.png
+%%DATADIR%%/resources/gui/plot2d_clone.png
+%%DATADIR%%/resources/gui/plot2d_fitall.png
+%%DATADIR%%/resources/gui/plot2d_fitarea.png
+%%DATADIR%%/resources/gui/plot2d_glpan.png
+%%DATADIR%%/resources/gui/plot2d_legend.png
+%%DATADIR%%/resources/gui/plot2d_linear.png
+%%DATADIR%%/resources/gui/plot2d_linear_y.png
+%%DATADIR%%/resources/gui/plot2d_lines.png
+%%DATADIR%%/resources/gui/plot2d_log.png
+%%DATADIR%%/resources/gui/plot2d_log_y.png
+%%DATADIR%%/resources/gui/plot2d_pan.png
+%%DATADIR%%/resources/gui/plot2d_points.png
+%%DATADIR%%/resources/gui/plot2d_settings.png
+%%DATADIR%%/resources/gui/plot2d_splines.png
+%%DATADIR%%/resources/gui/plot2d_zoom.png
+%%DATADIR%%/resources/gui/print.png
+%%DATADIR%%/resources/gui/qx_view_fitall.png
+%%DATADIR%%/resources/gui/qx_view_fitarea.png
+%%DATADIR%%/resources/gui/qx_view_glpan.png
+%%DATADIR%%/resources/gui/qx_view_pan.png
+%%DATADIR%%/resources/gui/qx_view_reset.png
+%%DATADIR%%/resources/gui/qx_view_zoom.png
+%%DATADIR%%/resources/gui/redo.png
+%%DATADIR%%/resources/gui/reset.png
+%%DATADIR%%/resources/gui/save.png
+%%DATADIR%%/resources/gui/std.ini
+%%DATADIR%%/resources/gui/superv_view_pan.png
+%%DATADIR%%/resources/gui/superv_view_reset.png
+%%DATADIR%%/resources/gui/undo.png
+%%DATADIR%%/resources/gui/vtile.png
+%%DATADIR%%/resources/gui/vtk_view_back.png
+%%DATADIR%%/resources/gui/vtk_view_bottom.png
+%%DATADIR%%/resources/gui/vtk_view_camera_dump.png
+%%DATADIR%%/resources/gui/vtk_view_fitall.png
+%%DATADIR%%/resources/gui/vtk_view_fitarea.png
+%%DATADIR%%/resources/gui/vtk_view_front.png
+%%DATADIR%%/resources/gui/vtk_view_glpan.png
+%%DATADIR%%/resources/gui/vtk_view_graduated_axes.png
+%%DATADIR%%/resources/gui/vtk_view_left.png
+%%DATADIR%%/resources/gui/vtk_view_pan.png
+%%DATADIR%%/resources/gui/vtk_view_parallel.png
+%%DATADIR%%/resources/gui/vtk_view_parameters.png
+%%DATADIR%%/resources/gui/vtk_view_perspective.png
+%%DATADIR%%/resources/gui/vtk_view_recording_pause.png
+%%DATADIR%%/resources/gui/vtk_view_recording_play.png
+%%DATADIR%%/resources/gui/vtk_view_recording_start.png
+%%DATADIR%%/resources/gui/vtk_view_recording_stop.png
+%%DATADIR%%/resources/gui/vtk_view_reset.png
+%%DATADIR%%/resources/gui/vtk_view_right.png
+%%DATADIR%%/resources/gui/vtk_view_rotate.png
+%%DATADIR%%/resources/gui/vtk_view_rotation_point.png
+%%DATADIR%%/resources/gui/vtk_view_scaling.png
+%%DATADIR%%/resources/gui/vtk_view_style_switch.png
+%%DATADIR%%/resources/gui/vtk_view_top.png
+%%DATADIR%%/resources/gui/vtk_view_triedre.png
+%%DATADIR%%/resources/gui/vtk_view_update_rate.png
+%%DATADIR%%/resources/gui/vtk_view_zoom.png
+@dirrm %%DATADIR%%/resources/gui
 @dirrmtry %%PYTHON_SITELIBDIR%%/salome/shared_modules
-@dirrm %%PYTHON_SITELIBDIR%%/salome/SalomeApp__POA
-@dirrm %%PYTHON_SITELIBDIR%%/salome/SalomeApp
-@dirrmtry %%PYTHON_SITELIBDIR%%/salome
-@dirrmtry idl/salome
-@dirrmtry idl
+@dirrmtry %%PYTHON_SITELIBDIR%%/salome/SalomeApp__POA
+@dirrmtry %%PYTHON_SITELIBDIR%%/salome/SalomeApp
 @dirrmtry adm_local/unix/config_files
 @dirrmtry adm_local/unix
 @dirrmtry adm_local/cmake_files