Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Thu Aug 01 19:12:57 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Fri Aug 02 16:29:25 2013 +0200
@@ -246,8 +246,8 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
       <widget class="QPushButton" name="nextButton">
        <property name="toolTip">
         <string>Press to get the next bunch of log entries</string>
@@ -257,7 +257,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="1">
       <widget class="QSpinBox" name="limitSpinBox">
        <property name="toolTip">
         <string>Enter the limit of entries to fetch</string>
@@ -276,7 +276,7 @@
        </property>
       </widget>
      </item>
-     <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>
@@ -286,7 +286,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="3" rowspan="2">
       <widget class="Line" name="line">
        <property name="frameShadow">
         <enum>QFrame::Raised</enum>
@@ -299,7 +299,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="4">
       <widget class="QPushButton" name="diffP1Button">
        <property name="toolTip">
         <string>Press to generate a diff to the first parent revision</string>
@@ -309,7 +309,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="5">
       <widget class="QPushButton" name="diffP2Button">
        <property name="toolTip">
         <string>Press to generate a diff to the second parent revision</string>
@@ -319,7 +319,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="6">
       <widget class="QPushButton" name="diffRevisionsButton">
        <property name="toolTip">
         <string>Press to compare two revisions</string>
@@ -329,7 +329,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="7" rowspan="2">
       <widget class="Line" name="phaseLine">
        <property name="frameShadow">
         <enum>QFrame::Raised</enum>
@@ -342,7 +342,7 @@
        </property>
       </widget>
      </item>
-     <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>
@@ -352,7 +352,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="9">
       <widget class="QPushButton" name="phaseButton">
        <property name="toolTip">
         <string>Change the phase of the selected revisions</string>
@@ -366,7 +366,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="10">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -379,6 +379,16 @@
        </property>
       </spacer>
      </item>
+     <item row="1" column="4" colspan="3">
+      <widget class="QCheckBox" name="sbsCheckBox">
+       <property name="toolTip">
+        <string>Select to show differences side-by-side</string>
+       </property>
+       <property name="text">
+        <string>Show differences side-by-side</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -501,13 +511,14 @@
   <tabstop>diffP1Button</tabstop>
   <tabstop>diffP2Button</tabstop>
   <tabstop>diffRevisionsButton</tabstop>
+  <tabstop>sbsCheckBox</tabstop>
   <tabstop>graftButton</tabstop>
   <tabstop>phaseButton</tabstop>
   <tabstop>errors</tabstop>
   <tabstop>input</tabstop>
   <tabstop>passwordCheckBox</tabstop>
+  <tabstop>sendButton</tabstop>
   <tabstop>buttonBox</tabstop>
-  <tabstop>sendButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>