From: vsr <vsr@opencascade.com>
Date: Tue, 6 Oct 2015 12:08:56 +0000 (+0300)
Subject: INT  PAL 52894: TC7.7.0: 'Apply and Close' does not work in 'Sub-Shapes Selection... 
X-Git-Tag: V7_7_0_WIN~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0141ab7c44b949f57adb01cd1094d18ac55b5cec;p=modules%2Fgeom.git

INT  PAL 52894: TC7.7.0: 'Apply and Close' does not work in 'Sub-Shapes Selection' dialog
- One more dialog box to fix
---

diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
index 1f1fcda89..63352c47b 100644
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
@@ -46,7 +46,7 @@
 // purpose  : Constructs a BlocksGUI_ExplodeDlg which is a child of 'parent'.
 //=================================================================================
 BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
-  : GEOMBase_Skeleton( theGeometryGUI, parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent ), myNbBlocks( 0 )
 {
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BLOCK_EXPLODE" ) ) );
   QPixmap imageS( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
@@ -189,7 +189,7 @@ bool BlocksGUI_ExplodeDlg::ClickOnApply()
     }
   }
 
-  if ( !onAccept() )
+  if ( !onAccept( true, true, false ) )
     return false;
 
   activateSelection();
@@ -351,7 +351,7 @@ void BlocksGUI_ExplodeDlg::updateButtonState()
 //=================================================================================
 bool BlocksGUI_ExplodeDlg::isAllSubShapes() const
 {
-  return !myGrp1->CheckBox1->isChecked() || !myGrp1->CheckBox1->isEnabled();
+  return !(myGrp1->CheckBox1->isEnabled() && myGrp1->CheckBox1->isChecked());
 }
 
 //=================================================================================