forked from qt-creator/qt-creator
ProjectExplorer: Start unifing visual appearance of run config widgets
Margins and layout style widely differ so far. Start moving everything to a QFormLayout with the same margin and growth policy. Change-Id: I0bd1d8b2ec9830be56354be1376a2a24eebb8845 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -54,8 +54,6 @@ public:
|
|||||||
CMakeRunConfigurationWidget(RunConfiguration *rc)
|
CMakeRunConfigurationWidget(RunConfiguration *rc)
|
||||||
{
|
{
|
||||||
auto fl = new QFormLayout(this);
|
auto fl = new QFormLayout(this);
|
||||||
fl->setMargin(0);
|
|
||||||
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
||||||
|
|
||||||
rc->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, fl);
|
rc->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, fl);
|
||||||
rc->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, fl);
|
rc->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, fl);
|
||||||
|
@@ -48,6 +48,7 @@
|
|||||||
#include <coreplugin/icore.h>
|
#include <coreplugin/icore.h>
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QFormLayout>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
@@ -304,6 +305,10 @@ QWidget *RunConfiguration::wrapWidget(QWidget *inner) const
|
|||||||
auto detailsWidget = new Utils::DetailsWidget;
|
auto detailsWidget = new Utils::DetailsWidget;
|
||||||
detailsWidget->setState(DetailsWidget::NoSummary);
|
detailsWidget->setState(DetailsWidget::NoSummary);
|
||||||
detailsWidget->setWidget(inner);
|
detailsWidget->setWidget(inner);
|
||||||
|
if (auto fl = qobject_cast<QFormLayout *>(inner->layout())){
|
||||||
|
fl->setMargin(0);
|
||||||
|
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
||||||
|
}
|
||||||
return detailsWidget;
|
return detailsWidget;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -331,8 +331,6 @@ PythonRunConfigurationWidget::PythonRunConfigurationWidget(PythonRunConfiguratio
|
|||||||
: m_runConfiguration(runConfiguration)
|
: m_runConfiguration(runConfiguration)
|
||||||
{
|
{
|
||||||
auto fl = new QFormLayout(this);
|
auto fl = new QFormLayout(this);
|
||||||
fl->setMargin(0);
|
|
||||||
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
||||||
|
|
||||||
auto interpreterChooser = new FancyLineEdit(this);
|
auto interpreterChooser = new FancyLineEdit(this);
|
||||||
interpreterChooser->setText(runConfiguration->interpreter());
|
interpreterChooser->setText(runConfiguration->interpreter());
|
||||||
|
@@ -64,8 +64,6 @@ public:
|
|||||||
explicit QbsRunConfigurationWidget(QbsRunConfiguration *rc)
|
explicit QbsRunConfigurationWidget(QbsRunConfiguration *rc)
|
||||||
{
|
{
|
||||||
auto toplayout = new QFormLayout(this);
|
auto toplayout = new QFormLayout(this);
|
||||||
toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
||||||
toplayout->setMargin(0);
|
|
||||||
|
|
||||||
rc->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
|
rc->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
|
||||||
rc->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
|
rc->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
|
||||||
|
@@ -115,8 +115,6 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
|
|||||||
: m_qmakeRunConfiguration(qmakeRunConfiguration)
|
: m_qmakeRunConfiguration(qmakeRunConfiguration)
|
||||||
{
|
{
|
||||||
auto toplayout = new QFormLayout(this);
|
auto toplayout = new QFormLayout(this);
|
||||||
toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
||||||
toplayout->setMargin(0);
|
|
||||||
|
|
||||||
m_qmakeRunConfiguration->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
|
m_qmakeRunConfiguration->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
|
||||||
m_qmakeRunConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
|
m_qmakeRunConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
|
||||||
|
@@ -51,7 +51,6 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
|
|||||||
m_fileListModel(new QStandardItemModel(this))
|
m_fileListModel(new QStandardItemModel(this))
|
||||||
{
|
{
|
||||||
auto form = new QFormLayout(this);
|
auto form = new QFormLayout(this);
|
||||||
form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
||||||
|
|
||||||
m_fileListCombo = new QComboBox;
|
m_fileListCombo = new QComboBox;
|
||||||
m_fileListCombo->setModel(m_fileListModel);
|
m_fileListCombo->setModel(m_fileListModel);
|
||||||
|
Reference in New Issue
Block a user