X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_InputPanel.cxx;h=23a9c06e756b29500bc2c3a13b384cce7b696f28;hb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;hp=68c084a2534e12904e1ad29f1da8b200adbd862a;hpb=6a7b1d68094c60ceebc46449530a3f12fe16b080;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index 68c084a2..23a9c06e 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,35 +37,39 @@ 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 );
-  
-  myMainFrame = new QFrame( aFrame );
-  QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
-  aMainLayout->setMargin( 0 );
-  aMainLayout->setSpacing( 5 );
-
-  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 );
-
-  connect( myApply,  SIGNAL( clicked() ), this, SLOT( onApply()  ) );
-  connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
-  connect( myHelp,   SIGNAL( clicked() ), this, SLOT( onHelp()   ) );
+  if ( doInitLayout ) {
+
+    QFrame* aFrame = new QFrame( this );
+    setWidget( aFrame );
+    QVBoxLayout* aLayout = new QVBoxLayout( aFrame );
+    
+    myMainFrame = new QFrame( aFrame );
+    QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
+    aMainLayout->setMargin( 0 );
+    aMainLayout->setSpacing( 5 );
+      
+    aLayout->addWidget( myMainFrame, 1 );
+
+    myBtnFrame = new QFrame( aFrame );
+    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 );
+
+    connect( myApply,  SIGNAL( clicked() ), this, SLOT( onApply()  ) );
+    connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
+    connect( myHelp,   SIGNAL( clicked() ), this, SLOT( onHelp()   ) );
+  }
 }
 
 HYDROGUI_InputPanel::~HYDROGUI_InputPanel()
@@ -91,10 +95,15 @@ void HYDROGUI_InputPanel::onHelp()
 {
 }
 
-void HYDROGUI_InputPanel::addWidget( QWidget* theWidget )
+void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )
+{
+  emit panelCancel();
+}
+
+void HYDROGUI_InputPanel::addWidget( QWidget* theWidget, int theStretch )
 {
   QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
-  aMainLayout->addWidget( theWidget );
+  aMainLayout->addWidget( theWidget, theStretch );
 }
 
 void HYDROGUI_InputPanel::addLayout( QLayout* theLayout )
@@ -113,4 +122,3 @@ QFrame* HYDROGUI_InputPanel::mainFrame() const
 {
   return myMainFrame;
 }
-