NRI : Merge from V1_2.

diff --git a/src/SMESHGUI/SMESHGUI_Swig.cxx b/src/SMESHGUI/SMESHGUI_Swig.cxx
index f34629ff6727cfbedfdd4e4b19cb1f25793f0b83..67bdff519b1bde4f31037c06bae51164a8434367 100644 (file)
--- 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);
     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" );
     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 19b5e3c84ecb7b3c088ea44848db48e8ee642a68..dd6e50d15abe6f494313dc489bfe064bb097aed7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Swig.i
+++ b/src/SMESHGUI/SMESHGUI_Swig.i
@@ -32,11 +32,11 @@
 
 %include "typemaps.i"
 
 
 %include "typemaps.i"
 

-class SMESHGUI_Swig
+class SMESH_Swig

 {
  public:
 {
  public:

-  SMESHGUI_Swig();
-  ~SMESHGUI_Swig();
+  SMESH_Swig();
+  ~SMESH_Swig();

 
   void Init(int studyID);
 
 
   void Init(int studyID);