For IMP 16155: use BRep_Tool::IsClosed() instead of TopoDS_Shape::Closed().

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MultiEditDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 27a885dd848fc52c89be7e3f07f933d0623683c0..42dbb6b8e5929327fe99cb4f8873f8241cef6e05 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -251,12 +251,12 @@ QWidget* SMESHGUI_MultiEditDlg::createMainFrame (QWidget* theParent, const bool
   myGroup->setReadOnly(true);
   myGroupBtn->setIcon(aPix);
 
-  aGrpLayout->addWidget(mySubmeshChk);
-  aGrpLayout->addWidget(mySubmeshBtn);
-  aGrpLayout->addWidget(mySubmesh);
-  aGrpLayout->addWidget(myGroupChk);
-  aGrpLayout->addWidget(myGroupBtn);
-  aGrpLayout->addWidget(myGroup);
+  aGrpLayout->addWidget(mySubmeshChk,0,0);
+  aGrpLayout->addWidget(mySubmeshBtn,0,1);
+  aGrpLayout->addWidget(mySubmesh,0,2);
+  aGrpLayout->addWidget(myGroupChk,1,0);
+  aGrpLayout->addWidget(myGroupBtn,1,1);
+  aGrpLayout->addWidget(myGroup,1,2);
   
   aMainGrpLayout->addWidget(mySelGrp);
   aMainGrpLayout->addWidget(myCriterionGrp);
@@ -273,7 +273,7 @@ QWidget* SMESHGUI_MultiEditDlg::createButtonFrame (QWidget* theParent)
 {
   QGroupBox* aFrame = new QGroupBox(theParent);
 
-  myOkBtn     = new QPushButton (tr("SMESH_BUT_OK"   ), aFrame);
+  myOkBtn     = new QPushButton (tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
   myApplyBtn  = new QPushButton (tr("SMESH_BUT_APPLY"), aFrame);
   myCloseBtn  = new QPushButton (tr("SMESH_BUT_CLOSE"), aFrame);
   myHelpBtn   = new QPushButton (tr("SMESH_BUT_HELP"),  aFrame);
@@ -1158,7 +1158,7 @@ SMESHGUI_UnionOfTrianglesDlg
   aMaxAngleGrpLayout->addWidget(aLab);
   aMaxAngleGrpLayout->addWidget(myMaxAngleSpin);
 
-  ((QVBoxLayout*)aMaxAngleGrpLayout->layout())->addWidget(aMaxAngleGrp);
+  ((QVBoxLayout*)(myCriterionGrp->layout()))->addWidget(aMaxAngleGrp);
   myCriterionGrp->show();
 
   myHelpFileName = "uniting_set_of_triangles_page.html";