Merging GUI_SRC module with the BR_V5_DEV branch.

diff --git a/src/Plot2d/resources/plot2d_legend.png b/src/Plot2d/resources/plot2d_legend.png
index 0e367cee9bf1917f23aad0692270538b6f78ef80..81c06277b4f1d65c661c16b6209c9cbd2c700de4 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_legend.png and b/src/Plot2d/resources/plot2d_legend.png differ

diff --git a/src/Plot2d/resources/plot2d_linear.png b/src/Plot2d/resources/plot2d_linear.png
index d4aa312d40238013ee910b4d6d30cfc958e76e24..0140fcc9874aa12603941a4600f0555929d097d6 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_linear.png and b/src/Plot2d/resources/plot2d_linear.png differ

diff --git a/src/Plot2d/resources/plot2d_linear_y.png b/src/Plot2d/resources/plot2d_linear_y.png
index e783449c4c539843e09d98327ec16df9d601b1fb..7acc8fe79ed852c978baf3e7af4c62501c3e269c 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_linear_y.png and b/src/Plot2d/resources/plot2d_linear_y.png differ

diff --git a/src/Plot2d/resources/plot2d_lines.png b/src/Plot2d/resources/plot2d_lines.png
index 667189e22d7dfe0a7926c544e2129750a5468a55..9789452845376333452f55f398bcc3f9e4124bc4 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_lines.png and b/src/Plot2d/resources/plot2d_lines.png differ

diff --git a/src/Plot2d/resources/plot2d_log.png b/src/Plot2d/resources/plot2d_log.png
index 1a6d7113c9b98294165a9b77b8df4598cfb6392c..fb62cd77242c43e92c8dd638560f0ce535fae6fb 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_log.png and b/src/Plot2d/resources/plot2d_log.png differ

diff --git a/src/Plot2d/resources/plot2d_log_y.png b/src/Plot2d/resources/plot2d_log_y.png
index 6958828c63b97191eee9b28d11d90c70673484e5..825d59edbabe2880137e8a8f6537a7124335edef 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_log_y.png and b/src/Plot2d/resources/plot2d_log_y.png differ

diff --git a/src/Plot2d/resources/plot2d_points.png b/src/Plot2d/resources/plot2d_points.png
index 15d914afa9d3fdcd992085ddbfc6413ed6ace64c..3cdea33dde6e749d0c718bc4f2c640d5fccad1c1 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_points.png and b/src/Plot2d/resources/plot2d_points.png differ

diff --git a/src/Plot2d/resources/plot2d_settings.png b/src/Plot2d/resources/plot2d_settings.png
index b6137462cbf4845760b2cdea96f425c5f7f6a120..64df2460b754730b6147340d542bd8906eeb292b 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_settings.png and b/src/Plot2d/resources/plot2d_settings.png differ

diff --git a/src/Plot2d/resources/plot2d_splines.png b/src/Plot2d/resources/plot2d_splines.png
index 71f37f943db548c0c43f026c0d16797c96b2a066..06a95572db8bb67fe21ae249da802c8da1091026 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_splines.png and b/src/Plot2d/resources/plot2d_splines.png differ

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index b51c7481e85b602e88bfb227319df59c428c83bf..e60fc49397821febef4ecdccb49d1b9976b0ce1e 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -119,4 +119,7 @@ ICONS   = resources/*.png
 includes.files = $$HEADERS
 includes.path = ../../include
 
-INSTALLS += includes
+resources.files = $$ICONS
+resources.path = ../../resources
+
+INSTALLS += includes resources

diff --git a/src/SVTK/SVTK_MainWindow.cxx b/src/SVTK/SVTK_MainWindow.cxx
index d23d48393e005d88e6d4c38eada44e9f412a0eed..6fe0322738626e745b09e1e41a36059541ead78d 100644 (file)
--- a/src/SVTK/SVTK_MainWindow.cxx
+++ b/src/SVTK/SVTK_MainWindow.cxx
@@ -484,7 +484,7 @@ SVTK_MainWindow
 
   // Change rotation point
   anAction = new QtxAction(tr("MNU_CHANGINGROTATIONPOINT_VIEW"), 
-                          theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_ROTATION_POINT" ) ),
+                          theResourceMgr->loadPixmap( "SVTK", tr( "ICON_SVTK_ROTATION_POINT" ) ),
                           tr( "MNU_CHANGINGROTATIONPOINT_VIEW" ), 0, this);
   anAction->setStatusTip(tr("DSC_CHANGINGROTATIONPOINT_VIEW"));
   anAction->setCheckable(true);
@@ -560,7 +560,7 @@ SVTK_MainWindow
 
   // onNonIsometric: Manage non-isometric params
   anAction = new QtxAction(tr("MNU_SVTK_SCALING"), 
-                          theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_SCALING" ) ),
+                          theResourceMgr->loadPixmap( "SVTK", tr( "ICON_SVTK_SCALING" ) ),
                           tr( "MNU_SVTK_SCALING" ), 0, this);
   anAction->setStatusTip(tr("DSC_SVTK_SCALING"));
   anAction->setCheckable(true);
@@ -569,7 +569,7 @@ SVTK_MainWindow
 
   // onGraduatedAxes: Manage graduated axes params
   anAction = new QtxAction(tr("MNU_SVTK_GRADUATED_AXES"), 
-                          theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_GRADUATED_AXES" ) ),
+                          theResourceMgr->loadPixmap( "SVTK", tr( "ICON_SVTK_GRADUATED_AXES" ) ),
                           tr( "MNU_SVTK_GRADUATED_AXES" ), 0, this);
   anAction->setStatusTip(tr("DSC_SVTK_GRADUATED_AXES"));
   anAction->setCheckable(true);
@@ -578,7 +578,7 @@ SVTK_MainWindow
 
   // onGraduatedAxes: Manage graduated axes params
   anAction = new QtxAction(tr("MNU_SVTK_UPDATE_RATE"), 
-                          theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_UPDATE_RATE" ) ),
+                          theResourceMgr->loadPixmap( "SVTK", tr( "ICON_SVTK_UPDATE_RATE" ) ),
                           tr( "MNU_SVTK_UPDATE_RATE" ), 0, this);
   anAction->setStatusTip(tr("DSC_SVTK_UPDATE_RATE"));
   anAction->setCheckable(true);