From d877689f4fdc0e05d8b3e7d75e89731b8dc1ebc2 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Thu, 15 Sep 2011 18:43:07 +0200
Subject: [PATCH] Reduce vertical minimum size of perforce settings.
Change-Id: I1a6c6b2fe6fcafda75e30e96995baa5194461846
Reviewed-on: http://codereview.qt-project.org/5022
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
src/plugins/perforce/settingspage.ui | 172 ++++++++++++++-------------
1 file changed, 89 insertions(+), 83 deletions(-)
diff --git a/src/plugins/perforce/settingspage.ui b/src/plugins/perforce/settingspage.ui
index cd59e337849..974b9569019 100644
--- a/src/plugins/perforce/settingspage.ui
+++ b/src/plugins/perforce/settingspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>306</width>
- <height>516</height>
+ <width>657</width>
+ <height>430</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -16,15 +16,15 @@
<property name="title">
<string>Configuration</string>
</property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
<widget class="QLabel" name="commandLabel">
<property name="text">
<string>P4 command:</string>
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item>
<widget class="Utils::PathChooser" name="pathChooser" native="true"/>
</item>
</layout>
@@ -44,37 +44,37 @@
<property name="checked">
<bool>false</bool>
</property>
- <layout class="QGridLayout">
- <item row="1" column="1">
- <widget class="QLineEdit" name="clientLineEdit"/>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="portLabel">
+ <property name="text">
+ <string>P4 port:</string>
+ </property>
+ </widget>
</item>
- <item row="1" column="0">
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="portLineEdit"/>
+ </item>
+ <item row="0" column="2">
<widget class="QLabel" name="clientLabel">
<property name="text">
<string>P4 client:</string>
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="0" column="3">
+ <widget class="QLineEdit" name="clientLineEdit"/>
+ </item>
+ <item row="0" column="4">
<widget class="QLabel" name="userLabel">
<property name="text">
<string>P4 user:</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="portLabel">
- <property name="text">
- <string>P4 port:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
+ <item row="0" column="5">
<widget class="QLineEdit" name="userLineEdit"/>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="portLineEdit"/>
- </item>
</layout>
</widget>
</item>
@@ -83,52 +83,74 @@
<property name="title">
<string>Miscellaneous</string>
</property>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="1" column="0">
- <widget class="QLabel" name="timeOutLabel">
- <property name="text">
- <string>Timeout:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="timeOutSpinBox">
- <property name="suffix">
- <string>s</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>360</number>
- </property>
- </widget>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="logCountLabel">
+ <property name="text">
+ <string>Log count:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="logCountSpinBox">
+ <property name="maximum">
+ <number>10000</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="timeOutLabel">
+ <property name="text">
+ <string>Timeout:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="timeOutSpinBox">
+ <property name="suffix">
+ <string>s</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>360</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <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 row="2" column="0" colspan="2">
+ <item row="1" column="0">
<widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="logCountLabel">
- <property name="text">
- <string>Log count:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="logCountSpinBox">
- <property name="maximum">
- <number>10000</number>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="2">
+ <item row="2" column="0">
<widget class="QCheckBox" name="autoOpenCheckBox">
<property name="text">
<string>Automatically open files when editing</string>
@@ -138,24 +160,15 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="errorLabel">
+ <property name="text">
+ <string notr="true" extracomment="Placeholder">errorLabel: blah blubb</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@@ -191,13 +204,6 @@
</property>
</spacer>
</item>
- <item>
- <widget class="QLabel" name="errorLabel">
- <property name="text">
- <string notr="true" extracomment="Placeholder">errorLabel: blah blubb</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<customwidgets>
--
GitLab