ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 01:10:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- One more dialog box to fix
This commit is contained in:
vsr 2015-10-06 15:08:56 +03:00
parent 3e1586b2b4
commit 0141ab7c44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -46,7 +46,7 @@
// purpose : Constructs a BlocksGUI_ExplodeDlg which is a child of 'parent'. // purpose : Constructs a BlocksGUI_ExplodeDlg which is a child of 'parent'.
//================================================================================= //=================================================================================
BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg( GeometryGUI* theGeometryGUI, QWidget* 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 image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BLOCK_EXPLODE" ) ) );
QPixmap imageS( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) ); 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; return false;
activateSelection(); activateSelection();
@ -351,7 +351,7 @@ void BlocksGUI_ExplodeDlg::updateButtonState()
//================================================================================= //=================================================================================
bool BlocksGUI_ExplodeDlg::isAllSubShapes() const bool BlocksGUI_ExplodeDlg::isAllSubShapes() const
{ {
return !myGrp1->CheckBox1->isChecked() || !myGrp1->CheckBox1->isEnabled(); return !(myGrp1->CheckBox1->isEnabled() && myGrp1->CheckBox1->isChecked());
} }
//================================================================================= //=================================================================================