Fix for PAL10496.

[modules/geom.git] / src / RepairGUI / RepairGUI_ShapeProcessDlg.cxx

diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 7c9005a1a8eeaec081e594e7b35fd8922663a1d0..a712e4b5c689653a44483cbf4d2ea06733574d47 100755 (executable)
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -52,13 +52,15 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-RepairGUI_ShapeProcessDlg::RepairGUI_ShapeProcessDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+RepairGUI_ShapeProcessDlg::RepairGUI_ShapeProcessDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                     const char* name, bool modal, WFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
+                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
+  setHelpFileName("shape_processing.htm");
   init();
 }
 
-
 //=================================================================================
 // function : ~RepairGUI_ShapeProcessDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -67,7 +69,6 @@ RepairGUI_ShapeProcessDlg::~RepairGUI_ShapeProcessDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -296,10 +297,6 @@ void RepairGUI_ShapeProcessDlg::init()
   myStack->addWidget( aFrame, myOpLst.findIndex( "SameParameter" ) );
 
   // signals and slots connections
-  connect( myGeomGUI,    SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(deactivate()) );
-  connect( myGeomGUI,    SIGNAL(SignalCloseAllDialogs()), this, SLOT(onCancel()) );
-
-  connect( buttonCancel, SIGNAL(clicked()), this, SLOT(onCancel()) );
   connect( buttonOk,     SIGNAL(clicked()), this, SLOT(onOk()) );
   connect( buttonApply,  SIGNAL(clicked()), this, SLOT(onApply()) );
 
@@ -341,12 +338,10 @@ void RepairGUI_ShapeProcessDlg::operationChanged()
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::onOk()
 {
-  if ( onApply() )
-       onCancel();
+  if (onApply())
+    ClickOnCancel();
 }
 
-
-
 //=================================================================================
 // function : onApply()
 // purpose  :
@@ -365,16 +360,6 @@ bool RepairGUI_ShapeProcessDlg::onApply()
 }
 
 
-//=================================================================================
-// function : onCancel()
-// purpose  :
-//=================================================================================
-void RepairGUI_ShapeProcessDlg::onCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
-
 //=================================================================================
 // function : selectionChanged()
 // purpose  : Called when selection as changed or other case
@@ -423,17 +408,6 @@ void RepairGUI_ShapeProcessDlg::lineEditReturnPressed()
 }
 
 
-//=================================================================================
-// function : deactivate()
-// purpose  :
-//=================================================================================
-void RepairGUI_ShapeProcessDlg::deactivate()
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::DeactivateActiveDialog();
-}
-
-
 //=================================================================================
 // function : activate()
 // purpose  :
@@ -842,6 +816,8 @@ void RepairGUI_ShapeProcessDlg::advOptionToggled( bool on )
 {
   QButton* btn = (QButton*)sender();
   if ( on && btn->isToggleButton() &&
-       QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr( "GEOM_WRN_WARNING" ), tr( "TIME_CONSUMING" ), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+       QMessageBox::warning(myGeomGUI->getApp()->desktop(),
+                            tr( "GEOM_WRN_WARNING" ), tr( "TIME_CONSUMING" ),
+                            QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
     btn->toggle();
 }