X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_InputPanel.cxx;h=d569896ea1b73c46b9310df3deef85b6999bfd9e;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=5b9fa21d02f1ce9bb94b2cc4c5213dd1b6b99fed;hpb=7ba9e0e34e3d326077ecb01fb6ce837cde1627bc;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index 5b9fa21d..d569896e 100644
--- a/src/HYDROGUI/HYDROGUI_InputPanel.cxx
+++ b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
@@ -29,7 +29,7 @@
 #include <QLayout>
 #include <QPushButton>
 
-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 +37,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 +46,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()   ) );
 }
@@ -92,6 +96,11 @@ void HYDROGUI_InputPanel::onHelp()
 {
 }
 
+void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )
+{
+  emit panelCancel();
+}
+
 void HYDROGUI_InputPanel::addWidget( QWidget* theWidget, int theStretch )
 {
   QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
@@ -114,3 +123,8 @@ QFrame* HYDROGUI_InputPanel::mainFrame() const
 {
   return myMainFrame;
 }
+
+QFrame* HYDROGUI_InputPanel::buttonFrame() const
+{
+  return myBtnFrame;
+}