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

RunSettings: Do not needlessly recreate RunConfiguartionConfigWidgets

Browse Source 
Change-Id: I0b8afe05b12123117959eec6f7465ebd4950e197
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-10-18 17:46:04 +02:00
parent 9dd656914a
commit ceba333683
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/runsettingspropertiespage.cpp
View File

@@ -237,14 +237,15 @@ RunSettingsWidget::RunSettingsWidget(Target *target)
m_addRunMenu = new QMenu(m_addRunToolButton); m_addRunMenu = new QMenu(m_addRunToolButton);
m_addRunToolButton->setMenu(m_addRunMenu); m_addRunToolButton->setMenu(m_addRunMenu);
RunConfiguration *rc = m_target->activeRunConfiguration();
m_runConfigurationCombo->setModel(m_runConfigurationsModel); m_runConfigurationCombo->setModel(m_runConfigurationsModel);
m_runConfigurationCombo->setCurrentIndex( m_runConfigurationCombo->setCurrentIndex(
m_runConfigurationsModel->indexFor(m_target->activeRunConfiguration()).row()); m_runConfigurationsModel->indexFor(rc).row());
m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1); m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1);
m_renameRunButton->setEnabled(m_target->activeRunConfiguration()); m_renameRunButton->setEnabled(rc);
setConfigurationWidget(m_target->activeRunConfiguration()); setConfigurationWidget(rc);
connect(m_addRunMenu, SIGNAL(aboutToShow()), connect(m_addRunMenu, SIGNAL(aboutToShow()),
this, SLOT(aboutToShowAddMenu())); this, SLOT(aboutToShowAddMenu()));
@@ -523,12 +524,16 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc)
void RunSettingsWidget::setConfigurationWidget(RunConfiguration *rc) void RunSettingsWidget::setConfigurationWidget(RunConfiguration *rc)
{ {
if (rc == m_runConfiguration)
return;
delete m_runConfigurationWidget; delete m_runConfigurationWidget;
m_runConfigurationWidget = 0; m_runConfigurationWidget = 0;
removeSubWidgets(); removeSubWidgets();
if (!rc) if (!rc)
return; return;
m_runConfigurationWidget = rc->createConfigurationWidget(); m_runConfigurationWidget = rc->createConfigurationWidget();
m_runConfiguration = rc;
if (m_runConfigurationWidget) if (m_runConfigurationWidget)
m_runLayout->addWidget(m_runConfigurationWidget); m_runLayout->addWidget(m_runConfigurationWidget);
@@ -567,7 +572,7 @@ QString RunSettingsWidget::uniqueRCName(const QString &name)
void RunSettingsWidget::addRunControlWidgets() void RunSettingsWidget::addRunControlWidgets()
{ {
foreach (IRunConfigurationAspect *aspect, m_target->activeRunConfiguration()->extraAspects()) { foreach (IRunConfigurationAspect *aspect, m_runConfiguration->extraAspects()) {
ProjectExplorer::RunConfigWidget *rcw = aspect->createConfigurationWidget(); ProjectExplorer::RunConfigWidget *rcw = aspect->createConfigurationWidget();
if (rcw) if (rcw)
addSubWidget(rcw); addSubWidget(rcw);