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

Beautifier: Fix hidden menu on Linux

Browse Source 
Task-number: QTCREATORBUG-15936
Change-Id: Id9387495a8c770167292fa526727f969b7408b2c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Lorenz Haas
2016-03-26 16:28:08 +01:00
parent 483fcb6ab7
commit 72f3f2f45b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -59,7 +59,6 @@
#include <QProcess> #include <QProcess>
#include <QScrollBar> #include <QScrollBar>
#include <QTextBlock> #include <QTextBlock>
#include <QTimer>
#include <QtPlugin> #include <QtPlugin>
using namespace TextEditor; using namespace TextEditor;
@@ -179,6 +178,7 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt
Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID); Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
menu->menu()->setTitle(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); menu->menu()->setTitle(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
menu->setOnAllDisabledBehavior(Core::ActionContainer::Show);
Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu); Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
foreach (BeautifierAbstractTool *tool, m_tools) { foreach (BeautifierAbstractTool *tool, m_tools) {
@@ -188,9 +188,7 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt
addAutoReleasedObject(object); addAutoReleasedObject(object);
} }
// The single shot is needed, otherwise the menu will stay disabled even updateActions();
// when the submenu's actions get enabled later on.
QTimer::singleShot(0, this, SLOT(updateActions()));
return true; return true;
} }