QMenu aPopup( this );
QStringList aHypNames = isMainHyp ?
- myAvailableHyps[ MainHyp ] : aHypNames = myAvailableHyps[ AddHyp ];
+ myAvailableHyps[ MainHyp ] : myAvailableHyps[ AddHyp ];
QList<QAction*> actions;
for ( int i = 0, n = aHypNames.count(); i < n; i++ )
{
// Create top controls
+ setObjectPixmap( "SMESH", tr( "ICON_SELECT" ) );
// name
createObject( tr( "NAME" ), mainFrame(), Obj );
setNameIndication( Obj, OneName );
myHypoSetButton = new QToolButton( mainFrame() );
myHypoSetButton->setText( tr( "HYPOTHESES_SETS" ) );
myHypoSetButton->setEnabled( false );
+ myHypoSetButton->setSizePolicy( QSizePolicy::MinimumExpanding,
+ myHypoSetButton->sizePolicy().verticalPolicy() );
// Fill layout
QGridLayout* aLay = new QGridLayout( mainFrame() );
}
// deselect desabled tab
if ( !myTabWg->isTabEnabled( myTabWg->currentIndex() ) )
- setCurrentTab( DIM - 1 );
+ setCurrentTab( DIM );
}
//================================================================================
{
if ( QToolButton* selBtn = qobject_cast<QToolButton*>( objectWg( Geom, Btn )))
{
- disconnect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
if ( enable ) {
if ( ! myGeomPopup ) {
myGeomPopup = new QMenu();
myGeomPopup->addAction( tr("DIRECT_GEOM_SELECTION") )->setData( DIRECT_GEOM_INDEX );
myGeomPopup->addAction( tr("GEOM_BY_MESH_ELEM_SELECTION") )->setData( GEOM_BY_MESH_INDEX );
connect( myGeomPopup, SIGNAL( triggered( QAction* ) ), SLOT( onGeomPopup( QAction* ) ) );
+ connect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
+ }
+ }
+ else {
+ disconnect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
+ if ( myGeomPopup ) {
+ delete myGeomPopup;
+ myGeomPopup = 0;
}
- connect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
}
}
}