From: nri Date: Wed, 21 May 2003 10:11:41 +0000 (+0000) Subject: NRI : Update loadPixmap. X-Git-Tag: Start-v1_1a~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dea41f38448cb5111bcfff1d03e61c4ab557fe22;p=modules%2Fvisu.git NRI : Update loadPixmap. --- diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index dfb33247..caacd80e 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -843,7 +843,7 @@ bool VisuGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) { if (checkLock(myStudy)) break; - Engines::Component_var aMedComp = myDesktop->getEngine("FactoryServer", "Med"); + Engines::Component_var aMedComp = myDesktop->getEngine("FactoryServer", "MED"); if (CORBA::is_nil(aMedComp)) return false; Engines::Med_Gen_var aMedGen = Engines::Med_Gen::_narrow(aMedComp); if (CORBA::is_nil(aMedGen)) return false; @@ -3047,18 +3047,18 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri // if( isStudyLocked(VisuGUI::myActiveStudy->getStudyDocument())) // return false; int aNunComponent = VISU::Storable::FindValue(aMap,"myNumComponent",&isExist).toInt(); - thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_SCALAR_MAP") ), + thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_SCALAR_MAP") ), "Scalar Map...", visuGUI, SLOT(CreateScalarMap())); - thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_ISO_SURFACES") ), + thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_ISO_SURFACES") ), "Iso Surfaces...", visuGUI, SLOT(CreateIsoSurfaces())); - thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_CUT_PLANES") ), + thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_CUT_PLANES") ), "Cut Planes...", visuGUI, SLOT(CreateCutPlanes())); if(aNunComponent > 1){ - thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_DEFORMED_SHAPE") ), + thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_DEFORMED_SHAPE") ), "Deformed Shape...", visuGUI, SLOT(CreateDeformedShape())); - thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_VECTORS") ), + thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_VECTORS") ), "Vectors...", visuGUI, SLOT(CreateVectors())); - thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_STREAM_LINES") ), + thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_STREAM_LINES") ), "Stream lines...", visuGUI, SLOT(CreateStreamLines())); } } diff --git a/src/VISUGUI/VisuGUI_InitMeshDlg.cxx b/src/VISUGUI/VisuGUI_InitMeshDlg.cxx index 251ff08e..40bc7979 100644 --- a/src/VISUGUI/VisuGUI_InitMeshDlg.cxx +++ b/src/VISUGUI/VisuGUI_InitMeshDlg.cxx @@ -40,8 +40,8 @@ using namespace std; VisuGUI_InitMeshDlg::VisuGUI_InitMeshDlg( QWidget* parent, const char* name, SALOME_Selection* Sel = 0, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { - QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "VisuGUI",tr("ICON_DLG_INIT_MESH"))); - QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "VisuGUI",tr("ICON_SELECT"))); + QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "VISU",tr("ICON_DLG_INIT_MESH"))); + QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "VISU",tr("ICON_SELECT"))); if ( !name ) setName( "VisuGUI_InitMeshDlg" ); resize( 303, 175 );