From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 24 Dec 2018 15:00:43 +0000 (+0100)
Subject: Layout fixes for compare dialog
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2838
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=30d527895e45e7ed33e2f68174338fe4c9e02041;p=lyx.git

Layout fixes for compare dialog

Based on a patch by racoon.
---

diff --git a/src/frontends/qt4/ui/CompareUi.ui b/src/frontends/qt4/ui/CompareUi.ui
index 2893772a3f..7c84570fb7 100644
--- a/src/frontends/qt4/ui/CompareUi.ui
+++ b/src/frontends/qt4/ui/CompareUi.ui
@@ -6,107 +6,106 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>354</height>
+    <width>622</width>
+    <height>288</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <property name="leftMargin">
-      <number>10</number>
-     </property>
-     <property name="topMargin">
-      <number>10</number>
-     </property>
-     <property name="rightMargin">
-      <number>10</number>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="5" column="0">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>24</number>
      </property>
-     <property name="bottomMargin">
-      <number>10</number>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="newFileLA">
+      <widget class="QLabel" name="oldFileLA">
        <property name="text">
-        <string>&amp;New Document:</string>
+        <string>Old Documen&amp;t:</string>
        </property>
        <property name="buddy">
-        <cstring>newFileCB</cstring>
+        <cstring>oldFileCB</cstring>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QComboBox" name="newFileCB">
+     <item row="0" column="1">
+      <widget class="QComboBox" name="oldFileCB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Specify the original version of the document here (comparation source)</string>
+       </property>
        <property name="editable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QPushButton" name="newFilePB">
+     <item row="0" column="2">
+      <widget class="QPushButton" name="oldFilePB">
        <property name="text">
-        <string>&amp;Browse...</string>
+        <string>Bro&amp;wse...</string>
        </property>
        <property name="autoDefault">
         <bool>false</bool>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="oldFileLA">
+     <item row="1" column="0">
+      <widget class="QLabel" name="newFileLA">
        <property name="text">
-        <string>Old Do&amp;cument:</string>
+        <string>&amp;New Document:</string>
        </property>
        <property name="buddy">
-        <cstring>oldFileCB</cstring>
+        <cstring>newFileCB</cstring>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QComboBox" name="oldFileCB">
+     <item row="1" column="1">
+      <widget class="QComboBox" name="newFileCB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Specify the modified version of the document here (comparation target)</string>
+       </property>
        <property name="editable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QPushButton" name="oldFilePB">
+     <item row="1" column="2">
+      <widget class="QPushButton" name="newFilePB">
        <property name="text">
-        <string>Bro&amp;wse...</string>
+        <string>&amp;Browse...</string>
        </property>
        <property name="autoDefault">
         <bool>false</bool>
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
       <widget class="QGroupBox" name="groupBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -114,39 +113,59 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>Select the document from which the settings should be taken</string>
+       </property>
        <property name="title">
-        <string>Copy Document Settings from:</string>
+        <string>Document Settings</string>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QRadioButton" name="newSettingsRB">
+         <widget class="QRadioButton" name="oldSettingsRB">
           <property name="text">
-           <string>New Docu&amp;ment</string>
+           <string>O&amp;ld Document</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="oldSettingsRB">
+         <widget class="QRadioButton" name="newSettingsRB">
           <property name="text">
-           <string>Ol&amp;d Document</string>
+           <string>New Docu&amp;ment</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>
       </widget>
      </item>
-     <item row="6" column="0" colspan="2">
-      <widget class="QProgressBar" name="progressBar">
-       <property name="value">
-        <number>24</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0" colspan="2">
-      <layout class="QHBoxLayout">
+    </layout>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="1,0">
+       <item>
+        <widget class="QStatusBar" name="statusBar">
+         <property name="sizeGripEnabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QDialogButtonBox" name="buttonBox">
          <property name="standardButtons">
@@ -156,23 +175,49 @@
        </item>
       </layout>
      </item>
-     <item row="5" column="0">
-      <widget class="QCheckBox" name="trackingCB">
-       <property name="toolTip">
-        <string>Turns on the change tracking and showing changes in LaTeX output for the resulting document</string>
-       </property>
-       <property name="text">
-        <string>Enable &amp;change tracking features in the output</string>
-       </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
-   <item>
-    <widget class="QStatusBar" name="statusBar"/>
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="trackingCB">
+     <property name="toolTip">
+      <string>Turns on the change tracking and showing changes in LaTeX output for the resulting document</string>
+     </property>
+     <property name="text">
+      <string>&amp;Enable change tracking features in the output</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>4</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>4</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>