From a1c8c4be21880b5f695534785d8562b5115c0dad Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 8 Oct 2008 04:26:38 +0000 Subject: [PATCH] Merging GUI_SRC module with the BR_V5_DEV branch. --- src/Plot2d/resources/plot2d_legend.png | Bin 789 -> 790 bytes src/Plot2d/resources/plot2d_linear.png | Bin 788 -> 789 bytes src/Plot2d/resources/plot2d_linear_y.png | Bin 777 -> 778 bytes src/Plot2d/resources/plot2d_lines.png | Bin 407 -> 408 bytes src/Plot2d/resources/plot2d_log.png | Bin 720 -> 721 bytes src/Plot2d/resources/plot2d_log_y.png | Bin 743 -> 744 bytes src/Plot2d/resources/plot2d_points.png | Bin 342 -> 343 bytes src/Plot2d/resources/plot2d_settings.png | Bin 763 -> 764 bytes src/Plot2d/resources/plot2d_splines.png | Bin 431 -> 432 bytes src/SVTK/SVTK.pro | 5 ++++- src/SVTK/SVTK_MainWindow.cxx | 8 ++++---- 11 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Plot2d/resources/plot2d_legend.png b/src/Plot2d/resources/plot2d_legend.png index 0e367cee9bf1917f23aad0692270538b6f78ef80..81c06277b4f1d65c661c16b6209c9cbd2c700de4 100755 GIT binary patch delta 14 VcmbQrHjRz7Gr-TCcO#1+GXNe@1Azbl delta 13 UcmbQnHkFN~Gr-S%BdZ`Y02^TgbN~PV diff --git a/src/Plot2d/resources/plot2d_linear.png b/src/Plot2d/resources/plot2d_linear.png index d4aa312d40238013ee910b4d6d30cfc958e76e24..0140fcc9874aa12603941a4600f0555929d097d6 100755 GIT binary patch delta 14 VcmbQjHkFOFGr-TCcO#1cGXNen1AYJi delta 13 UcmbQrHieC)Gr-S%BdY*202@aGaR2}S diff --git a/src/Plot2d/resources/plot2d_linear_y.png b/src/Plot2d/resources/plot2d_linear_y.png index e783449c4c539843e09d98327ec16df9d601b1fb..7acc8fe79ed852c978baf3e7af4c62501c3e269c 100755 GIT binary patch delta 14 VcmeBV>tbW=4DfU3-N?eq3;-Pg16=?B delta 13 UcmeBT>tti;4DfT`$jZtL02(O+Pyhe` diff --git a/src/Plot2d/resources/plot2d_lines.png b/src/Plot2d/resources/plot2d_lines.png index 667189e22d7dfe0a7926c544e2129750a5468a55..9789452845376333452f55f398bcc3f9e4124bc4 100755 GIT binary patch delta 14 VcmbQvJcF6FGr-TCcO%PWMgSi_1OEU3 delta 13 UcmbQiJe`@PGr-S%BkN>F031;R@&Et; diff --git a/src/Plot2d/resources/plot2d_log.png b/src/Plot2d/resources/plot2d_log.png index 1a6d7113c9b98294165a9b77b8df4598cfb6392c..fb62cd77242c43e92c8dd638560f0ce535fae6fb 100755 GIT binary patch delta 14 Vcmcb>dXbg2Gr-TCcO%OgCIBU@1g`)9 delta 13 Ucmcb}dV!UtGr-S%BkLI^03t{Pq5uE@ diff --git a/src/Plot2d/resources/plot2d_log_y.png b/src/Plot2d/resources/plot2d_log_y.png index 6958828c63b97191eee9b28d11d90c70673484e5..825d59edbabe2880137e8a8f6537a7124335edef 100755 GIT binary patch delta 14 VcmaFP`hu0UGr-TCcO%PVCIBcf1oQv^ delta 13 UcmaFC`ka-eGr-S%BkN-(03@CS=Kufz diff --git a/src/Plot2d/resources/plot2d_points.png b/src/Plot2d/resources/plot2d_points.png index 15d914afa9d3fdcd992085ddbfc6413ed6ace64c..3cdea33dde6e749d0c718bc4f2c640d5fccad1c1 100755 GIT binary patch delta 14 Vcmcb{be)N{Gr-TCcOy#>BLF1}1Udi! delta 13 Ucmcc4bd8CnGr-S%BWn;N03o3SEdT%j diff --git a/src/Plot2d/resources/plot2d_settings.png b/src/Plot2d/resources/plot2d_settings.png index b6137462cbf4845760b2cdea96f425c5f7f6a120..64df2460b754730b6147340d542bd8906eeb292b 100755 GIT binary patch delta 14 Vcmey(`iGUZGr-TCcO%PpCIBj61uy^r delta 13 Ucmeyv`kR%dGr-S%BkOl204AmdBLDyZ diff --git a/src/Plot2d/resources/plot2d_splines.png b/src/Plot2d/resources/plot2d_splines.png index 71f37f943db548c0c43f026c0d16797c96b2a066..06a95572db8bb67fe21ae249da802c8da1091026 100755 GIT binary patch delta 14 VcmZ3_yn&guGr-TCcO%PcMgSq-1V;b> delta 13 UcmdnMyq=k*Gr-S%BkO8L03N{vIsgCw 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); -- 2.39.2