X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ConvToQuadDlg.cxx;h=5db422cddc058bef5bbf2fd7de800c2dbfbbbdbe;hp=6c2cf5dabee8bb7d70be76595192f3560c235d48;hb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx
index 6c2cf5dab..5db422cdd 100644
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx
@@ -1,77 +1,86 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-/**
-*  SMESH SMESHGUI
-*
-*  Copyright (C) 2005  CEA/DEN, EDF R&D
-*
-*
-*
-*  File   : SMESHGUI_ConvToQuadDlg.cxx
-*  Module : SMESH
-*/
-
-#include <SMESHGUI_ConvToQuadDlg.h>
-#include <SUIT_Session.h>
-
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_ConvToQuadDlg.cxx
+// Author : Open CASCADE S.A.S.
+// SMESH includes
+//
+#include "SMESHGUI_ConvToQuadDlg.h"
+
+// Qt includes
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QGridLayout>
+
+#define SPACING 6
+#define MARGIN  11
 
 SMESHGUI_ConvToQuadDlg::SMESHGUI_ConvToQuadDlg()
-: SMESHGUI_Dialog( 0, false, true )
+  : SMESHGUI_Dialog( 0, false, true )
 {
-
-  setCaption( tr( "CAPTION" ) );
+  setWindowTitle( tr( "CAPTION" ) );
 
   // Create top controls  
-  QGroupBox* aGrp = new QGroupBox( 3, Qt::Horizontal, mainFrame() );
-  aGrp->setFrameStyle( QFrame::NoFrame );
-  aGrp->setInsideMargin( 0 );
 
   // mesh
-  createObject( tr( "MESH" ), aGrp, 0 );
+  setObjectPixmap( "SMESH", tr( "ICON_SELECT" ) );
+  createObject( tr( "MESH" ), mainFrame(), 0 );
 
   //Create check box
-   myMedNdsOnGeom = new QCheckBox( tr( "MEDIUMNDS" ), mainFrame() );
+  myMedNdsOnGeom = new QCheckBox( tr( "MEDIUMNDS" ), mainFrame() );
 
   //Create RadioButtons
-  myBG = new QButtonGroup( 2, Qt::Vertical, "", mainFrame() );
-  myBG->setExclusive( true );
+  myBGBox = new QGroupBox( mainFrame() );
+  myBG = new QButtonGroup( mainFrame() );
+  QVBoxLayout* aBGLayout = new QVBoxLayout( myBGBox );
+  aBGLayout->setMargin(MARGIN);
+  aBGLayout->setSpacing(SPACING);
   
-  myRB1 = new QRadioButton( myBG );  
-  myRB1->setText( tr( "RADIOBTN_1" ) );
-  myRB1->setChecked( true );
+  myRB1 = new QRadioButton( tr( "RADIOBTN_1" ), myBGBox );
+  myRB2 = new QRadioButton( tr( "RADIOBTN_2" ), myBGBox );
 
-  myRB2 = new QRadioButton( myBG );  
-  myRB2->setText( tr( "RADIOBTN_2" ) );
+  aBGLayout->addWidget(myRB1);
+  aBGLayout->addWidget(myRB2);
+  myBG->addButton(myRB1, 0);
+  myBG->addButton(myRB2, 1);
+  myRB1->setChecked( true );
 
   // Fill layout
-  QVBoxLayout* aLay = new QVBoxLayout( mainFrame(), 5, 5 );
-  aLay->addWidget( aGrp );
-  aLay->addWidget( myMedNdsOnGeom );
-  aLay->addWidget( myBG );
+  QGridLayout* aLay = new QGridLayout( mainFrame() );
+  aLay->setMargin( 5 );
+  aLay->setSpacing( 5 );
+
+  aLay->addWidget( objectWg( 0,  Label ),   0, 0 );
+  aLay->addWidget( objectWg( 0,  Btn ),     0, 1 );
+  aLay->addWidget( objectWg( 0,  Control ), 0, 2 );
+  aLay->addWidget( myMedNdsOnGeom,          1, 0, 1, 3 );
+  aLay->addWidget( myBGBox,                 2, 0, 1, 3 );
   
-  connect(myBG, SIGNAL( clicked( int ) ), this, SIGNAL( onClicked( int ) ) );
+  connect(myBG, SIGNAL( buttonClicked( int ) ), this, SIGNAL( onClicked( int ) ) );
 }
 
 SMESHGUI_ConvToQuadDlg::~SMESHGUI_ConvToQuadDlg()
@@ -100,12 +109,12 @@ void SMESHGUI_ConvToQuadDlg::SetEnabledCheck( const bool theCheck )
 
 int SMESHGUI_ConvToQuadDlg::CurrentRB( )
 {
-  return myBG->selectedId();
+  return myBG->checkedId();
 }
 
 void SMESHGUI_ConvToQuadDlg::SetEnabledControls( const bool theCheck )
 {
-  myBG->setEnabled( theCheck );
+  myBGBox->setEnabled( theCheck );
   myMedNdsOnGeom->setEnabled( theCheck );
   setButtonEnabled( theCheck, QtxDialog::OK | QtxDialog::Apply );
 }
@@ -124,7 +133,7 @@ void SMESHGUI_ConvToQuadDlg::SetEnabledRB( const int idx, const bool theCheck )
     myRB2->setEnabled( !theCheck );
     myRB2->setChecked( true );
   }
-  emit onClicked( myBG->selectedId() );
+  emit onClicked( myBG->checkedId() );
 }