Skip to content
Snippets Groups Projects
Commit d877689f authored by Eike Ziller's avatar Eike Ziller
Browse files

Reduce vertical minimum size of perforce settings. 

Change-Id: I1a6c6b2fe6fcafda75e30e96995baa5194461846
Reviewed-on: http://codereview.qt-project.org/5022


Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent e7c118c7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/plugins/perforce/settingspage.ui
+ 89
− 83
View file @ d877689f
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>306</width> <width>657</width>
<height>516</height> <height>430</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
...@@ -16,15 +16,15 @@ ...@@ -16,15 +16,15 @@
<property name="title"> <property name="title">
<string>Configuration</string> <string>Configuration</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item row="0" column="0"> <item>
<widget class="QLabel" name="commandLabel"> <widget class="QLabel" name="commandLabel">
<property name="text"> <property name="text">
<string>P4 command:</string> <string>P4 command:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="Utils::PathChooser" name="pathChooser" native="true"/> <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
</item> </item>
</layout> </layout>
...@@ -44,37 +44,37 @@ ...@@ -44,37 +44,37 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="1"> <item row="0" column="0">
<widget class="QLineEdit" name="clientLineEdit"/> <widget class="QLabel" name="portLabel">
<property name="text">
<string>P4 port:</string>
</property>
</widget>
</item> </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"> <widget class="QLabel" name="clientLabel">
<property name="text"> <property name="text">
<string>P4 client:</string> <string>P4 client:</string>
</property> </property>
</widget> </widget>
</item> </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"> <widget class="QLabel" name="userLabel">
<property name="text"> <property name="text">
<string>P4 user:</string> <string>P4 user:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="5">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>P4 port:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="userLineEdit"/> <widget class="QLineEdit" name="userLineEdit"/>
</item> </item>
<item row="0" column="1">
<widget class="QLineEdit" name="portLineEdit"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -83,52 +83,74 @@ ...@@ -83,52 +83,74 @@
<property name="title"> <property name="title">
<string>Miscellaneous</string> <string>Miscellaneous</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="fieldGrowthPolicy"> <item row="0" column="0">
<enum>QFormLayout::ExpandingFieldsGrow</enum> <layout class="QHBoxLayout" name="horizontalLayout_4">
</property> <item>
<item row="1" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<widget class="QLabel" name="timeOutLabel"> <item>
<property name="text"> <widget class="QLabel" name="logCountLabel">
<string>Timeout:</string> <property name="text">
</property> <string>Log count:</string>
</widget> </property>
</item> </widget>
<item row="1" column="1"> </item>
<widget class="QSpinBox" name="timeOutSpinBox"> <item>
<property name="suffix"> <widget class="QSpinBox" name="logCountSpinBox">
<string>s</string> <property name="maximum">
</property> <number>10000</number>
<property name="minimum"> </property>
<number>1</number> </widget>
</property> </item>
<property name="maximum"> </layout>
<number>360</number> </item>
</property> <item>
</widget> <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>
<item row="2" column="0" colspan="2"> <item row="1" column="0">
<widget class="QCheckBox" name="promptToSubmitCheckBox"> <widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text"> <property name="text">
<string>Prompt on submit</string> <string>Prompt on submit</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="2" 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">
<widget class="QCheckBox" name="autoOpenCheckBox"> <widget class="QCheckBox" name="autoOpenCheckBox">
<property name="text"> <property name="text">
<string>Automatically open files when editing</string> <string>Automatically open files when editing</string>
...@@ -138,24 +160,15 @@ ...@@ -138,24 +160,15 @@
</layout> </layout>
</widget> </widget>
</item> </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> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <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> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
...@@ -191,13 +204,6 @@ ...@@ -191,13 +204,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QLabel" name="errorLabel">
<property name="text">
<string notr="true" extracomment="Placeholder">errorLabel: blah blubb</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment