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

VCS: Unify VCS options pages a bit

Browse Source 
Change-Id: Ibf2e2871a8e7cd61ade67caf0d110359ffba71d5
Reviewed-on: http://codereview.qt-project.org/5999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Tobias Hunger
2011-10-04 15:57:17 +00:00
parent b3728b1443
commit 66f9d21e16
5 changed files with 156 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/bazaar/optionspage.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>359</height> <height>303</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -81,7 +81,7 @@
<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">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="showLogEntriesLabel"> <widget class="QLabel" name="showLogEntriesLabel">
<property name="text"> <property name="text">
@@ -97,8 +97,24 @@
<property name="maximum"> <property name="maximum">
<number>1000</number> <number>1000</number>
</property> </property>
<property name="value">
<number>1000</number>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>213</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="timeoutSecondsLabel"> <widget class="QLabel" name="timeoutSecondsLabel">
<property name="text"> <property name="text">
@@ -116,7 +132,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="promptOnSubmitCheckBox"> <widget class="QCheckBox" name="promptOnSubmitCheckBox">
<property name="text"> <property name="text">
<string>Prompt on submit</string> <string>Prompt on submit</string>

29
src/plugins/git/settingspage.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>390</width> <width>390</width>
<height>444</height> <height>361</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@@ -77,14 +77,11 @@
<property name="title"> <property name="title">
<string>Miscellaneous</string> <string>Miscellaneous</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="logCountLabel"> <widget class="QLabel" name="logCountLabel">
<property name="text"> <property name="text">
<string>Log commit display count:</string> <string>Log count:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -96,8 +93,24 @@
<property name="maximum"> <property name="maximum">
<number>1000</number> <number>1000</number>
</property> </property>
<property name="value">
<number>1000</number>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>211</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="timeoutLabel"> <widget class="QLabel" name="timeoutLabel">
<property name="text"> <property name="text">
@@ -121,14 +134,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="3">
<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="3" column="0" colspan="2"> <item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="pullRebaseCheckBox"> <widget class="QCheckBox" name="pullRebaseCheckBox">
<property name="text"> <property name="text">
<string>Pull with rebase</string> <string>Pull with rebase</string>

25
src/plugins/mercurial/optionspage.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>359</height> <height>304</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -81,7 +81,7 @@
<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">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="showLogEntriesLabel"> <widget class="QLabel" name="showLogEntriesLabel">
<property name="text"> <property name="text">
@@ -94,8 +94,27 @@
<property name="toolTip"> <property name="toolTip">
<string>The number of recent commit logs to show, choose 0 to see all enteries</string> <string>The number of recent commit logs to show, choose 0 to see all enteries</string>
</property> </property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>217</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="timeoutSecondsLabel"> <widget class="QLabel" name="timeoutSecondsLabel">
<property name="text"> <property name="text">
@@ -113,7 +132,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="promptOnSubmitCheckBox"> <widget class="QCheckBox" name="promptOnSubmitCheckBox">
<property name="text"> <property name="text">
<string>Prompt on submit</string> <string>Prompt on submit</string>

77
src/plugins/perforce/settingspage.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>657</width> <width>595</width>
<height>430</height> <height>334</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@@ -85,35 +85,57 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="logCountLabel"> <widget class="QLabel" name="logCountLabel">
<property name="text"> <property name="text">
<string>Log count:</string> <string>Log count:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QSpinBox" name="logCountSpinBox"> <widget class="QSpinBox" name="logCountSpinBox">
<property name="maximum"> <property name="maximum">
<number>10000</number> <number>10000</number>
</property> </property>
<property name="value">
<number>1000</number>
</property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="4">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>396</width>
<height>22</height>
</size>
</property>
</spacer>
</item> </item>
<item> <item row="2" column="0" colspan="5">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QCheckBox" name="promptToSubmitCheckBox">
<item> <property name="text">
<string>Prompt on submit</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="5">
<widget class="QCheckBox" name="autoOpenCheckBox">
<property name="text">
<string>Automatically open files when editing</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="timeOutLabel"> <widget class="QLabel" name="timeOutLabel">
<property name="text"> <property name="text">
<string>Timeout:</string> <string>Timeout:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QSpinBox" name="timeOutSpinBox"> <widget class="QSpinBox" name="timeOutSpinBox">
<property name="suffix"> <property name="suffix">
<string>s</string> <string>s</string>
@@ -127,37 +149,6 @@
</widget> </widget>
</item> </item>
</layout> </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="1" column="0">
<widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="autoOpenCheckBox">
<property name="text">
<string>Automatically open files when editing</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>

61
src/plugins/subversion/settingspage.ui
View File

@@ -2,6 +2,14 @@
<ui version="4.0"> <ui version="4.0">
<class>Subversion::Internal::SettingsPage</class> <class>Subversion::Internal::SettingsPage</class>
<widget class="QWidget" name="Subversion::Internal::SettingsPage"> <widget class="QWidget" name="Subversion::Internal::SettingsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>314</width>
<height>330</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="generalGroupBox"> <widget class="QGroupBox" name="generalGroupBox">
@@ -17,7 +25,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="Utils::PathChooser" name="pathChooser"/> <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -63,10 +71,37 @@
<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">
<property name="fieldGrowthPolicy"> <item row="0" column="0">
<enum>QFormLayout::ExpandingFieldsGrow</enum> <widget class="QLabel" name="logCountLabel">
<property name="text">
<string>Log count:</string>
</property> </property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="logCountSpinBox">
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>1000</number>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>127</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="timeOutLabel"> <widget class="QLabel" name="timeOutLabel">
<property name="text"> <property name="text">
@@ -87,34 +122,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="3">
<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="3" column="0" colspan="2"> <item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="spaceIgnorantAnnotationCheckBox"> <widget class="QCheckBox" name="spaceIgnorantAnnotationCheckBox">
<property name="text"> <property name="text">
<string>Ignore whitespace changes in annotation</string> <string>Ignore whitespace changes in annotation</string>
</property> </property>
</widget> </widget>
</item> </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>
</layout> </layout>
</widget> </widget>
</item> </item>