OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1323 Skip separator command when building context menu

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-19 08:47:29 +01:00
parent ad90d3f38f
commit bd659c0769
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -488,22 +488,29 @@ void RimContextCommandBuilder::appendCommandsToMenu(const QStringList& commandId
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
for (int i = 0; i < commandIds.size(); i++) for (int i = 0; i < commandIds.size(); i++)
{ {
caf::CmdFeature* feature = commandManager->getCommandFeature(commandIds[i].toStdString()); if (commandIds[i] == "Separator")
CVF_ASSERT(feature);
if (feature->canFeatureBeExecuted())
{ {
QAction* act = commandManager->action(commandIds[i]); menu->addSeparator();
CVF_ASSERT(act); }
else
{
caf::CmdFeature* feature = commandManager->getCommandFeature(commandIds[i].toStdString());
CVF_ASSERT(feature);
for (QAction* existingAct : menu->actions()) if (feature->canFeatureBeExecuted())
{ {
// If action exist, continue to make sure the action is positioned at the first QAction* act = commandManager->action(commandIds[i]);
// location of a command ID CVF_ASSERT(act);
if (existingAct == act) continue;
}
menu->addAction(act); for (QAction* existingAct : menu->actions())
{
// If action exist, continue to make sure the action is positioned at the first
// location of a command ID
if (existingAct == act) continue;
}
menu->addAction(act);
}
} }
} }
} }