Mercurial Repositories > eric / file diff

diff -r a4ce50816cba -r d4fa462547bc Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Tue Jan 07 09:19:57 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Tue Jan 07 18:08:40 2014 +0100
@@ -276,16 +276,6 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
-      <widget class="QCheckBox" name="stopCheckBox">
-       <property name="toolTip">
-        <string>Select to stop listing log messages at a copy or move</string>
-       </property>
-       <property name="text">
-        <string>Stop on Copy/Move</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="3" rowspan="2">
       <widget class="Line" name="line">
        <property name="frameShadow">
@@ -299,6 +289,16 @@
        </property>
       </widget>
      </item>
+     <item row="0" column="2">
+      <widget class="QCheckBox" name="stopCheckBox">
+       <property name="toolTip">
+        <string>Select to stop listing log messages at a copy or move</string>
+       </property>
+       <property name="text">
+        <string>Stop on Copy/Move</string>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="4">
       <widget class="QPushButton" name="diffP1Button">
        <property name="toolTip">
@@ -342,31 +342,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="8">
-      <widget class="QPushButton" name="graftButton">
-       <property name="toolTip">
-        <string>Press to copy the selected changesets to the current branch</string>
-       </property>
-       <property name="text">
-        <string>Copy Changesets</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="9">
-      <widget class="QPushButton" name="phaseButton">
-       <property name="toolTip">
-        <string>Change the phase of the selected revisions</string>
-       </property>
-       <property name="whatsThis">
-        <string>&lt;b&gt;Change Phase&lt;/b&gt;
-&lt;p&gt;This changes the phase of the selected revisions. The selected revisions have to have the same current phase.&lt;/p&gt;</string>
-       </property>
-       <property name="text">
-        <string>Change Phase</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="10">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -389,6 +365,16 @@
        </property>
       </widget>
      </item>
+     <item row="0" column="8">
+      <widget class="QToolButton" name="actionsButton">
+       <property name="toolTip">
+        <string>Select action from menu</string>
+       </property>
+       <property name="popupMode">
+        <enum>QToolButton::InstantPopup</enum>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -512,8 +498,6 @@
   <tabstop>diffP2Button</tabstop>
   <tabstop>diffRevisionsButton</tabstop>
   <tabstop>sbsCheckBox</tabstop>
-  <tabstop>graftButton</tabstop>
-  <tabstop>phaseButton</tabstop>
   <tabstop>errors</tabstop>
   <tabstop>input</tabstop>
   <tabstop>passwordCheckBox</tabstop>