Porting to Qt4.

[modules/geom.git] / src / BuildGUI / BuildGUI_CompoundDlg.cxx

diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
index 53e0d07ca87329f946d2863d347763ecab908573..d0b3ebb8132160d53c39db2f8233d773cccc5c73 100644 (file)
--- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -29,12 +29,14 @@
 #include "BuildGUI_CompoundDlg.h"
 #include "GEOMImpl_Types.hxx"
 
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
+
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BuildGUI_CompoundDlg()
 // purpose  : Constructs a BuildGUI_CompoundDlg which is a child of 'parent', with the 
@@ -43,28 +45,33 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                           const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                           const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_COMPOUND_TITLE"));
+  setWindowTitle(tr("GEOM_COMPOUND_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_COMPOUND"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupShapes = new Ui::DlgRef_1Sel_QTD();
+  QWidget* aGroupShapesWidget = new QWidget(this);
+  GroupShapes->setupUi(aGroupShapesWidget);
+  aGroupShapesWidget->setObjectName("GroupShapes");
 
-  GroupShapes = new DlgRef_1Sel_QTD(this, "GroupShapes");
   GroupShapes->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupShapes->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupShapes->PushButton1->setPixmap(image1);
+  GroupShapes->PushButton1->setIcon(image1);
   GroupShapes->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupShapes, 2, 0);
+  gridLayout1->addWidget(aGroupShapesWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("compound.htm");
@@ -105,7 +112,7 @@ void BuildGUI_CompoundDlg::Init()
 
   globalSelection( GEOM_ALLSHAPES );
 
-  initName( tr( "GEOM_COMPOUND" ) );
+  initName( tr( "GEOM_COMPOUND" ).toStdString().c_str() );
 }