// 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
//
//
//
// $Header$
#include "BuildGUI_CompoundDlg.h"
-#include "QAD_Desktop.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"
+
//=================================================================================
// class : BuildGUI_CompoundDlg()
// purpose : Constructs a BuildGUI_CompoundDlg which is a child of 'parent', with the
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl)
- :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
+ const char* name, bool modal, Qt::WindowFlags fl)
+ :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
{
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
- QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ 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");
+
/* Initialisations */
Init();
}
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect(GroupShapes->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+ connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
globalSelection( GEOM_ALLSHAPES );
- initName( tr( "GEOM_COMPOUND" ) );
+ initName( tr( "GEOM_COMPOUND" ).toStdString().c_str() );
}
QString aString = ""; /* name of selection */
myOkShapes = false;
- int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString, true );
+ int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
if ( nbSel == 0 )
return;
if ( nbSel != 1 )
aString = QString( "%1_objects").arg( nbSel );
- GEOMBase::ConvertListOfIOInListOfGO( mySelection->StoredIObjects(), myShapes, true );
+ GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myShapes, true );
myEditCurrentArgument->setText( aString );
myOkShapes = true;
}
{
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES );
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
}