diff -r 3fc8dfeb6ebe -r b99e7fd55fd3 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui Thu Jul 07 11:23:56 2022 +0200
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HgMergeDialog</class>
+ <widget class="QDialog" name="HgMergeDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>342</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Mercurial Merge</string>
+ </property>
+ <property name="sizeGripEnabled">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Revision</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="numberButton">
+ <property name="toolTip">
+ <string>Select to specify a revision by number</string>
+ </property>
+ <property name="text">
+ <string>Number</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="numberSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Enter a revision number</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="maximum">
+ <number>999999999</number>
+ </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>
+ </property>
+ <property name="text">
+ <string>Tag:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="QComboBox" name="tagCombo">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Enter a tag name</string>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QRadioButton" name="branchButton">
+ <property name="toolTip">
+ <string>Select to specify a revision by a branch</string>
+ </property>
+ <property name="text">
+ <string>Branch:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="2">
+ <widget class="QComboBox" name="branchCombo">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Enter a branch name</string>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QRadioButton" name="bookmarkButton">
+ <property name="toolTip">
+ <string>Select to specify a revision by a bookmark</string>
+ </property>
+ <property name="text">
+ <string>Bookmark:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="2">
+ <widget class="QComboBox" name="bookmarkCombo">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Enter a bookmark name</string>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QRadioButton" name="expressionButton">
+ <property name="text">
+ <string>Expression:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" colspan="2">
+ <widget class="QLineEdit" name="expressionEdit">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Enter a revision set expression</string>
+ </property>
+ <property name="clearButtonEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="3">
+ <widget class="QRadioButton" name="noneButton">
+ <property name="toolTip">
+ <string>Select to not specify a specific revision</string>
+ </property>
+ <property name="text">
+ <string>No revision selected</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="forceCheckBox">
+ <property name="toolTip">
+ <string>Select to force the merge operation</string>
+ </property>
+ <property name="text">
+ <string>Enforce merge</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>numberButton</tabstop>
+ <tabstop>numberSpinBox</tabstop>
+ <tabstop>idButton</tabstop>
+ <tabstop>idEdit</tabstop>
+ <tabstop>tagButton</tabstop>
+ <tabstop>tagCombo</tabstop>
+ <tabstop>branchButton</tabstop>
+ <tabstop>branchCombo</tabstop>
+ <tabstop>bookmarkButton</tabstop>
+ <tabstop>bookmarkCombo</tabstop>
+ <tabstop>expressionButton</tabstop>
+ <tabstop>expressionEdit</tabstop>
+ <tabstop>noneButton</tabstop>
+ <tabstop>forceCheckBox</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>HgMergeDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>270</x>
+ <y>332</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>229</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>HgMergeDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>338</x>
+ <y>332</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>229</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>numberButton</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>numberSpinBox</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>69</x>
+ <y>66</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>215</x>
+ <y>68</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>73</x>
+ <y>131</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>246</x>
+ <y>132</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>branchButton</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>branchCombo</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>92</x>
+ <y>163</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>245</x>
+ <y>164</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>bookmarkButton</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>bookmarkCombo</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>92</x>
+ <y>195</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>243</x>
+ <y>196</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>expressionButton</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>expressionEdit</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>59</x>
+ <y>216</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>195</x>
+ <y>216</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
