X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_InputPanel.cxx;h=03831fc4ec7ab069d5a690afa9034b6759cb2f85;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=2186f2791da388f55693e551ce68eb438d7be587;hpb=ea51c1575cfdc7e3ad0b8cc1db55d9d83626b12d;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index 2186f279..03831fc4 100644
--- a/src/HYDROGUI/HYDROGUI_InputPanel.cxx
+++ b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
@@ -28,8 +28,9 @@
 
 #include <QLayout>
 #include <QPushButton>
+#include <QDir>
 
-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,33 +38,38 @@ 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( this );
-  QGridLayout* aMainLayout = new QGridLayout( myMainFrame );
+  myMainFrame = new QFrame( aFrame );
+  QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
   aMainLayout->setMargin( 0 );
   aMainLayout->setSpacing( 5 );
-
-  myBtnFrame = new QFrame( this );
+    
   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 );
+  if ( doInitLayout ) {
+    myApply = new QPushButton( tr( "APPLY" ), myBtnFrame );
 
-  connect( myApply,  SIGNAL( clicked() ), this, SLOT( onApply()  ) );
+    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()   ) );
 }
@@ -89,39 +95,38 @@ void HYDROGUI_InputPanel::onCancel()
 
 void HYDROGUI_InputPanel::onHelp()
 {
+  emit panelHelp();
 }
 
-void HYDROGUI_InputPanel::addWidget( const QString& theLabel, QWidget* theWidget )
+void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  int aRow = aMainLayout->rowCount();
-  aMainLayout->addWidget( new QLabel( theLabel, this ), aRow, 0 );
-  aMainLayout->addWidget( theWidget, aRow, 1 );
+  emit panelCancel();
 }
 
-void HYDROGUI_InputPanel::addWidget( QWidget* theWidget,
-                                     const int theRow,
-                                     const int theColumn )
+void HYDROGUI_InputPanel::addWidget( QWidget* theWidget, int theStretch )
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  aMainLayout->addWidget( theWidget, theRow, theColumn );
+  QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
+  aMainLayout->addWidget( theWidget, theStretch );
 }
 
-void HYDROGUI_InputPanel::addSeparator()
+void HYDROGUI_InputPanel::addLayout( QLayout* theLayout )
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  int aRow = aMainLayout->rowCount();
+  QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
+  aMainLayout->addLayout( theLayout );
+}
 
-  QFrame* aLine = new QFrame();
-  aLine->setFrameShape( QFrame::HLine );
-  aLine->setFrameShadow( QFrame::Sunken );
+void HYDROGUI_InputPanel::addStretch()
+{
+  QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
+  aMainLayout->addStretch();
+}
 
-  aMainLayout->addWidget( aLine, aRow, 0, 1, 2 );
+QFrame* HYDROGUI_InputPanel::mainFrame() const
+{
+  return myMainFrame;
 }
 
-void HYDROGUI_InputPanel::setRowStretch()
+QFrame* HYDROGUI_InputPanel::buttonFrame() const
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  int aRow = aMainLayout->rowCount();
-  aMainLayout->setRowStretch( aRow, 1 );
+  return myBtnFrame;
 }