Commit 1d34c3e6 by Sebastian Eichelbaum

[CHANGE] - compatibles toolbar updates by using network editor.

parent ee37db61
...@@ -805,8 +805,13 @@ void WQtControlPanel::selectDataModule( boost::shared_ptr< WDataSet > dataSet ) ...@@ -805,8 +805,13 @@ void WQtControlPanel::selectDataModule( boost::shared_ptr< WDataSet > dataSet )
void WQtControlPanel::setNewActiveModule( boost::shared_ptr< WModule > module ) void WQtControlPanel::setNewActiveModule( boost::shared_ptr< WModule > module )
{ {
m_tabWidget->clear(); m_tabWidget->clear();
// NOTE: this handles null pointers properly.
createCompatibleButtons( module );
if ( module ) if ( module )
{ {
createCompatibleButtons( module );
buildPropTab( module->getProperties(), module->getInformationProperties() ); buildPropTab( module->getProperties(), module->getInformationProperties() );
} }
} }
......
...@@ -98,8 +98,6 @@ void WQtNetworkEditor::selectItem() ...@@ -98,8 +98,6 @@ void WQtNetworkEditor::selectItem()
{ {
boost::shared_ptr< WModule > module; boost::shared_ptr< WModule > module;
//WQtCombinerToolbar* newToolbar = NULL;
if ( m_scene->selectedItems().size() != 0 && if ( m_scene->selectedItems().size() != 0 &&
m_scene->selectedItems().at( 0 )->type() == WQtNetworkItem::Type ) m_scene->selectedItems().at( 0 )->type() == WQtNetworkItem::Type )
{ {
...@@ -120,10 +118,6 @@ void WQtNetworkEditor::selectItem() ...@@ -120,10 +118,6 @@ void WQtNetworkEditor::selectItem()
{ {
m_mainWindow->getControlPanel()->setNewActiveModule( module ); m_mainWindow->getControlPanel()->setNewActiveModule( module );
} }
// set the new toolbar
// NOTE: setCompatiblesToolbar removes the toolbar if NULL is specified.
//m_mainWindow->setCompatiblesToolbar( newToolbar );
} }
void WQtNetworkEditor::addModule( boost::shared_ptr< WModule > module ) void WQtNetworkEditor::addModule( boost::shared_ptr< WModule > module )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment