From e3880e132fd480a3312b7c6db60da68c830e75b7 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 2 Nov 2009 11:45:43 +0100
Subject: [PATCH] Show active run configuration name in "mismatching
configuration" dialog
So the user better knows what he is actually choosing a new build
configuration for.
Reviewed-by: Robert Loehning
---
src/plugins/projectexplorer/projectexplorer.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index a4a1f9d016d..d04e1338801 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2161,8 +2161,6 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
));
descriptiveText->setWordWrap(true);
vlayout->addWidget(descriptiveText);
- QHBoxLayout *hlayout = new QHBoxLayout;
- hlayout->addWidget(new QLabel(tr("Choose build configuration:")));
m_configCombo = new QComboBox;
QSharedPointer<RunConfiguration> activeRun = m_project->activeRunConfiguration();
foreach (BuildConfiguration *config, m_project->buildConfigurations()) {
@@ -2176,10 +2174,12 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
m_changeBuildConfiguration->setEnabled(false);
}
-
- hlayout->addWidget(m_configCombo);
- hlayout->addStretch(10);
- vlayout->addLayout(hlayout);
+ QFormLayout *formlayout = new QFormLayout;
+ formlayout->addRow(ActiveConfigurationWidget::tr("Active run configuration"),
+ // ^ avoiding a new translatable string for active run configuration
+ new QLabel(activeRun->name()));
+ formlayout->addRow(tr("Choose build configuration:"), m_configCombo);
+ vlayout->addLayout(formlayout);
vlayout->addWidget(buttonBox);
m_cancel->setDefault(true);
}
--
GitLab