diff options
| author | Friedemann Kleint <qtc-committer@nokia.com> | 2008-12-04 11:23:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <qtc-committer@nokia.com> | 2008-12-04 11:23:03 +0100 |
| commit | d63c68f39ad3d989ebcce701bfe1c37e7a1c7b63 (patch) | |
| tree | 7170d640765526f78e0110d086676b55e3f5b074 /src/plugins/git/settingspage.ui | |
| parent | 8b018225b0169c220d112d9e55db6bf238c89aaf (diff) | |
| download | qt-creator-d63c68f39ad3d989ebcce701bfe1c37e7a1c7b63.tar.gz | |
Fixes: Refactor git settings code, add some more menu options
Diffstat (limited to 'src/plugins/git/settingspage.ui')
| -rw-r--r-- | src/plugins/git/settingspage.ui | 183 |
1 files changed, 88 insertions, 95 deletions
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui index 738413e676..aa2337605b 100644 --- a/src/plugins/git/settingspage.ui +++ b/src/plugins/git/settingspage.ui @@ -6,103 +6,113 @@ <rect> <x>0</x> <y>0</y> - <width>345</width> - <height>177</height> + <width>436</width> + <height>186</height> </rect> </property> <property name="windowTitle"> <string>Form</string> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QCheckBox" name="adoptCheckBox"> - <property name="text"> - <string>Use System Environment</string> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="title"> - <string>Environment variables</string> - </property> - <property name="checkable"> - <bool>false</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>PATH:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="pathLineEdit"/> - </item> - <item row="0" column="2"> - <widget class="QPushButton" name="adoptButton"> - <property name="text"> - <string>Adopt</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>52</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Note</span><span style=" font-size:8pt;"> that Git needs Perl in the environment as well</span></p></body></html></string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Commit display count:</string> + <widget class="QGroupBox" name="environmentGroupBox"> + <property name="enabled"> + <bool>true</bool> </property> + <property name="title"> + <string>Environment variables</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <layout class="QFormLayout" name="formLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="pathlabel"> + <property name="text"> + <string>PATH:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLineEdit" name="pathLineEdit"/> + </item> + <item> + <widget class="QPushButton" name="adoptButton"> + <property name="text"> + <string>From system</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="noteLabel"> + <property name="text"> + <string><b>Note:</b></string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="noteFieldlabel"> + <property name="text"> + <string>Git needs to find Perl in the environment as well.</string> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="QLineEdit" name="logLineEdit"> - <property name="toolTip"> - <string>Note that huge amount of commits might take some time.</string> + <layout class="QFormLayout" name="logFormLayout"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::ExpandingFieldsGrow</enum> </property> - </widget> + <item row="0" column="1"> + <widget class="QSpinBox" name="logCountSpinBox"> + <property name="toolTip"> + <string>Note that huge amount of commits might take some time.</string> + </property> + <property name="maximum"> + <number>1000</number> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="logCountLabel"> + <property name="text"> + <string>Log commit display count:</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> </item> </layout> </item> <item> - <spacer> + <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>141</width> + <width>40</width> <height>20</height> </size> </property> @@ -114,22 +124,5 @@ p, li { white-space: pre-wrap; } <tabstop>pathLineEdit</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>adoptCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>groupBox</receiver> - <slot>setDisabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>144</x> - <y>33</y> - </hint> - <hint type="destinationlabel"> - <x>139</x> - <y>65</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui> |