From aed9e6c3f1958d299614567f347e09cbe7d3b4c6 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 12 Mar 2011 17:02:03 +0000
Subject: [PATCH] Fix bug #7352: Statusbar of Compare dialog is wrongly placed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37904 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/ui/CompareUi.ui | 376 +++++++++++++++---------------
 1 file changed, 193 insertions(+), 183 deletions(-)

diff --git a/src/frontends/qt4/ui/CompareUi.ui b/src/frontends/qt4/ui/CompareUi.ui
index b2d2ad896d..31573c3dde 100644
--- a/src/frontends/qt4/ui/CompareUi.ui
+++ b/src/frontends/qt4/ui/CompareUi.ui
@@ -1,190 +1,200 @@
 <ui version="4.0" >
- <class>CompareUi</class>
- <widget class="QDialog" name="CompareUi" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>450</width>
-    <height>294</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="newFileLA" >
-     <property name="text" >
-      <string>&amp;New Document:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>newFileCB</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QComboBox" name="newFileCB" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="editable" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="newFilePB" >
-     <property name="text" >
-      <string>&amp;Browse...</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="oldFileLA" >
-     <property name="text" >
-      <string>&amp;Old Document:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>oldFileCB</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QComboBox" name="oldFileCB" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="editable" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QPushButton" name="oldFilePB" >
-     <property name="text" >
-      <string>Bro&amp;wse...</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string>Copy Document Settings from:</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" >
+  <class>CompareUi</class>
+  <widget class="QDialog" name="CompareUi" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>450</width>
+        <height>294</height>
+      </rect>
+    </property>
+    <property name="windowTitle" >
+      <string/>
+    </property>
+    <layout class="QVBoxLayout">
+      <property name="margin">
+        <number>0</number>
+      </property>
       <item>
-       <widget class="QRadioButton" name="newSettingsRB" >
-        <property name="text" >
-         <string>N&amp;ew Document</string>
-        </property>
-       </widget>
+        <layout class="QGridLayout" name="gridLayout" >
+          <property name="margin">
+            <number>10</number>
+          </property>
+          <item row="0" column="0" >
+            <widget class="QLabel" name="newFileLA" >
+              <property name="text" >
+                <string>&amp;New Document:</string>
+              </property>
+              <property name="buddy" >
+                <cstring>newFileCB</cstring>
+              </property>
+            </widget>
+          </item>
+          <item row="1" column="0" >
+            <widget class="QComboBox" name="newFileCB" >
+              <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="editable" >
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+          <item row="1" column="1" >
+            <widget class="QPushButton" name="newFilePB" >
+              <property name="text" >
+                <string>&amp;Browse...</string>
+              </property>
+              <property name="autoDefault" >
+                <bool>false</bool>
+              </property>
+            </widget>
+          </item>
+          <item row="2" column="0" >
+            <widget class="QLabel" name="oldFileLA" >
+              <property name="text" >
+                <string>&amp;Old Document:</string>
+              </property>
+              <property name="buddy" >
+                <cstring>oldFileCB</cstring>
+              </property>
+            </widget>
+          </item>
+          <item row="3" column="0" >
+            <widget class="QComboBox" name="oldFileCB" >
+              <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="editable" >
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+          <item row="3" column="1" >
+            <widget class="QPushButton" name="oldFilePB" >
+              <property name="text" >
+                <string>Bro&amp;wse...</string>
+              </property>
+              <property name="autoDefault" >
+                <bool>false</bool>
+              </property>
+            </widget>
+          </item>
+          <item row="4" column="0" >
+            <widget class="QGroupBox" name="groupBox" >
+              <property name="sizePolicy" >
+                <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="title" >
+                <string>Copy Document Settings from:</string>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout" >
+                <item>
+                  <widget class="QRadioButton" name="newSettingsRB" >
+                    <property name="text" >
+                      <string>N&amp;ew Document</string>
+                    </property>
+                  </widget>
+                </item>
+                <item>
+                  <widget class="QRadioButton" name="oldSettingsRB" >
+                    <property name="text" >
+                      <string>Ol&amp;d Document</string>
+                    </property>
+                  </widget>
+                </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" >
+              <item>
+                <spacer>
+                  <property name="orientation" >
+                    <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeType" >
+                    <enum>QSizePolicy::Expanding</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0" >
+                    <size>
+                      <width>20</width>
+                      <height>20</height>
+                    </size>
+                  </property>
+                </spacer>
+              </item>
+              <item>
+                <widget class="QPushButton" name="okPB" >
+                  <property name="toolTip" >
+                    <string/>
+                  </property>
+                  <property name="text" >
+                    <string>&amp;OK</string>
+                  </property>
+                  <property name="default" >
+                    <bool>true</bool>
+                  </property>
+                </widget>
+              </item>
+              <item>
+                <widget class="QPushButton" name="closePB" >
+                  <property name="text" >
+                    <string>&amp;Close</string>
+                  </property>
+                  <property name="autoDefault" >
+                    <bool>false</bool>
+                  </property>
+                  <property name="default" >
+                    <bool>false</bool>
+                  </property>
+                </widget>
+              </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="QRadioButton" name="oldSettingsRB" >
-        <property name="text" >
-         <string>Ol&amp;d Document</string>
-        </property>
-       </widget>
+        <widget class="QStatusBar" name="statusBar" />
       </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" >
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
     </layout>
-   </item>
-   <item row="9" column="0" colspan="2" >
-    <widget class="QStatusBar" name="statusBar" />
-   </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>
- </widget>
- <includes>
-  <include location="local" >qt_i18n.h</include>
- </includes>
- <resources/>
- <connections/>
+  </widget>
+  <includes>
+    <include location="local" >qt_i18n.h</include>
+  </includes>
+  <resources/>
+  <connections/>
 </ui>
-- 
2.39.5