Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui	Wed Apr 13 18:16:23 2022 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui	Wed Apr 13 19:49:25 2022 +0200
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>372</width>
-    <height>305</height>
+    <width>400</width>
+    <height>342</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -157,7 +157,27 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="3">
+      <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>
@@ -206,9 +226,10 @@
   <tabstop>branchCombo</tabstop>
   <tabstop>bookmarkButton</tabstop>
   <tabstop>bookmarkCombo</tabstop>
+  <tabstop>expressionButton</tabstop>
+  <tabstop>expressionEdit</tabstop>
   <tabstop>noneButton</tabstop>
   <tabstop>forceCheckBox</tabstop>
-  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -219,8 +240,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>261</x>
-     <y>244</y>
+     <x>270</x>
+     <y>332</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -235,8 +256,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>329</x>
-     <y>244</y>
+     <x>338</x>
+     <y>332</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -251,12 +272,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>48</x>
-     <y>42</y>
+     <x>69</x>
+     <y>66</y>
     </hint>
     <hint type="destinationlabel">
-     <x>113</x>
-     <y>43</y>
+     <x>215</x>
+     <y>68</y>
     </hint>
    </hints>
   </connection>
@@ -283,12 +304,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>52</x>
-     <y>104</y>
+     <x>73</x>
+     <y>131</y>
     </hint>
     <hint type="destinationlabel">
-     <x>124</x>
-     <y>99</y>
+     <x>246</x>
+     <y>132</y>
     </hint>
    </hints>
   </connection>
@@ -299,12 +320,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>71</x>
-     <y>127</y>
+     <x>92</x>
+     <y>163</y>
     </hint>
     <hint type="destinationlabel">
-     <x>123</x>
-     <y>130</y>
+     <x>245</x>
+     <y>164</y>
     </hint>
    </hints>
   </connection>
@@ -315,12 +336,28 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>71</x>
-     <y>145</y>
+     <x>92</x>
+     <y>195</y>
     </hint>
     <hint type="destinationlabel">
-     <x>121</x>
-     <y>149</y>
+     <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>