Bug IPAL9276 is fixed.

This commit is contained in:
asv 2005-06-23 14:04:19 +00:00
parent 2bdf57403e
commit 167977175e

View File

@ -609,7 +609,7 @@ void GeometryGUI::createGeomAction( const int id, const QString& po_id, const QS
if ( icon_id.length() ) if ( icon_id.length() )
pix = resMgr->loadPixmap( "GEOM", tr( icon_id ) ); pix = resMgr->loadPixmap( "GEOM", tr( icon_id ) );
else else
pix = resMgr->loadPixmap( "GEOM", tr( QString( "ICO_" )+po_id ) ); pix = resMgr->loadPixmap( "GEOM", tr( QString( "ICO_" )+po_id ), false );
if ( !pix.isNull() ) if ( !pix.isNull() )
icon = QIconSet( pix ); icon = QIconSet( pix );
@ -966,13 +966,13 @@ void GeometryGUI::initialize( CAM_Application* app )
mgr->setRule( action( 8034 ), "client='OCCViewer' and selcount>0", true ); mgr->setRule( action( 8034 ), "client='OCCViewer' and selcount>0", true );
mgr->insert( separator(), -1, -1 ); // ----------- mgr->insert( separator(), -1, -1 ); // -----------
mgr->insert( action( 216 ), -1, -1 ); // display mgr->insert( action( 216 ), -1, -1 ); // display
mgr->setRule( action( 216 ), "isActiveViewer=true and selcount>0 and (($type in {'Shape' 'Group'} and ($isVisible in {false})) or $type in {'Component'})", true ); mgr->setRule( action( 216 ), "$isActiveViewer in {true} and selcount>0 and (($type in {'Shape' 'Group'} and ($isVisible in {false})) or $type in {'Component'})", true );
mgr->insert( action( 215 ), -1, -1 ); // erase mgr->insert( action( 215 ), -1, -1 ); // erase
mgr->setRule( action( 215 ), "isActiveViewer=true and selcount>0 and (($type in {'Shape' 'Group'} and $isVisible in {true}) or ($type in {'Component'} and selcount=1))", true ); mgr->setRule( action( 215 ), "$isActiveViewer in {true} and selcount>0 and (($type in {'Shape' 'Group'} and $isVisible in {true}) or ($type in {'Component'} and selcount=1))", true );
mgr->insert( action( 214 ), -1, -1 ); // erase All mgr->insert( action( 214 ), -1, -1 ); // erase All
mgr->setRule( action( 214 ), "isActiveViewer=true and $client in {'OCCViewer' 'VTKViewer'}", true ); mgr->setRule( action( 214 ), "$isActiveViewer in {true} and $client in {'OCCViewer' 'VTKViewer'}", true );
mgr->insert( action( 213 ), -1, -1 ); // display only mgr->insert( action( 213 ), -1, -1 ); // display only
mgr->setRule( action( 213 ), "isActiveViewer=true and selcount>0 and ($type in {'Shape' 'Group'} or ($type in {'Component'} and selcount=1))", true ); mgr->setRule( action( 213 ), "$isActiveViewer in {true} and selcount>0 and ($type in {'Shape' 'Group'} or ($type in {'Component'} and selcount=1))", true );
mgr->insert( separator(), -1, -1 ); mgr->insert( separator(), -1, -1 );
} }