--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui Sat Sep 03 17:13:31 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui Sun Sep 04 15:17:10 2011 +0200
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>372</width>
- <height>276</height>
+ <width>450</width>
+ <height>452</height>
</rect>
</property>
<property name="windowTitle">
@@ -24,68 +24,32 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QRadioButton" name="numberButton">
+ <widget class="QRadioButton" name="multipleButton">
<property name="toolTip">
- <string>Select to specify a revision by number</string>
+ <string>Select to specify multiple revisions</string>
</property>
<property name="text">
- <string>Number</string>
+ <string>Multiple</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QSpinBox" name="numberSpinBox">
+ <widget class="QPlainTextEdit" name="multipleEdit">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
- <string>Enter a revision number</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight</set>
+ <string>Enter changesets by number, id, range or revset expression one per line</string>
</property>
- <property name="minimum">
- <number>1</number>
+ <property name="tabChangesFocus">
+ <bool>true</bool>
</property>
- <property name="maximum">
- <number>999999999</number>
+ <property name="lineWrapMode">
+ <enum>QPlainTextEdit::NoWrap</enum>
</property>
</widget>
</item>
- <item row="0" column="2">
- <spacer name="spacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>158</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="1" column="0">
- <widget class="QRadioButton" name="idButton">
- <property name="toolTip">
- <string>Select to specify a revision by changeset id</string>
- </property>
- <property name="text">
- <string>Id:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="idEdit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Enter a changeset id</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
<widget class="QRadioButton" name="tagButton">
<property name="toolTip">
<string>Select to specify a revision by a tag</string>
@@ -95,7 +59,7 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2">
+ <item row="1" column="1">
<widget class="QComboBox" name="tagCombo">
<property name="enabled">
<bool>false</bool>
@@ -108,7 +72,7 @@
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="2" column="0">
<widget class="QRadioButton" name="branchButton">
<property name="toolTip">
<string>Select to specify a revision by a branch</string>
@@ -118,7 +82,7 @@
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2">
+ <item row="2" column="1">
<widget class="QComboBox" name="branchCombo">
<property name="enabled">
<bool>false</bool>
@@ -131,7 +95,7 @@
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="3" column="0">
<widget class="QRadioButton" name="bookmarkButton">
<property name="toolTip">
<string>Select to specify a revision by a bookmark</string>
@@ -141,7 +105,7 @@
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2">
+ <item row="3" column="1">
<widget class="QComboBox" name="bookmarkCombo">
<property name="enabled">
<bool>false</bool>
@@ -160,7 +124,7 @@
</property>
</widget>
</item>
- <item row="5" column="0" colspan="3">
+ <item row="4" column="0" colspan="2">
<widget class="QRadioButton" name="noneButton">
<property name="toolTip">
<string>Select to not specify a specific revision</string>
@@ -177,11 +141,52 @@
</widget>
</item>
<item>
- <widget class="QComboBox" name="compressionCombo">
- <property name="toolTip">
- <string>Select the compression type (empty for default)</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Base Revisions:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPlainTextEdit" name="baseRevisionsEdit">
+ <property name="toolTip">
+ <string>Enter changesets by number, id, range or revset expression one per line</string>
+ </property>
+ <property name="tabChangesFocus">
+ <bool>true</bool>
+ </property>
+ <property name="lineWrapMode">
+ <enum>QPlainTextEdit::NoWrap</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Compression:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="compressionCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Select the compression type (empty for default)</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<widget class="QCheckBox" name="allCheckBox">
@@ -206,10 +211,8 @@
</layout>
</widget>
<tabstops>
- <tabstop>numberButton</tabstop>
- <tabstop>numberSpinBox</tabstop>
- <tabstop>idButton</tabstop>
- <tabstop>idEdit</tabstop>
+ <tabstop>multipleButton</tabstop>
+ <tabstop>multipleEdit</tabstop>
<tabstop>tagButton</tabstop>
<tabstop>tagCombo</tabstop>
<tabstop>branchButton</tabstop>
@@ -217,6 +220,7 @@
<tabstop>bookmarkButton</tabstop>
<tabstop>bookmarkCombo</tabstop>
<tabstop>noneButton</tabstop>
+ <tabstop>baseRevisionsEdit</tabstop>
<tabstop>compressionCombo</tabstop>
<tabstop>allCheckBox</tabstop>
<tabstop>buttonBox</tabstop>
@@ -230,8 +234,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>261</x>
- <y>271</y>
+ <x>270</x>
+ <y>442</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@@ -246,8 +250,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>329</x>
- <y>271</y>
+ <x>338</x>
+ <y>442</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
@@ -256,50 +260,18 @@
</hints>
</connection>
<connection>
- <sender>numberButton</sender>
- <signal>toggled(bool)</signal>
- <receiver>numberSpinBox</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>48</x>
- <y>42</y>
- </hint>
- <hint type="destinationlabel">
- <x>113</x>
- <y>43</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>idButton</sender>
- <signal>toggled(bool)</signal>
- <receiver>idEdit</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>38</x>
- <y>76</y>
- </hint>
- <hint type="destinationlabel">
- <x>125</x>
- <y>75</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>tagButton</sender>
<signal>toggled(bool)</signal>
<receiver>tagCombo</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>52</x>
- <y>104</y>
+ <x>72</x>
+ <y>154</y>
</hint>
<hint type="destinationlabel">
- <x>124</x>
- <y>99</y>
+ <x>234</x>
+ <y>154</y>
</hint>
</hints>
</connection>
@@ -310,12 +282,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>71</x>
- <y>127</y>
+ <x>91</x>
+ <y>181</y>
</hint>
<hint type="destinationlabel">
- <x>123</x>
- <y>130</y>
+ <x>233</x>
+ <y>181</y>
</hint>
</hints>
</connection>
@@ -326,12 +298,28 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>45</x>
- <y>150</y>
+ <x>65</x>
+ <y>208</y>
</hint>
<hint type="destinationlabel">
- <x>125</x>
- <y>148</y>
+ <x>235</x>
+ <y>208</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>multipleButton</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>multipleEdit</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>60</x>
+ <y>78</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>141</x>
+ <y>83</y>
</hint>
</hints>
</connection>
