From: nds <nds@opencascade.com>
Date: Wed, 8 Oct 2008 04:26:38 +0000 (+0000)
Subject: Merging GUI_SRC module with the BR_V5_DEV branch.
X-Git-Tag: TG_mergeto_BR_V5_DEV_finished~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a1c8c4be21880b5f695534785d8562b5115c0dad;p=modules%2Fgui.git

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 0e367cee9..81c06277b 100755
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 d4aa312d4..0140fcc98 100755
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 e783449c4..7acc8fe79 100755
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 667189e22..978945284 100755
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 1a6d7113c..fb62cd772 100755
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 6958828c6..825d59edb 100755
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 15d914afa..3cdea33dd 100755
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 b6137462c..64df2460b 100755
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 71f37f943..06a95572d 100755
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 b51c7481e..e60fc4939 100644
--- 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 d23d48393..6fe032273 100644
--- 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);