From: vsr Date: Thu, 10 May 2018 06:21:48 +0000 (+0300) Subject: Merge remote branch 'origin/master' into V8_5_BR X-Git-Tag: V8_5_0rc2^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f72aeeeead0d6a82415cff2c3b68465024c0f8f9;hp=97d6d6b132a113b77e25ea5a7c4f045532849b91;p=modules%2Fhexablock.git Merge remote branch 'origin/master' into V8_5_BR --- diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx index cff4a46..78aee18 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx @@ -285,8 +285,10 @@ bool HEXABLOCKGUI::activateModule( SUIT_Study* theStudy ) connect( getApp()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ), this, SLOT(onWindowActivated( SUIT_ViewWindow* )), Qt::UniqueConnection ); - connect( getApp()->objectBrowser()->treeView(),SIGNAL( clicked(const QModelIndex&) ), - this, SLOT( onObjectBrowserClick(const QModelIndex&) ), Qt::UniqueConnection ); + if ( getApp()->objectBrowser() ) { + connect( getApp()->objectBrowser()->treeView(),SIGNAL( clicked(const QModelIndex&) ), + this, SLOT( onObjectBrowserClick(const QModelIndex&) ), Qt::UniqueConnection ); + } LightApp_SelectionMgr* sm = getApp()->selectionMgr(); @@ -1019,24 +1021,32 @@ void HEXABLOCKGUI::createAndFillDockWidget() _meshTreeView->show(); // QDockWidget *_dwObjectBrowser = 0; - QWidget* wid = getApp()->objectBrowser()->treeView(); - QWidget *w = wid->parentWidget(); - while ( w && !_dwObjectBrowser ) { - _dwObjectBrowser = ::qobject_cast( w ); - w = w->parentWidget(); + QWidget* wid = 0; + if ( getApp()->objectBrowser() ) + wid = getApp()->objectBrowser()->treeView(); + while ( wid && !_dwObjectBrowser ) { + _dwObjectBrowser = ::qobject_cast( wid ); + wid = wid->parentWidget(); + } + + if ( _dwObjectBrowser ) { + _dwObjectBrowser->setMinimumWidth(DW_MINIMUM_WIDTH); // --- force a minimum until display + _dwObjectBrowser->setWindowTitle("Study"); } - _dwObjectBrowser->setMinimumWidth(DW_MINIMUM_WIDTH); // --- force a minimum until display - _dwObjectBrowser->setWindowTitle("Study"); // dock widget position - aParent->addDockWidget( Qt::LeftDockWidgetArea, _dwObjectBrowser ); + if ( _dwObjectBrowser ) { + aParent->addDockWidget( Qt::LeftDockWidgetArea, _dwObjectBrowser ); + } aParent->addDockWidget( Qt::RightDockWidgetArea, _dwInputPanel ); // aParent->tabifyDockWidget( _dwPattern, _dwObjectBrowser ); // aParent->tabifyDockWidget( _dwGroups, _dwPattern ); // aParent->tabifyDockWidget( _dwMesh, _dwGroups ); - aParent->tabifyDockWidget( _dwObjectBrowser, _dwPattern ); + if ( _dwObjectBrowser ) { + aParent->tabifyDockWidget( _dwObjectBrowser, _dwPattern ); + } aParent->tabifyDockWidget( _dwPattern, _dwGroups ); aParent->tabifyDockWidget( _dwGroups, _dwMesh ); diff --git a/src/HEXABLOCKGUI/resources/SalomeApp.xml.in b/src/HEXABLOCKGUI/resources/SalomeApp.xml.in index 9eefdfe..891ca85 100755 --- a/src/HEXABLOCKGUI/resources/SalomeApp.xml.in +++ b/src/HEXABLOCKGUI/resources/SalomeApp.xml.in @@ -35,7 +35,7 @@
- +