feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Nicer content margins.

Browse Source
This commit is contained in:
con
2009-07-22 16:33:59 +02:00
parent 2010565d2d
commit 60deb636ad
6 changed files with 98 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -139,6 +139,7 @@ BuildSettingsWidget::BuildSettingsWidget(Project *project)
: m_project(project)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setContentsMargins(0, -1, 0, -1);
QHBoxLayout *hbox = new QHBoxLayout();
hbox->addWidget(new QLabel(tr("Build Configuration:"), this));
m_buildConfigurationComboBox = new QComboBox(this);

1
src/plugins/projectexplorer/dependenciespanel.cpp
View File

@@ -163,6 +163,7 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
, m_model(new DependenciesModel(session, project, this))
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setContentsMargins(0, -1, 0, -1);
QTreeView *treeView = new QTreeView(this);
treeView->setModel(m_model);
treeView->setHeaderHidden(true);

21
src/plugins/projectexplorer/editorsettingspropertiespage.ui
View File

@@ -2,18 +2,29 @@
<ui version="4.0">
<class>ProjectExplorer::Internal::EditorSettingsPropertiesPage</class>
<widget class="QWidget" name="ProjectExplorer::Internal::EditorSettingsPropertiesPage">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>275</width>
<height>44</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<item row="0" column="0">
<property name="rightMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="encodingLabel">
<property name="text">
<string>Default File Encoding:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<item>
<widget class="QComboBox" name="encodingComboBox"/>
</item>
</layout>

1
src/plugins/projectexplorer/environmenteditmodel.cpp
View File

@@ -434,6 +434,7 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent)
m_summaryPage = new QWidget();
addWidget(m_summaryPage);
QVBoxLayout *vbox = new QVBoxLayout(m_summaryPage);
vbox->setContentsMargins(0, -1, 0, -1);
m_summaryText = new QLabel(this);
m_summaryText->setText("");

133
src/plugins/projectexplorer/runsettingspropertiespage.ui
View File

@@ -11,54 +11,28 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Active run configuration:</string>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="activeRunConfigurationCombo">
<property name="maximumSize">
<size>
<width>500</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<property name="minimumContentsLength">
<number>15</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Edit run configuration:</string>
</property>
<property name="buddy">
<cstring>runConfigurationCombo</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="runConfigurationCombo">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Active run configuration:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="activeRunConfigurationCombo">
<property name="maximumSize">
<size>
<width>500</width>
@@ -73,22 +47,71 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="addToolButton">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>+</string>
<string>Edit run configuration:</string>
</property>
<property name="buddy">
<cstring>runConfigurationCombo</cstring>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeToolButton">
<property name="text">
<string>-</string>
</property>
</widget>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="runConfigurationCombo">
<property name="maximumSize">
<size>
<width>500</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<property name="minimumContentsLength">
<number>15</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="addToolButton">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeToolButton">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>

1
src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
View File

@@ -43,6 +43,7 @@ Qt4BuildEnvironmentWidget::Qt4BuildEnvironmentWidget(Qt4Project *project)
: BuildStepConfigWidget(), m_pro(project)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(0);
m_clearSystemEnvironmentCheckBox = new QCheckBox(this);
m_clearSystemEnvironmentCheckBox->setText("Clear system environment");