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

Fwl: Always update action look when retreiving it.

Browse Source
This commit is contained in:
Jacob Støren 2015-08-18 10:47:51 +02:00
parent f8c5bbc481
commit 4606a3de8b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Fwk/AppFwk/cafCommand/cafCmdFeature.cpp
View File

@ -61,24 +61,29 @@ QAction* CmdFeature::action()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QAction* CmdFeature::action(QString customText) QAction* CmdFeature::action(QString customText)
{ {
QAction* action = NULL;
std::map<QString, QAction*>::iterator it; std::map<QString, QAction*>::iterator it;
it = m_customTextToActionMap.find(customText); it = m_customTextToActionMap.find(customText);
if (it != m_customTextToActionMap.end() && it->second != NULL) if (it != m_customTextToActionMap.end() && it->second != NULL)
{ {
return it->second; action = it->second;
} }
else else
{ {
QAction* action = new QAction(this); action = new QAction(this);
connect(action, SIGNAL(triggered(bool)), SLOT(actionTriggered(bool)));
m_customTextToActionMap[customText]= action;
}
this->setupActionLook(action); this->setupActionLook(action);
if (!customText.isEmpty()) if (!customText.isEmpty())
{ {
action->setText(customText); action->setText(customText);
} }
connect(action, SIGNAL(triggered(bool)), SLOT(actionTriggered(bool)));
m_customTextToActionMap[customText]= action;
return action; return action;
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------