Skip to content

GitLab

Commit e28df400 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] re-ordered "add" and "add and connect" menus.

parent a104fbfe
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/qtgui/controlPanel/WQtControlPanel.cpp
View file @ e28df400
...@@ -144,8 +144,8 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent ) ...@@ -144,8 +144,8 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent )
if( m_mainWindow->getNetworkEditor() ) if( m_mainWindow->getNetworkEditor() )
{ {
m_mainWindow->getNetworkEditor()->getView()->setContextMenuPolicy( Qt::ActionsContextMenu ); m_mainWindow->getNetworkEditor()->getView()->setContextMenuPolicy( Qt::ActionsContextMenu );
m_mainWindow->getNetworkEditor()->getView()->addAction( m_addModuleAction );
m_mainWindow->getNetworkEditor()->getView()->addAction( m_connectWithPrototypeAction ); m_mainWindow->getNetworkEditor()->getView()->addAction( m_connectWithPrototypeAction );
m_mainWindow->getNetworkEditor()->getView()->addAction( m_addModuleAction );
m_mainWindow->getNetworkEditor()->getView()->addAction( m_connectWithModuleAction ); m_mainWindow->getNetworkEditor()->getView()->addAction( m_connectWithModuleAction );
m_mainWindow->getNetworkEditor()->getView()->addAction( m_disconnectAction ); m_mainWindow->getNetworkEditor()->getView()->addAction( m_disconnectAction );
m_mainWindow->getNetworkEditor()->getView()->addAction( m_deleteModuleAction ); m_mainWindow->getNetworkEditor()->getView()->addAction( m_deleteModuleAction );
...@@ -153,8 +153,8 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent ) ...@@ -153,8 +153,8 @@ WQtControlPanel::WQtControlPanel( WMainWindow* parent )
m_mainWindow->getNetworkEditor()->getView()->addAction( m_configModuleFilterAction ); m_mainWindow->getNetworkEditor()->getView()->addAction( m_configModuleFilterAction );
// also add to the title actions // also add to the title actions
m_mainWindow->getNetworkEditor()->addTitleAction( m_addModuleAction, true );
m_mainWindow->getNetworkEditor()->addTitleAction( m_connectWithPrototypeAction, true ); m_mainWindow->getNetworkEditor()->addTitleAction( m_connectWithPrototypeAction, true );
m_mainWindow->getNetworkEditor()->addTitleAction( m_addModuleAction, true );
m_mainWindow->getNetworkEditor()->addTitleAction( m_deleteModuleAction, true ); m_mainWindow->getNetworkEditor()->addTitleAction( m_deleteModuleAction, true );
// m_mainWindow->getNetworkEditor()->addTitleAction( m_connectWithModuleAction ); // m_mainWindow->getNetworkEditor()->addTitleAction( m_connectWithModuleAction );
...@@ -1080,8 +1080,10 @@ void WQtControlPanel::createCompatibleButtons( boost::shared_ptr< WModule > modu ...@@ -1080,8 +1080,10 @@ void WQtControlPanel::createCompatibleButtons( boost::shared_ptr< WModule > modu
m_disconnectActionList = WQtCombinerActionList( this, m_mainWindow->getIconManager(), module->getPossibleDisconnections() ); m_disconnectActionList = WQtCombinerActionList( this, m_mainWindow->getIconManager(), module->getPossibleDisconnections() );
} }
QMenu* m;
// build the add menu // build the add menu
QMenu* m = new WQtMenuFiltered( getMissingModuleAction(), m_moduleTreeWidget ); m = new WQtMenuFiltered( getMissingModuleAction(), m_moduleTreeWidget );
m->addActions( m_addModuleActionList ); m->addActions( m_addModuleActionList );
m_addModuleAction->setDisabled( !m_addModuleActionList.size() ); // disable if no entry inside m_addModuleAction->setDisabled( !m_addModuleActionList.size() ); // disable if no entry inside
// delete( m_addModuleAction->menu() ); // ensure that combiners get free'd // delete( m_addModuleAction->menu() ); // ensure that combiners get free'd
......
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