From a06514c3651660872babb75bec127d38bffcb8b7 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 6 Apr 2018 17:23:06 +0200
Subject: [PATCH] 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>
---
 src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp    | 2 --
 src/plugins/projectexplorer/runconfiguration.cpp             | 5 +++++
 src/plugins/pythoneditor/pythoneditorplugin.cpp              | 2 --
 src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp        | 2 --
 .../qmakeprojectmanager/desktopqmakerunconfiguration.cpp     | 2 --
 .../qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp   | 1 -
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index ff28f3981fc..ca6fe49ba0e 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -54,8 +54,6 @@ public:
     CMakeRunConfigurationWidget(RunConfiguration *rc)
     {
         auto fl = new QFormLayout(this);
-        fl->setMargin(0);
-        fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
         rc->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, fl);
         rc->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, fl);
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 7a4b70e5930..1af6e7f930c 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -48,6 +48,7 @@
 #include <coreplugin/icore.h>
 
 #include <QDir>
+#include <QFormLayout>
 #include <QPushButton>
 #include <QTimer>
 #include <QLoggingCategory>
@@ -304,6 +305,10 @@ QWidget *RunConfiguration::wrapWidget(QWidget *inner) const
     auto detailsWidget = new Utils::DetailsWidget;
     detailsWidget->setState(DetailsWidget::NoSummary);
     detailsWidget->setWidget(inner);
+    if (auto fl = qobject_cast<QFormLayout *>(inner->layout())){
+        fl->setMargin(0);
+        fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
+    }
     return detailsWidget;
 }
 
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index 59ce3750570..ddc6fa50eff 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -331,8 +331,6 @@ PythonRunConfigurationWidget::PythonRunConfigurationWidget(PythonRunConfiguratio
     : m_runConfiguration(runConfiguration)
 {
     auto fl = new QFormLayout(this);
-    fl->setMargin(0);
-    fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     auto interpreterChooser = new FancyLineEdit(this);
     interpreterChooser->setText(runConfiguration->interpreter());
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index c8d02c8e98e..066d56abc0b 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -64,8 +64,6 @@ public:
     explicit QbsRunConfigurationWidget(QbsRunConfiguration *rc)
     {
         auto toplayout = new QFormLayout(this);
-        toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
-        toplayout->setMargin(0);
 
         rc->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
         rc->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
index db0b2374a08..b76fc90d318 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
@@ -115,8 +115,6 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
     :  m_qmakeRunConfiguration(qmakeRunConfiguration)
 {
     auto toplayout = new QFormLayout(this);
-    toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
-    toplayout->setMargin(0);
 
     m_qmakeRunConfiguration->extraAspect<ExecutableAspect>()->addToMainConfigurationWidget(this, toplayout);
     m_qmakeRunConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, toplayout);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index d9aac536cfb..a9742058553 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
@@ -51,7 +51,6 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
     m_fileListModel(new QStandardItemModel(this))
 {
     auto form = new QFormLayout(this);
-    form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     m_fileListCombo = new QComboBox;
     m_fileListCombo->setModel(m_fileListModel);