NRI : Merge from V1_2.

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 104eb6f32f4bc2162108b26965b843565690fbca..244be8bfa08e06f182eabbbe61403e337a4c4214 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -593,7 +593,7 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
       {
        if (checkLock(GetStudyDocument())) break;
 
-       Engines::Component_var aMedComp = GetDesktop()->getEngine("FactoryServer", "Med");
+       Engines::Component_var aMedComp = GetDesktop()->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;
@@ -2684,20 +2684,20 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri
          break;
        case VISU::TTIMESTAMP: {
          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()));
-         thePopup->insertItem(rmgr->loadPixmap( "VisuGUI", tr("ICON_CUT_LINES") ),
+         thePopup->insertItem(rmgr->loadPixmap( "VISU", tr("ICON_CUT_LINES") ),
                               "Cut Lines...", visuGUI, SLOT(CreateCutLines()));
          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()));
          }
          break;