Merging GUI_SRC module with the BR_V5_DEV branch.

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index ffa0bdca7f4895d280aedf0add55a180342c28f8..4316ef3dc59e31bc397e47e349265a2370c85373 100644 (file)
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_Actor.h
@@ -61,10 +61,6 @@ SVTK_EXPORT extern int SALOME_LINE_WIDTH;
 #pragma warning ( disable:4251 )
 #endif
 
-#ifdef WIN32
-#pragma warning ( disable:4251 )
-#endif
-
 //! The class is a basic one for all SALOME VTK presentation.
 /*!
   It provide highlight and prehighlight capabilites,

diff --git a/src/SVTK/SVTK_MainWindow.h b/src/SVTK/SVTK_MainWindow.h
index b2e892634d9d9080adf03d39c6a2755dac90900e..f3500a5350e974da6e984cc08e6e53177d85cac7 100644 (file)
--- a/src/SVTK/SVTK_MainWindow.h
+++ b/src/SVTK/SVTK_MainWindow.h
@@ -27,7 +27,6 @@
 #include "SVTK_Selection.h"
 
 #include <QMainWindow>
-#include <QMap>
 
 #include <vtkSmartPointer.h>
 
@@ -259,7 +258,7 @@ public:
         ChangeRotationPointId, RotationId,
          FrontId, BackId, TopId, BottomId, LeftId, RightId, ResetId, 
         ViewTrihedronId, NonIsometric, GraduatedAxes, UpdateRate,
-         TextRegion, PrintId };
+        TextRegion, PrintId };
 
   SUIT_ViewWindow* myViewWindow;
 

diff --git a/src/SVTK/resources/SVTK_images.ts b/src/SVTK/resources/SVTK_images.ts
index 6330af3497bd00d6cc40bbcd2a4d330716b90be2..977be80357555d02aba875b2c087eb51489495c3 100644 (file)
--- a/src/SVTK/resources/SVTK_images.ts
+++ b/src/SVTK/resources/SVTK_images.ts
@@ -2,16 +2,20 @@
 <context>
     <name>@default</name>
     <message>
-        <source>ICON_GRADUATED_AXES</source>
-        <translation>view_graduated_axes.png</translation>
+        <source>ICON_SVTK_ROTATION_POINT</source>
+        <translation>vtk_view_rotation_point.png</translation>
+    </message>
+    <message>
+        <source>ICON_SVTK_GRADUATED_AXES</source>
+        <translation>vtk_view_graduated_axes.png</translation>
     </message>
     <message>
         <source>ICON_SVTK_SCALING</source>
-        <translation>view_scaling.png</translation>
+        <translation>vtk_view_scaling.png</translation>
     </message>
     <message>
-        <source>ICON_UPDATE_RATE</source>
-        <translation>view_update_rate.png</translation>
+        <source>ICON_SVTK_UPDATE_RATE</source>
+        <translation>vtk_view_update_rate.png</translation>
     </message>
     <message>
         <source>ICON_TEXT_REGION</source>

diff --git a/src/SVTK/resources/SVTK_msg_en.ts b/src/SVTK/resources/SVTK_msg_en.ts
index 363196d173b60de88da6a2453e8b9c7523056529..280a59de7b0798bcde737ca94a6f2a86ff3712e8 100644 (file)
--- a/src/SVTK/resources/SVTK_msg_en.ts
+++ b/src/SVTK/resources/SVTK_msg_en.ts
@@ -155,7 +155,27 @@
     </message>
 </context>
 <context>
-    <name>SVTK_AxisWidget</name>
+    <name>SVTK_CubeAxesDlg</name>
+    <message>
+        <source>X_AXIS</source>
+        <translation>X axis</translation>
+    </message>
+    <message>
+        <source>Y_AXIS</source>
+        <translation>Y axis</translation>
+    </message>
+    <message>
+        <source>Z_AXIS</source>
+        <translation>Z axis</translation>
+    </message>
+    <message>
+        <source>CAPTION</source>
+        <translation>Graduated axes</translation>
+    </message>
+    <message>
+        <source>IS_VISIBLE</source>
+        <translation>Is visible</translation>
+    </message>
     <message>
         <source>FONT</source>
         <translation>Font</translation>
@@ -184,38 +204,11 @@
         <source>OFFSET</source>
         <translation>Offset</translation>
     </message>
-    <message>
-        <source>IS_VISIBLE</source>
-        <translation>Is visible</translation>
-    </message>
     <message>
         <source>AXIS_NAME</source>
         <translation>Axis name</translation>
     </message>
 </context>
-<context>
-    <name>SVTK_CubeAxesDlg</name>
-    <message>
-        <source>X_AXIS</source>
-        <translation>X axis</translation>
-    </message>
-    <message>
-        <source>Y_AXIS</source>
-        <translation>Y axis</translation>
-    </message>
-    <message>
-        <source>Z_AXIS</source>
-        <translation>Z axis</translation>
-    </message>
-    <message>
-        <source>CAPTION</source>
-        <translation>Graduated axes</translation>
-    </message>
-    <message>
-        <source>IS_VISIBLE</source>
-        <translation>Is visible</translation>
-    </message>
-</context>
 <context>
     <name>SVTK_FontWidget</name>
     <message>
@@ -290,15 +283,15 @@
     <name>SVTK_NonIsometricDlg</name>
     <message>
         <source>LBL_X</source>
-        <translation>X :</translation>
+        <translation>X:</translation>
     </message>
     <message>
         <source>LBL_Y</source>
-        <translation>Y :</translation>
+        <translation>Y:</translation>
     </message>
     <message>
         <source>LBL_Z</source>
-        <translation>Z :</translation>
+        <translation>Z:</translation>
     </message>
     <message>
         <source>MEN_SCALING</source>
@@ -313,15 +306,15 @@
     <name>SVTK_SetRotationPointDlg</name>
     <message>
         <source>LBL_X</source>
-        <translation>X :</translation>
+        <translation>X:</translation>
     </message>
     <message>
         <source>LBL_Y</source>
-        <translation>Y :</translation>
+        <translation>Y:</translation>
     </message>
     <message>
         <source>LBL_Z</source>
-        <translation>Z :</translation>
+        <translation>Z:</translation>
     </message>
     <message>
         <source>LBL_CENTER_OF_BOUNDING_BOX</source>

diff --git a/src/VTKViewer/resources/VTKViewer_images.ts b/src/VTKViewer/resources/VTKViewer_images.ts
index d55a359009ea36252f1a89a52bc8bfdb27a0cfa9..4b79bbe2e810d8110d50dbf26ead39ca7907eb8b 100644 (file)
--- a/src/VTKViewer/resources/VTKViewer_images.ts
+++ b/src/VTKViewer/resources/VTKViewer_images.ts
@@ -3,67 +3,63 @@
     <name>@default</name>
     <message>
         <source>ICON_VTKVIEWER_VIEW_GLOBALPAN</source>
-        <translation>view_glpan.png</translation>
+        <translation>vtk_view_glpan.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_FITAREA</source>
-        <translation>view_fitarea.png</translation>
+        <translation>vtk_view_fitarea.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_FRONT</source>
-        <translation>view_front.png</translation>
+        <translation>vtk_view_front.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_RESET</source>
-        <translation>view_reset.png</translation>
+        <translation>vtk_view_reset.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_RIGHT</source>
-        <translation>view_right.png</translation>
+        <translation>vtk_view_right.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_FITALL</source>
-        <translation>view_fitall.png</translation>
+        <translation>vtk_view_fitall.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_BOTTOM</source>
-        <translation>view_bottom.png</translation>
+        <translation>vtk_view_bottom.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_TOP</source>
-        <translation>view_top.png</translation>
+        <translation>vtk_view_top.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_PAN</source>
-        <translation>view_pan.png</translation>
+        <translation>vtk_view_pan.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_ROTATE</source>
-        <translation>view_rotate.png</translation>
-    </message>
-    <message>
-        <source>ICON_VTKVIEWER_VIEW_ROTATION_POINT</source>
-        <translation>view_rotation_point.png</translation>
+        <translation>vtk_view_rotate.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_DUMP</source>
-        <translation>view_camera_dump.png</translation>
+        <translation>vtk_view_camera_dump.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_BACK</source>
-        <translation>view_back.png</translation>
+        <translation>vtk_view_back.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_ZOOM</source>
-        <translation>view_zoom.png</translation>
+        <translation>vtk_view_zoom.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_LEFT</source>
-        <translation>view_left.png</translation>
+        <translation>vtk_view_left.png</translation>
     </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_TRIHEDRON</source>
-        <translation>view_triedre.png</translation>
+        <translation>vtk_view_triedre.png</translation>
     </message>
 </context>
 </TS>

diff --git a/src/VTKViewer/resources/view_back.png b/src/VTKViewer/resources/view_back.png
deleted file mode 100755 (executable)
index 51beb0c..0000000
Binary files a/src/VTKViewer/resources/view_back.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_bottom.png b/src/VTKViewer/resources/view_bottom.png
deleted file mode 100755 (executable)
index fa558e2..0000000
Binary files a/src/VTKViewer/resources/view_bottom.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_camera_dump.png b/src/VTKViewer/resources/view_camera_dump.png
deleted file mode 100755 (executable)
index b02616f..0000000
Binary files a/src/VTKViewer/resources/view_camera_dump.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_fitall.png b/src/VTKViewer/resources/view_fitall.png
deleted file mode 100755 (executable)
index 87e001d..0000000
Binary files a/src/VTKViewer/resources/view_fitall.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_fitarea.png b/src/VTKViewer/resources/view_fitarea.png
deleted file mode 100755 (executable)
index 450dc56..0000000
Binary files a/src/VTKViewer/resources/view_fitarea.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_front.png b/src/VTKViewer/resources/view_front.png
deleted file mode 100755 (executable)
index d917960..0000000
Binary files a/src/VTKViewer/resources/view_front.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_glpan.png b/src/VTKViewer/resources/view_glpan.png
deleted file mode 100755 (executable)
index c23322a..0000000
Binary files a/src/VTKViewer/resources/view_glpan.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_graduated_axes.png b/src/VTKViewer/resources/view_graduated_axes.png
deleted file mode 100755 (executable)
index 2b44c06..0000000
Binary files a/src/VTKViewer/resources/view_graduated_axes.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_left.png b/src/VTKViewer/resources/view_left.png
deleted file mode 100755 (executable)
index 1b787b0..0000000
Binary files a/src/VTKViewer/resources/view_left.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_pan.png b/src/VTKViewer/resources/view_pan.png
deleted file mode 100755 (executable)
index ec56cac..0000000
Binary files a/src/VTKViewer/resources/view_pan.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_reset.png b/src/VTKViewer/resources/view_reset.png
deleted file mode 100755 (executable)
index 66f81e6..0000000
Binary files a/src/VTKViewer/resources/view_reset.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_right.png b/src/VTKViewer/resources/view_right.png
deleted file mode 100755 (executable)
index 5c6e161..0000000
Binary files a/src/VTKViewer/resources/view_right.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_rotate.png b/src/VTKViewer/resources/view_rotate.png
deleted file mode 100755 (executable)
index 28ec89f..0000000
Binary files a/src/VTKViewer/resources/view_rotate.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_rotation_point.png b/src/VTKViewer/resources/view_rotation_point.png
deleted file mode 100755 (executable)
index fc303e3..0000000
Binary files a/src/VTKViewer/resources/view_rotation_point.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_scaling.png b/src/VTKViewer/resources/view_scaling.png
deleted file mode 100644 (file)
index fa8cbbc..0000000
Binary files a/src/VTKViewer/resources/view_scaling.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_top.png b/src/VTKViewer/resources/view_top.png
deleted file mode 100755 (executable)
index cef9504..0000000
Binary files a/src/VTKViewer/resources/view_top.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_triedre.png b/src/VTKViewer/resources/view_triedre.png
deleted file mode 100755 (executable)
index bc5894d..0000000
Binary files a/src/VTKViewer/resources/view_triedre.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_update_rate.png b/src/VTKViewer/resources/view_update_rate.png
deleted file mode 100755 (executable)
index 3d01ad1..0000000
Binary files a/src/VTKViewer/resources/view_update_rate.png and /dev/null differ

diff --git a/src/VTKViewer/resources/view_zoom.png b/src/VTKViewer/resources/view_zoom.png
deleted file mode 100755 (executable)
index 386c966..0000000
Binary files a/src/VTKViewer/resources/view_zoom.png and /dev/null differ