Mercurial Repositories > eric / file diff

diff -r 37089cbeb1b9 -r e07d1df4c64a Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui	Mon Feb 13 19:08:26 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui	Tue Feb 14 19:57:58 2017 +0100
@@ -17,10 +17,20 @@
    <string>&lt;b&gt;Mercurial Status&lt;/b&gt;
 &lt;p&gt;This dialog shows the status of the selected file or project.&lt;/p&gt;</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
+      <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>
+     <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -60,7 +70,7 @@
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
-       <verstretch>3</verstretch>
+       <verstretch>2</verstretch>
       </sizepolicy>
      </property>
      <property name="orientation">
@@ -69,145 +79,45 @@
      <property name="childrenCollapsible">
       <bool>false</bool>
      </property>
-     <widget class="QWidget" name="layoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QTreeWidget" name="statusList">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="alternatingRowColors">
-          <bool>true</bool>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <property name="rootIsDecorated">
-          <bool>false</bool>
-         </property>
-         <property name="sortingEnabled">
-          <bool>true</bool>
-         </property>
-         <column>
-          <property name="text">
-           <string>Commit</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Status</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Path</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QPushButton" name="commitButton">
-           <property name="toolTip">
-            <string>Commit the selected changes</string>
-           </property>
-           <property name="text">
-            <string>&amp;Commit</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="Line" name="buttonsLine">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="addButton">
-           <property name="toolTip">
-            <string>Add the selected entries to the repository</string>
-           </property>
-           <property name="text">
-            <string>&amp;Add</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="diffButton">
-           <property name="toolTip">
-            <string>Show differences of the selected entries to the repository</string>
-           </property>
-           <property name="text">
-            <string>&amp;Differences</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="sbsDiffButton">
-           <property name="toolTip">
-            <string>Show differences of the selected entry to the repository in a side-by-side manner</string>
-           </property>
-           <property name="text">
-            <string>Side-b&amp;y-Side Diff</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="revertButton">
-           <property name="toolTip">
-            <string>Revert the selected entries to the last revision in the repository</string>
-           </property>
-           <property name="text">
-            <string>Re&amp;vert</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="forgetButton">
-           <property name="toolTip">
-            <string>Forget about the selected missing entries</string>
-           </property>
-           <property name="text">
-            <string>For&amp;get</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="restoreButton">
-           <property name="toolTip">
-            <string>Restore the selected missing entries from the repository</string>
-           </property>
-           <property name="text">
-            <string>&amp;Restore</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-      </layout>
+     <widget class="QTreeWidget" name="statusList">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::ExtendedSelection</enum>
+      </property>
+      <property name="rootIsDecorated">
+       <bool>false</bool>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+      <column>
+       <property name="text">
+        <string>Commit</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Status</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Path</string>
+       </property>
+      </column>
      </widget>
      <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QLabel" name="label_2">
+        <widget class="QLabel" name="diffLabel">
          <property name="text">
           <string>Differences</string>
          </property>
@@ -336,15 +246,9 @@
  </widget>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
+  <tabstop>actionsButton</tabstop>
   <tabstop>statusFilterCombo</tabstop>
   <tabstop>statusList</tabstop>
-  <tabstop>commitButton</tabstop>
-  <tabstop>addButton</tabstop>
-  <tabstop>diffButton</tabstop>
-  <tabstop>sbsDiffButton</tabstop>
-  <tabstop>revertButton</tabstop>
-  <tabstop>forgetButton</tabstop>
-  <tabstop>restoreButton</tabstop>
   <tabstop>diffEdit</tabstop>
   <tabstop>errors</tabstop>
   <tabstop>input</tabstop>