From: nri Date: Thu, 10 Jul 2003 16:31:38 +0000 (+0000) Subject: NRI : Merge from V1_2. X-Git-Tag: V1_2_1~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=60d0057dcd112ca93fafa8fbb4bbca922e47e606;p=modules%2Fsmesh.git NRI : Merge from V1_2. --- diff --git a/src/SMESHGUI/SMESHGUI_Swig.cxx b/src/SMESHGUI/SMESHGUI_Swig.cxx index f34629ff6..67bdff519 100644 --- a/src/SMESHGUI/SMESHGUI_Swig.cxx +++ b/src/SMESHGUI/SMESHGUI_Swig.cxx @@ -94,7 +94,8 @@ void SMESH_Swig::Init(int studyID) father = myStudyBuilder->NewComponent("MESH"); anAttr = myStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue(QObject::tr("SMESH_MEN_COMPONENT")); + //NRI aName->SetValue(QObject::tr("SMESH_MEN_COMPONENT")); + aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "SMESH" ) ); anAttr = myStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap->SetPixMap( "ICON_OBJBROWSER_SMESH" ); diff --git a/src/SMESHGUI/SMESHGUI_Swig.i b/src/SMESHGUI/SMESHGUI_Swig.i index 19b5e3c84..dd6e50d15 100644 --- a/src/SMESHGUI/SMESHGUI_Swig.i +++ b/src/SMESHGUI/SMESHGUI_Swig.i @@ -32,11 +32,11 @@ %include "typemaps.i" -class SMESHGUI_Swig +class SMESH_Swig { public: - SMESHGUI_Swig(); - ~SMESHGUI_Swig(); + SMESH_Swig(); + ~SMESH_Swig(); void Init(int studyID);