From 859d80961d204231e07bc9832276c589e15cf321 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Tue, 20 Sep 2011 12:44:11 +0200
Subject: [PATCH] Reduce size of general project settings
Part of a series of commits reducing the (vertical) size of the
preferences dialog.
Task-number: QTCREATORBUG-3172
Change-Id: I1f55607f8ee2e56e86098ba1700fb01671d8965b
Reviewed-on: http://codereview.qt-project.org/5234
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
.../projectexplorersettingspage.ui | 101 +++++++++---------
1 file changed, 51 insertions(+), 50 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index fde72579f98..5f9324985ed 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>447</width>
- <height>491</height>
+ <width>831</width>
+ <height>507</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -20,9 +20,6 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
- <item row="1" column="1">
- <widget class="Utils::PathChooser" name="projectsDirectoryPathChooser"/>
- </item>
<item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="currentDirectoryRadioButton">
<property name="text">
@@ -46,6 +43,9 @@
</attribute>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="Utils::PathChooser" name="projectsDirectoryPathChooser"/>
+ </item>
</layout>
</widget>
</item>
@@ -54,67 +54,60 @@
<property name="title">
<string>Build and Run</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
<widget class="QCheckBox" name="saveAllFilesCheckBox">
<property name="text">
<string>Save all files before build</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="buildProjectBeforeDeployCheckBox">
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="cleanOldAppOutputCheckBox">
<property name="text">
- <string>Always build project before deploying it</string>
+ <string>Clear old application output on a new run</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="deployProjectBeforeRunCheckBox">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="buildProjectBeforeDeployCheckBox">
<property name="text">
- <string>Always deploy project before running it</string>
+ <string>Always build project before deploying it</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="showCompileOutputCheckBox">
- <property name="text">
- <string>Open compiler output pane when building</string>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="mergeStdErrAndStdOutCheckBox">
+ <property name="toolTip">
+ <string>Enabling this option ensures that the order of interleaved messages from stdout and stderr is preserved, at the cost of disabling highlighting of stderr.</string>
</property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="showRunOutputCheckBox">
<property name="text">
- <string>Open application output pane when running</string>
+ <string>Merge stderr and stdout</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="cleanOldAppOutputCheckBox">
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="deployProjectBeforeRunCheckBox">
<property name="text">
- <string>Clear old application output on a new run</string>
+ <string>Always deploy project before running it</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="mergeStdErrAndStdOutCheckBox">
- <property name="toolTip">
- <string>Enabling this option ensures that the order of interleaved messages from stdout and stderr is preserved, at the cost of disabling highlighting of stderr.</string>
- </property>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="wrapAppOutputCheckBox">
<property name="text">
- <string>Merge stderr and stdout</string>
+ <string>Word-wrap application output</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="wrapAppOutputCheckBox">
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="showCompileOutputCheckBox">
<property name="text">
- <string>Word-wrap application output</string>
+ <string>Open compiler output pane when building</string>
</property>
</widget>
</item>
- <item>
+ <item row="3" column="1" rowspan="2">
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
@@ -150,23 +143,17 @@
</property>
</widget>
</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>
</widget>
</item>
- <item>
+ <item row="4" column="0">
+ <widget class="QCheckBox" name="showRunOutputCheckBox">
+ <property name="text">
+ <string>Open application output pane when running</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
<widget class="QCheckBox" name="promptToStopRunControlCheckBox">
<property name="toolTip">
<string>Ask before terminating the running application in response to clicking the stop button in Application Output.</string>
@@ -176,7 +163,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="6" column="0" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
@@ -210,6 +197,20 @@
</layout>
</item>
</layout>
+ <zorder>saveAllFilesCheckBox</zorder>
+ <zorder>buildProjectBeforeDeployCheckBox</zorder>
+ <zorder>deployProjectBeforeRunCheckBox</zorder>
+ <zorder>showCompileOutputCheckBox</zorder>
+ <zorder>showRunOutputCheckBox</zorder>
+ <zorder>cleanOldAppOutputCheckBox</zorder>
+ <zorder>mergeStdErrAndStdOutCheckBox</zorder>
+ <zorder>wrapAppOutputCheckBox</zorder>
+ <zorder>widget</zorder>
+ <zorder>promptToStopRunControlCheckBox</zorder>
+ <zorder>label</zorder>
+ <zorder>maxAppOutputBox</zorder>
+ <zorder>label_2</zorder>
+ <zorder>jomCheckbox</zorder>
</widget>
</item>
<item>
--
GitLab