aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/bazaar/optionspage.ui34
-rw-r--r--src/plugins/git/settingspage.ui36
-rw-r--r--src/plugins/mercurial/optionspage.ui34
-rw-r--r--src/plugins/perforce/settingspage.ui46
-rw-r--r--src/plugins/subversion/settingspage.ui36
5 files changed, 93 insertions, 93 deletions
diff --git a/src/plugins/bazaar/optionspage.ui b/src/plugins/bazaar/optionspage.ui
index c11dcb4331..755e108d41 100644
--- a/src/plugins/bazaar/optionspage.ui
+++ b/src/plugins/bazaar/optionspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>392</width>
- <height>303</height>
+ <width>649</width>
+ <height>337</height>
</rect>
</property>
<property name="windowTitle">
@@ -103,26 +103,13 @@
</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>213</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
<widget class="QLabel" name="timeoutSecondsLabel">
<property name="text">
<string>Timeout:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="3">
<widget class="QSpinBox" name="timeout">
<property name="suffix">
<string>s</string>
@@ -132,7 +119,20 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="0" column="4">
+ <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" colspan="2">
<widget class="QCheckBox" name="promptOnSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index b12fbe028d..cdd3444e1d 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>390</width>
- <height>361</height>
+ <width>705</width>
+ <height>436</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -81,26 +81,13 @@
</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>211</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
<widget class="QLabel" name="timeoutLabel">
<property name="text">
<string>Timeout:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="3">
<widget class="QSpinBox" name="timeoutSpinBox">
<property name="suffix">
<string>s</string>
@@ -116,14 +103,27 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="0" column="4">
+ <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" colspan="2">
<widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="3">
+ <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="pullRebaseCheckBox">
<property name="text">
<string>Pull with rebase</string>
diff --git a/src/plugins/mercurial/optionspage.ui b/src/plugins/mercurial/optionspage.ui
index af41460fc5..00f4362d27 100644
--- a/src/plugins/mercurial/optionspage.ui
+++ b/src/plugins/mercurial/optionspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>392</width>
- <height>304</height>
+ <width>617</width>
+ <height>327</height>
</rect>
</property>
<property name="windowTitle">
@@ -103,26 +103,13 @@
</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>217</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
<widget class="QLabel" name="timeoutSecondsLabel">
<property name="text">
<string>Timeout:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="3">
<widget class="QSpinBox" name="timeout">
<property name="suffix">
<string>s</string>
@@ -132,7 +119,20 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="0" column="4">
+ <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" colspan="2">
<widget class="QCheckBox" name="promptOnSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
diff --git a/src/plugins/perforce/settingspage.ui b/src/plugins/perforce/settingspage.ui
index 56450063b2..edd3d52803 100644
--- a/src/plugins/perforce/settingspage.ui
+++ b/src/plugins/perforce/settingspage.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>595</width>
- <height>334</height>
+ <height>366</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -101,6 +101,26 @@
</property>
</widget>
</item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="timeOutLabel">
+ <property name="text">
+ <string>Timeout:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <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>
<item row="0" column="4">
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -114,40 +134,20 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="5">
+ <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="5">
+ <item row="2" column="0" colspan="4">
<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">
- <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>
- </item>
</layout>
</widget>
</item>
diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui
index e84f98d776..c040ca41fa 100644
--- a/src/plugins/subversion/settingspage.ui
+++ b/src/plugins/subversion/settingspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>314</width>
- <height>330</height>
+ <width>665</width>
+ <height>359</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -90,26 +90,13 @@
</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">
<widget class="QLabel" name="timeOutLabel">
<property name="text">
<string>Timeout:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="3">
<widget class="QSpinBox" name="timeOutSpinBox">
<property name="suffix">
<string>s</string>
@@ -122,14 +109,27 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="0" column="4">
+ <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" colspan="2">
<widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text">
<string>Prompt on submit</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="3">
+ <item row="2" column="0" colspan="4">
<widget class="QCheckBox" name="spaceIgnorantAnnotationCheckBox">
<property name="text">
<string>Ignore whitespace changes in annotation</string>