diff options
Diffstat (limited to 'src/plugins/projectexplorer/runsettingspropertiespage.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/runsettingspropertiespage.cpp | 64 |
1 files changed, 24 insertions, 40 deletions
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 39b2f01af6..8a934874a7 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -26,22 +26,19 @@ #include "runsettingspropertiespage.h" #include "addrunconfigdialog.h" +#include "buildmanager.h" #include "buildstepspage.h" #include "deployconfiguration.h" -#include "runconfiguration.h" -#include "target.h" #include "projectconfigurationmodel.h" +#include "runconfiguration.h" #include "session.h" +#include "target.h" -#include <extensionsystem/pluginmanager.h> -#include <projectexplorer/projectexplorer.h> -#include <projectexplorer/buildmanager.h> #include <utils/algorithm.h> #include <utils/qtcassert.h> #include <utils/stringutils.h> #include <utils/utilsicons.h> -#include <QVariant> #include <QAction> #include <QComboBox> #include <QGridLayout> @@ -56,29 +53,10 @@ namespace ProjectExplorer { namespace Internal { -struct FactoryAndId -{ - RunConfigurationFactory *factory; - Core::Id id; -}; - -} // namespace Internal -} // namespace ProjectExplorer - -Q_DECLARE_METATYPE(ProjectExplorer::Internal::FactoryAndId) - -using namespace ProjectExplorer; -using namespace ProjectExplorer::Internal; -using ExtensionSystem::PluginManager; - -/// -/// RunSettingsWidget -/// +// RunSettingsWidget RunSettingsWidget::RunSettingsWidget(Target *target) : - m_target(target), - m_runConfigurationsModel(new RunConfigurationModel(target, this)), - m_deployConfigurationModel(new DeployConfigurationModel(target, this)) + m_target(target) { Q_ASSERT(m_target); @@ -143,10 +121,10 @@ RunSettingsWidget::RunSettingsWidget(Target *target) : // deploy part deployWidget->setContentsMargins(0, 10, 0, 25); m_deployLayout = new QVBoxLayout(deployWidget); - m_deployLayout->setMargin(0); + m_deployLayout->setContentsMargins(0, 0, 0, 0); m_deployLayout->setSpacing(5); - m_deployConfigurationCombo->setModel(m_deployConfigurationModel); + m_deployConfigurationCombo->setModel(m_target->deployConfigurationModel()); m_addDeployMenu = new QMenu(m_addDeployToolButton); m_addDeployToolButton->setMenu(m_addDeployMenu); @@ -175,7 +153,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) : // run part runWidget->setContentsMargins(0, 10, 0, 25); m_runLayout = new QVBoxLayout(runWidget); - m_runLayout->setMargin(0); + m_runLayout->setContentsMargins(0, 0, 0, 0); m_runLayout->setSpacing(5); m_disabledIcon = new QLabel; @@ -188,10 +166,10 @@ RunSettingsWidget::RunSettingsWidget(Target *target) : m_runLayout->addLayout(disabledHBox); + ProjectConfigurationModel *model = m_target->runConfigurationModel(); RunConfiguration *rc = m_target->activeRunConfiguration(); - m_runConfigurationCombo->setModel(m_runConfigurationsModel); - m_runConfigurationCombo->setCurrentIndex( - m_runConfigurationsModel->indexFor(rc).row()); + m_runConfigurationCombo->setModel(model); + m_runConfigurationCombo->setCurrentIndex(model->indexFor(rc)); m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1); m_renameRunButton->setEnabled(rc); @@ -284,10 +262,12 @@ void RunSettingsWidget::activeRunConfigurationChanged() { if (m_ignoreChange) return; - QModelIndex actRc = m_runConfigurationsModel->indexFor(m_target->activeRunConfiguration()); + + ProjectConfigurationModel *model = m_target->runConfigurationModel(); + int index = model->indexFor(m_target->activeRunConfiguration()); m_ignoreChange = true; - m_runConfigurationCombo->setCurrentIndex(actRc.row()); - setConfigurationWidget(qobject_cast<RunConfiguration *>(m_runConfigurationsModel->projectConfigurationAt(actRc.row()))); + m_runConfigurationCombo->setCurrentIndex(index); + setConfigurationWidget(qobject_cast<RunConfiguration *>(model->projectConfigurationAt(index))); m_ignoreChange = false; m_renameRunButton->setEnabled(m_target->activeRunConfiguration()); m_cloneRunButton->setEnabled(m_target->activeRunConfiguration()); @@ -318,7 +298,8 @@ void RunSettingsWidget::currentRunConfigurationChanged(int index) RunConfiguration *selectedRunConfiguration = nullptr; if (index >= 0) - selectedRunConfiguration = qobject_cast<RunConfiguration *>(m_runConfigurationsModel->projectConfigurationAt(index)); + selectedRunConfiguration = qobject_cast<RunConfiguration *> + (m_target->runConfigurationModel()->projectConfigurationAt(index)); if (selectedRunConfiguration == m_runConfiguration) return; @@ -339,7 +320,7 @@ void RunSettingsWidget::currentDeployConfigurationChanged(int index) SessionManager::setActiveDeployConfiguration(m_target, nullptr, SetActive::Cascade); else SessionManager::setActiveDeployConfiguration(m_target, - qobject_cast<DeployConfiguration *>(m_deployConfigurationModel->projectConfigurationAt(index)), + qobject_cast<DeployConfiguration *>(m_target->deployConfigurationModel()->projectConfigurationAt(index)), SetActive::Cascade); } @@ -434,9 +415,9 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc) if (!dc) return; - QModelIndex actDc = m_deployConfigurationModel->indexFor(dc); + int index = m_target->deployConfigurationModel()->indexFor(dc); m_ignoreChange = true; - m_deployConfigurationCombo->setCurrentIndex(actDc.row()); + m_deployConfigurationCombo->setCurrentIndex(index); m_ignoreChange = false; m_deployConfigurationWidget = dc->createConfigWidget(); @@ -551,3 +532,6 @@ void RunSettingsWidget::updateEnabledState() m_disabledText->setVisible(!enable && !reason.isEmpty()); m_disabledText->setText(reason); } + +} // Internal +} // ProjectExplorer |