X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_InputPanel.cxx;h=f89653dbe2039ba7eadd9bce4077d48502704648;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=23a9c06e756b29500bc2c3a13b384cce7b696f28;hpb=abe63c42525c9299302649cdb5dcff4f83368c26;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index 23a9c06e..f89653db 100644
--- a/src/HYDROGUI/HYDROGUI_InputPanel.cxx
+++ b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
@@ -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
@@ -28,6 +24,7 @@
 
 #include <QLayout>
 #include <QPushButton>
+#include <QDir>
 
 HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle, bool doInitLayout )
 : QDockWidget( theModule->application()->desktop() ),
@@ -37,39 +34,43 @@ HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr
   setWindowTitle( theTitle );
   setAllowedAreas( Qt::RightDockWidgetArea );
 
-  if ( doInitLayout ) {
 
-    QFrame* aFrame = new QFrame( this );
-    setWidget( aFrame );
-    QVBoxLayout* aLayout = new QVBoxLayout( aFrame );
+  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 );
     
-    myMainFrame = new QFrame( aFrame );
-    QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
-    aMainLayout->setMargin( 0 );
-    aMainLayout->setSpacing( 5 );
-      
-    aLayout->addWidget( myMainFrame, 1 );
+  aLayout->addWidget( myMainFrame, 1 );
 
-    myBtnFrame = new QFrame( aFrame );
-    aLayout->addWidget( myBtnFrame, 0 );
+  myBtnFrame = new QFrame( aFrame );
+  aLayout->addWidget( myBtnFrame, 0 );
 
-    QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame );
-    aBtnsLayout->setMargin( 5 );
-    aBtnsLayout->setSpacing( 5 );
+  QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame );
+  aBtnsLayout->setMargin( 5 );
+  aBtnsLayout->setSpacing( 5 );
 
+  myCancel = new QPushButton( tr( "CLOSE" ), myBtnFrame );
+  myHelp = new QPushButton( tr( "HELP" ), myBtnFrame );
+
+  if ( doInitLayout ) {
+    myApplyAndClose = new QPushButton( tr( "APPLY_AND_CLOSE" ), myBtnFrame );
     myApply = new QPushButton( tr( "APPLY" ), myBtnFrame );
-    myCancel = new QPushButton( tr( "CANCEL" ), myBtnFrame );
-    myHelp = new QPushButton( tr( "HELP" ), myBtnFrame );
 
+    aBtnsLayout->addWidget( myApplyAndClose, 0 );
     aBtnsLayout->addWidget( myApply, 0 );
     aBtnsLayout->addWidget( myCancel, 0 );
     aBtnsLayout->addStretch( 1 );
     aBtnsLayout->addWidget( myHelp, 0 );
 
+    connect( myApplyAndClose,  SIGNAL( clicked() ), this, SLOT( onApplyAndClose()  ) );
     connect( myApply,  SIGNAL( clicked() ), this, SLOT( onApply()  ) );
-    connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
-    connect( myHelp,   SIGNAL( clicked() ), this, SLOT( onHelp()   ) );
   }
+  connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
+  connect( myHelp,   SIGNAL( clicked() ), this, SLOT( onHelp()   ) );
 }
 
 HYDROGUI_InputPanel::~HYDROGUI_InputPanel()
@@ -81,6 +82,22 @@ HYDROGUI_Module* HYDROGUI_InputPanel::module() const
   return myModule;
 }
 
+bool HYDROGUI_InputPanel::isApplyEnabled() const
+{
+  return myApply->isEnabled();
+}
+
+void HYDROGUI_InputPanel::setApplyEnabled( bool on )
+{
+  myApplyAndClose->setEnabled( on );
+  myApply->setEnabled( on );
+}
+
+void HYDROGUI_InputPanel::onApplyAndClose()
+{
+  emit panelApplyAndClose();
+}
+
 void HYDROGUI_InputPanel::onApply()
 {
   emit panelApply(); 
@@ -93,6 +110,7 @@ void HYDROGUI_InputPanel::onCancel()
 
 void HYDROGUI_InputPanel::onHelp()
 {
+  emit panelHelp();
 }
 
 void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )
@@ -122,3 +140,8 @@ QFrame* HYDROGUI_InputPanel::mainFrame() const
 {
   return myMainFrame;
 }
+
+QFrame* HYDROGUI_InputPanel::buttonFrame() const
+{
+  return myBtnFrame;
+}