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

Fix state handling of parser...

Browse Source 
...and enable/disable respective menu items accordingly.
Now it should be impossible to trigger more than one parse
at a time or setting a state and invalidating a state with
higher priority.

Change-Id: I0bcbeca6626209918e0a74b0bd2722583fc47bb3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-04-14 15:24:31 +02:00
parent a1e8cc5e44
commit b88bfbb55a
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/autotest/autotestplugin.cpp
View File

@@ -126,8 +126,10 @@ void AutotestPlugin::initializeMenuEntries()
TestTreeModel::instance()->parser(), &TestCodeParser::updateTestTree);
menu->addAction(command);
ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
connect(menu->menu(), &QMenu::aboutToShow, this, &AutotestPlugin::updateMenuItemsEnabledState);
ActionContainer *toolsMenu = ActionManager::actionContainer(Core::Constants::M_TOOLS);
toolsMenu->addMenu(menu);
connect(toolsMenu->menu(), &QMenu::aboutToShow,
this, &AutotestPlugin::updateMenuItemsEnabledState);
}
bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorString)
@@ -175,7 +177,8 @@ void AutotestPlugin::onRunSelectedTriggered()
void AutotestPlugin::updateMenuItemsEnabledState()
{
const bool enabled = !TestRunner::instance()->isTestRunning();
const bool enabled = !TestRunner::instance()->isTestRunning()
&& TestTreeModel::instance()->parser()->state() == TestCodeParser::Idle;
const bool hasTests = TestTreeModel::instance()->hasTests();
ActionManager::command(Constants::ACTION_RUN_ALL_ID)->action()->setEnabled(enabled && hasTests);