Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui	Sun Apr 17 19:34:09 2022 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui	Wed Apr 20 15:00:51 2022 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>650</width>
-    <height>477</height>
+    <height>509</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -124,6 +124,9 @@
              <property name="toolTip">
               <string>Enter a changeset id</string>
              </property>
+             <property name="clearButtonEnabled">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0">
@@ -201,6 +204,26 @@
              </property>
             </widget>
            </item>
+           <item row="5" column="0">
+            <widget class="QRadioButton" name="expression1Button">
+             <property name="text">
+              <string>Expression:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1" colspan="2">
+            <widget class="QLineEdit" name="expression1Edit">
+             <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>
           </layout>
          </widget>
         </item>
@@ -287,6 +310,9 @@
           <property name="toolTip">
            <string>Enter a changeset id</string>
           </property>
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item row="2" column="0">
@@ -364,7 +390,27 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="0" colspan="3">
+        <item row="5" column="0">
+         <widget class="QRadioButton" name="expression2Button">
+          <property name="text">
+           <string>Expression:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1" colspan="2">
+         <widget class="QLineEdit" name="expression2Edit">
+          <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="tip2Button">
           <property name="toolTip">
            <string>Select tip revision of repository</string>
@@ -491,6 +537,8 @@
   <tabstop>branch1Combo</tabstop>
   <tabstop>bookmark1Button</tabstop>
   <tabstop>bookmark1Combo</tabstop>
+  <tabstop>expression1Button</tabstop>
+  <tabstop>expression1Edit</tabstop>
   <tabstop>number2Button</tabstop>
   <tabstop>number2SpinBox</tabstop>
   <tabstop>id2Button</tabstop>
@@ -501,12 +549,16 @@
   <tabstop>branch2Combo</tabstop>
   <tabstop>bookmark2Button</tabstop>
   <tabstop>bookmark2Combo</tabstop>
+  <tabstop>expression2Button</tabstop>
+  <tabstop>expression2Edit</tabstop>
   <tabstop>tip2Button</tabstop>
   <tabstop>collapseCheckBox</tabstop>
   <tabstop>keepChangesetsCheckBox</tabstop>
   <tabstop>keepBranchCheckBox</tabstop>
   <tabstop>detachCheckBox</tabstop>
-  <tabstop>buttonBox</tabstop>
+  <tabstop>noDryRunButton</tabstop>
+  <tabstop>dryRunOnlyButton</tabstop>
+  <tabstop>dryRunConfirmButton</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -517,8 +569,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>124</x>
-     <y>864</y>
+     <x>133</x>
+     <y>499</y>
     </hint>
     <hint type="destinationlabel">
      <x>21</x>
@@ -533,8 +585,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>176</x>
-     <y>864</y>
+     <x>185</x>
+     <y>499</y>
     </hint>
     <hint type="destinationlabel">
      <x>73</x>
@@ -549,12 +601,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>86</x>
-     <y>163</y>
+     <x>120</x>
+     <y>190</y>
     </hint>
     <hint type="destinationlabel">
-     <x>201</x>
-     <y>164</y>
+     <x>228</x>
+     <y>192</y>
     </hint>
    </hints>
   </connection>
@@ -565,12 +617,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>99</x>
-     <y>699</y>
+     <x>435</x>
+     <y>67</y>
     </hint>
     <hint type="destinationlabel">
-     <x>204</x>
-     <y>700</y>
+     <x>535</x>
+     <y>69</y>
     </hint>
    </hints>
   </connection>
@@ -581,12 +633,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>56</x>
-     <y>189</y>
+     <x>90</x>
+     <y>223</y>
     </hint>
     <hint type="destinationlabel">
-     <x>245</x>
-     <y>190</y>
+     <x>296</x>
+     <y>224</y>
     </hint>
    </hints>
   </connection>
@@ -597,12 +649,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>95</x>
-     <y>725</y>
+     <x>435</x>
+     <y>100</y>
     </hint>
     <hint type="destinationlabel">
-     <x>248</x>
-     <y>726</y>
+     <x>627</x>
+     <y>101</y>
     </hint>
    </hints>
   </connection>
@@ -613,12 +665,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>83</x>
-     <y>215</y>
+     <x>117</x>
+     <y>255</y>
     </hint>
     <hint type="destinationlabel">
-     <x>241</x>
-     <y>216</y>
+     <x>296</x>
+     <y>256</y>
     </hint>
    </hints>
   </connection>
@@ -629,12 +681,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>74</x>
-     <y>241</y>
+     <x>108</x>
+     <y>287</y>
     </hint>
     <hint type="destinationlabel">
-     <x>229</x>
-     <y>242</y>
+     <x>296</x>
+     <y>288</y>
     </hint>
    </hints>
   </connection>
@@ -645,12 +697,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>63</x>
-     <y>751</y>
+     <x>404</x>
+     <y>132</y>
     </hint>
     <hint type="destinationlabel">
-     <x>248</x>
-     <y>752</y>
+     <x>627</x>
+     <y>133</y>
     </hint>
    </hints>
   </connection>
@@ -661,12 +713,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>100</x>
-     <y>777</y>
+     <x>435</x>
+     <y>164</y>
     </hint>
     <hint type="destinationlabel">
-     <x>248</x>
-     <y>778</y>
+     <x>627</x>
+     <y>165</y>
     </hint>
    </hints>
   </connection>
@@ -677,12 +729,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>48</x>
-     <y>267</y>
+     <x>82</x>
+     <y>319</y>
     </hint>
     <hint type="destinationlabel">
-     <x>245</x>
-     <y>268</y>
+     <x>296</x>
+     <y>320</y>
     </hint>
    </hints>
   </connection>
@@ -693,12 +745,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>48</x>
-     <y>803</y>
+     <x>389</x>
+     <y>196</y>
     </hint>
     <hint type="destinationlabel">
-     <x>248</x>
-     <y>804</y>
+     <x>627</x>
+     <y>197</y>
     </hint>
    </hints>
   </connection>
@@ -713,8 +765,40 @@
      <y>49</y>
     </hint>
     <hint type="destinationlabel">
+     <x>248</x>
+     <y>259</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>expression1Button</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>expression1Edit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>54</x>
+     <y>341</y>
+    </hint>
+    <hint type="destinationlabel">
      <x>226</x>
-     <y>126</y>
+     <y>338</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>expression2Button</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>expression2Edit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>398</x>
+     <y>214</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>461</x>
+     <y>220</y>
     </hint>
    </hints>
   </connection>