Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui	Mon Aug 05 13:17:51 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui	Mon Aug 05 15:58:30 2013 +0200
@@ -16,7 +16,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout">
      <item>
@@ -191,8 +191,8 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout">
-     <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>
@@ -202,7 +202,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>
@@ -217,11 +217,11 @@
         <number>10000</number>
        </property>
        <property name="value">
-        <number>100</number>
+        <number>20</number>
        </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>
@@ -231,14 +231,14 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="3" rowspan="2">
       <widget class="Line" name="line">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="4">
       <widget class="QPushButton" name="diffPreviousButton">
        <property name="toolTip">
         <string>Press to generate a diff to the previous revision</string>
@@ -248,7 +248,7 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="5">
       <widget class="QPushButton" name="diffRevisionsButton">
        <property name="toolTip">
         <string>Press to compare two revisions</string>
@@ -258,19 +258,29 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="6">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>81</width>
-         <height>29</height>
+         <width>39</width>
+         <height>26</height>
         </size>
        </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>
@@ -391,6 +401,7 @@
   <tabstop>stopCheckBox</tabstop>
   <tabstop>diffPreviousButton</tabstop>
   <tabstop>diffRevisionsButton</tabstop>
+  <tabstop>sbsCheckBox</tabstop>
   <tabstop>errors</tabstop>
   <tabstop>input</tabstop>
   <tabstop>passwordCheckBox</tabstop>