Commit cbe46198 authored by dt's avatar dt
Browse files

ActionManager support for iconVisibleInMenu

parent 0bf506b7
...@@ -367,6 +367,8 @@ Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const ...@@ -367,6 +367,8 @@ Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const
baseAction->setParent(m_mainWnd); baseAction->setParent(m_mainWnd);
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
baseAction->setIconVisibleInMenu(false); baseAction->setIconVisibleInMenu(false);
#else
baseAction->setIconVisibleInMenu(action->isIconVisibleInMenu());
#endif #endif
a->setAction(baseAction); a->setAction(baseAction);
m_mainWnd->addAction(baseAction); m_mainWnd->addAction(baseAction);
......
...@@ -493,6 +493,9 @@ void Action::actionChanged() ...@@ -493,6 +493,9 @@ void Action::actionChanged()
if (hasAttribute(CA_UpdateIcon)) { if (hasAttribute(CA_UpdateIcon)) {
m_action->setIcon(m_currentAction->icon()); m_action->setIcon(m_currentAction->icon());
m_action->setIconText(m_currentAction->iconText()); m_action->setIconText(m_currentAction->iconText());
#ifndef Q_WS_MAC
m_action->setIconVisibleInMenu(m_currentAction->isIconVisibleInMenu());
#endif
} }
if (hasAttribute(CA_UpdateText)) { if (hasAttribute(CA_UpdateText)) {
m_action->setText(m_currentAction->text()); m_action->setText(m_currentAction->text());
......
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