X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_InputPanel.cxx;h=03831fc4ec7ab069d5a690afa9034b6759cb2f85;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=5b9fa21d02f1ce9bb94b2cc4c5213dd1b6b99fed;hpb=7ba9e0e34e3d326077ecb01fb6ce837cde1627bc;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx index 5b9fa21d..03831fc4 100644 --- a/src/HYDROGUI/HYDROGUI_InputPanel.cxx +++ b/src/HYDROGUI/HYDROGUI_InputPanel.cxx @@ -28,8 +28,9 @@ #include #include +#include -HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle ) +HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle, bool doInitLayout ) : QDockWidget( theModule->application()->desktop() ), myModule( theModule ) { @@ -37,6 +38,7 @@ HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr setWindowTitle( theTitle ); setAllowedAreas( Qt::RightDockWidgetArea ); + QFrame* aFrame = new QFrame( this ); setWidget( aFrame ); QVBoxLayout* aLayout = new QVBoxLayout( aFrame ); @@ -45,26 +47,29 @@ HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame ); aMainLayout->setMargin( 0 ); aMainLayout->setSpacing( 5 ); + + aLayout->addWidget( myMainFrame, 1 ); myBtnFrame = new QFrame( aFrame ); - - aLayout->addWidget( myMainFrame, 1 ); aLayout->addWidget( myBtnFrame, 0 ); QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame ); aBtnsLayout->setMargin( 5 ); aBtnsLayout->setSpacing( 5 ); - myApply = new QPushButton( tr( "APPLY" ), myBtnFrame ); myCancel = new QPushButton( tr( "CANCEL" ), myBtnFrame ); myHelp = new QPushButton( tr( "HELP" ), myBtnFrame ); - aBtnsLayout->addWidget( myApply, 0 ); - aBtnsLayout->addWidget( myCancel, 0 ); - aBtnsLayout->addStretch( 1 ); - aBtnsLayout->addWidget( myHelp, 0 ); + if ( doInitLayout ) { + myApply = new QPushButton( tr( "APPLY" ), myBtnFrame ); + + aBtnsLayout->addWidget( myApply, 0 ); + aBtnsLayout->addWidget( myCancel, 0 ); + aBtnsLayout->addStretch( 1 ); + aBtnsLayout->addWidget( myHelp, 0 ); - connect( myApply, SIGNAL( clicked() ), this, SLOT( onApply() ) ); + connect( myApply, SIGNAL( clicked() ), this, SLOT( onApply() ) ); + } connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) ); connect( myHelp, SIGNAL( clicked() ), this, SLOT( onHelp() ) ); } @@ -90,6 +95,12 @@ void HYDROGUI_InputPanel::onCancel() void HYDROGUI_InputPanel::onHelp() { + emit panelHelp(); +} + +void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event ) +{ + emit panelCancel(); } void HYDROGUI_InputPanel::addWidget( QWidget* theWidget, int theStretch ) @@ -114,3 +125,8 @@ QFrame* HYDROGUI_InputPanel::mainFrame() const { return myMainFrame; } + +QFrame* HYDROGUI_InputPanel::buttonFrame() const +{ + return myBtnFrame; +}