X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_InputPanel.h;h=414c13f91c222dd692964d1b7fcf9a5db07e75c8;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=319086fe7ccbf27bd53a8ae86d655e9c66320ae3;hpb=d6aeef5b61d85b44493cd5d93ed9870cc513e68f;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.h b/src/HYDROGUI/HYDROGUI_InputPanel.h
index 319086fe..414c13f9 100644
--- a/src/HYDROGUI/HYDROGUI_InputPanel.h
+++ b/src/HYDROGUI/HYDROGUI_InputPanel.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,12 +19,14 @@
 #ifndef HYDROGUI_INPUTPANEL_H
 #define HYDROGUI_INPUTPANEL_H
 
-#include "HYDROGUI.h"
 #include <QDockWidget>
 
-class HYDROGUI_Module;
 class QFrame;
 class QPushButton;
+class QLayout;
+class QCloseEvent;
+
+class HYDROGUI_Module;
 
 /**\class HYDROGUI_Dialog
  *\brief The base class representing base input panel for all HYDROGUI panels
@@ -38,31 +36,44 @@ class HYDROGUI_InputPanel : public QDockWidget
   Q_OBJECT
 
 public:
-  HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle );
+  HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle, bool doInitLayout = true );
   virtual ~HYDROGUI_InputPanel();
 
-  void addWidget( const QString& theLabel, QWidget* theWidget );
-  void addSeparator();
-  void setRowStretch();
+  void addWidget( QWidget* theWidget, int theStretch = 0 );
+  void addLayout( QLayout* theLayout );
+  void addStretch();
 
   HYDROGUI_Module* module() const;
 
+  bool             isApplyEnabled() const;
+  void             setApplyEnabled( bool );
+
 signals:
+  void panelApplyAndClose();
   void panelApply();
   void panelCancel();
+  void panelHelp();
 
 protected slots:
-  void OnApply();
-  void OnCancel();
-  void OnHelp();
+  void onApplyAndClose();
+  void onApply();
+  void onCancel();
+  void onHelp();
+
+protected:
+  QFrame*         mainFrame() const;
+  QFrame*         buttonFrame() const;
+  virtual void    closeEvent ( QCloseEvent * event );
+
+  QPushButton* myCancel;
+  QPushButton* myHelp;
 
 private:
   HYDROGUI_Module* myModule;
   QFrame* myMainFrame;
   QFrame* myBtnFrame;
+  QPushButton* myApplyAndClose;
   QPushButton* myApply;
-  QPushButton* myCancel;
-  QPushButton* myHelp;
 };
 
 #endif