From a46c18ba4106c98f138bad0b458c0792ea5c5f50 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 23 Sep 2009 17:16:09 +0200
Subject: [PATCH] Set margin to zero everywhere on the project pane.
Makes the project pane look nicer.
---
.../projectexplorer/buildsettingspropertiespage.cpp | 1 +
src/plugins/projectexplorer/projectwindow.cpp | 2 ++
src/plugins/projectexplorer/runsettingspropertiespage.ui | 7 +++++--
src/plugins/qt4projectmanager/makestep.ui | 7 +++++--
src/plugins/qt4projectmanager/qmakestep.ui | 7 +++++--
src/plugins/qt4projectmanager/qt4projectconfigwidget.ui | 3 +++
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 4 +++-
7 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 3fd4c8999ac..28665c27525 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -125,6 +125,7 @@ BuildSettingsSubWidgets::BuildSettingsSubWidgets(QWidget *parent)
: QWidget(parent)
{
new QVBoxLayout(this);
+ layout()->setMargin(0);
}
///
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index d71ad55cea0..585b8620631 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -158,6 +158,7 @@ ActiveConfigurationWidget::ActiveConfigurationWidget(QWidget *parent)
: QWidget(parent)
{
QGridLayout *grid = new QGridLayout(this);
+ grid->setMargin(0);
RunConfigurationComboBox *runConfigurationComboBox = new RunConfigurationComboBox(this);
grid->addWidget(new QLabel(tr("Active run configuration")), 0, 0);
grid->addWidget(runConfigurationComboBox, 0, 1);
@@ -603,6 +604,7 @@ ProjectWindow::ProjectWindow(QWidget *parent)
m_spacerBetween = new QWidget(this);
QVBoxLayout *vbox = new QVBoxLayout(m_spacerBetween);
+ vbox->setMargin(0);
m_spacerBetween->setLayout(vbox);
vbox->addSpacerItem(new QSpacerItem(10, 15, QSizePolicy::Fixed, QSizePolicy::Fixed));
vbox->addWidget(new OnePixelBlackLine(m_spacerBetween));
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.ui b/src/plugins/projectexplorer/runsettingspropertiespage.ui
index e95e8e4b765..8c4aec3e786 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.ui
@@ -6,11 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>416</width>
- <height>35</height>
+ <width>437</width>
+ <height>25</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui
index f2007e7e398..1dfff96f279 100644
--- a/src/plugins/qt4projectmanager/makestep.ui
+++ b/src/plugins/qt4projectmanager/makestep.ui
@@ -6,11 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>235</width>
- <height>64</height>
+ <width>220</width>
+ <height>46</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="makeLabel">
<property name="text">
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index f8d5b9b62b6..f59dedaf526 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -6,11 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>448</width>
- <height>210</height>
+ <width>390</width>
+ <height>172</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
index 4ccc7d45334..785e8d63272 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
@@ -52,6 +52,9 @@ placeholder</string>
<item>
<widget class="QWidget" name="detailsWidget" native="true">
<layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="nameLabel">
<property name="text">
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 3b12a26b18f..76e25d0a794 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -141,6 +141,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
resetButton->setIcon(QIcon(":/core/images/reset.png"));
QHBoxLayout *boxlayout = new QHBoxLayout();
+ boxlayout->setMargin(0);
boxlayout->addWidget(m_workingDirectoryEdit);
boxlayout->addWidget(resetButton);
toplayout->addRow(tr("Working Directory:"), boxlayout);
@@ -165,7 +166,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
m_detailsWidget = new QWidget(this);
m_detailsWidget->setVisible(false);
QVBoxLayout *vboxTopLayout = new QVBoxLayout(this);
- vboxTopLayout->setContentsMargins(0, -1, 0, -1);
+ vboxTopLayout->setMargin(0);
m_summaryLabel = new QLabel(this);
m_summaryLabel->setText("This is a summary");
QAbstractButton *detailsButton = new Utils::DetailsButton(this);
@@ -174,6 +175,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
this, SLOT(toggleDetails()));
QHBoxLayout *detailsLayout = new QHBoxLayout();
+ detailsLayout->setMargin(0);
detailsLayout->addWidget(m_summaryLabel);
detailsLayout->addWidget(detailsButton);
--
GitLab