Merge remote-tracking branch 'origin/BR_SHP_FORMAT2' into BR_LAND_COVER_MAP

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_InputPanel.cxx

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index ceb9f28dff77883ff2a370aa405ecc4e6db02e6c..f89653dbe2039ba7eadd9bce4077d48502704648 100644 (file)
--- 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
@@ -22,7 +18,6 @@
 
 #include "HYDROGUI_InputPanel.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_RunBrowser.h"
 
 #include <CAM_Application.h>
 #include <SUIT_Desktop.h>
@@ -58,17 +53,20 @@ HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr
   aBtnsLayout->setMargin( 5 );
   aBtnsLayout->setSpacing( 5 );
 
-  myCancel = new QPushButton( tr( "CANCEL" ), myBtnFrame );
+  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 );
 
+    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() ) );
@@ -84,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(); 
@@ -96,20 +110,7 @@ void HYDROGUI_InputPanel::onCancel()
 
 void HYDROGUI_InputPanel::onHelp()
 {
-  QString aModuleName = myModule->moduleName();
-
-  QString aPagePath = HYDROGUI_RunBrowser::getPagePath( aModuleName );
-
-  QString aPageName = "";
-  QString aWindowTitle = windowTitle();
-  if ( !aWindowTitle.isEmpty() )
-  {
-    aPageName = QStringList( aWindowTitle.split( " " ) ).join( "_" ).append( ".html" );
-    aPageName.toLower();
-  }
-
-  QString aPage = aPagePath + QDir::separator() + aPageName;
-  HYDROGUI_RunBrowser::showPage( myModule->getApp(), aPage );
+  emit panelHelp();
 }
 
 void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )