feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ActionManager support for iconVisibleInMenu

Browse Source
This commit is contained in:
dt
2010-03-26 17:33:04 +01:00
parent 0bf506b7c2
commit cbe46198ad
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View File

@@ -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);

3
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -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());