From e52bd7bb00607c36c7638c701260197e47e6d880 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 24 Dec 2018 17:02:11 +0100
Subject: [PATCH] Advanced F&R layout fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Patch by Daniel Ramöller (racoon)
---
 src/frontends/qt4/ui/FindAndReplaceUi.ui | 281 ++++++++++++++---------
 1 file changed, 170 insertions(+), 111 deletions(-)

diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index 9510685470..78ffb18b49 100644
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>276</width>
-    <height>421</height>
+    <width>283</width>
+    <height>423</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,13 +20,13 @@
    <attribute name="title">
     <string>Sear&amp;ch</string>
    </attribute>
-   <layout class="QVBoxLayout" name="dynamicLayoutBasic_">
+   <layout class="QVBoxLayout" name="dynamicLayoutBasic_" stretch="1,1,0">
     <item>
      <layout class="QVBoxLayout" name="findLayout">
       <item>
        <widget class="QLabel" name="findLabel">
         <property name="text">
-         <string>&amp;Find:</string>
+         <string>Fi&amp;nd:</string>
         </property>
         <property name="buddy">
          <cstring>find_work_area_</cstring>
@@ -70,99 +70,132 @@
      </layout>
     </item>
     <item>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="caseCB">
-        <property name="toolTip">
-         <string>Perform a case-sensitive search</string>
-        </property>
-        <property name="text">
-         <string>Case &amp;sensitive</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="findNextPB">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>100</horstretch>
-          <verstretch>32</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Find next occurrence [Enter]</string>
-        </property>
-        <property name="text">
-         <string>Find &amp;Next</string>
-        </property>
-        <property name="default">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="wordsCB">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="toolTip">
-         <string>Restrict search to whole words only</string>
-        </property>
-        <property name="text">
-         <string>W&amp;hole words</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="replacePB">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>100</horstretch>
-          <verstretch>32</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Replace and find next occurrence [Enter]</string>
-        </property>
-        <property name="text">
-         <string>&amp;Replace</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="searchbackCB">
-        <property name="toolTip">
-         <string>Shift+Enter search backwards directly</string>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
+       <spacer name="verticalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-        <property name="text">
-         <string>Search &amp;backwards</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="replaceallPB">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>100</horstretch>
-          <verstretch>32</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Replace all occurrences at once</string>
-        </property>
-        <property name="text">
-         <string>Replace &amp;All</string>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0">
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QCheckBox" name="searchbackCB">
+            <property name="toolTip">
+             <string>Shift+Enter search backwards directly</string>
+            </property>
+            <property name="text">
+             <string>Search &amp;backwards</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="wordsCB">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="toolTip">
+             <string>Restrict search to whole words only</string>
+            </property>
+            <property name="text">
+             <string>W&amp;hole words</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="caseCB">
+            <property name="toolTip">
+             <string>Perform a case-sensitive search</string>
+            </property>
+            <property name="text">
+             <string>Case &amp;sensitive</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QPushButton" name="findNextPB">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="toolTip">
+             <string>Find next occurrence [Enter]</string>
+            </property>
+            <property name="text">
+             <string>Find &amp;Next</string>
+            </property>
+            <property name="default">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="replacePB">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="toolTip">
+             <string>Replace and find next occurrence [Enter]</string>
+            </property>
+            <property name="text">
+             <string>&amp;Replace</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="replaceallPB">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="toolTip">
+             <string>Replace all occurrences at once</string>
+            </property>
+            <property name="text">
+             <string>Replace &amp;All</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </item>
      </layout>
     </item>
@@ -172,7 +205,7 @@
    <attribute name="title">
     <string>S&amp;ettings</string>
    </attribute>
-   <layout class="QVBoxLayout" name="dynamicLayoutAdvanced_">
+   <layout class="QVBoxLayout" name="dynamicLayoutAdvanced_" stretch="0,0,1">
     <item>
      <widget class="QGroupBox" name="groupBox_2">
       <property name="enabled">
@@ -252,6 +285,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
@@ -260,6 +306,16 @@
       <property name="sizeConstraint">
        <enum>QLayout::SetMinimumSize</enum>
       </property>
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="OnlyMaths">
+        <property name="toolTip">
+         <string>Restrict search to math environments only</string>
+        </property>
+        <property name="text">
+         <string>Search on&amp;ly in maths</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="ignoreFormatCB">
         <property name="enabled">
@@ -276,16 +332,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="keepCaseCB">
-        <property name="toolTip">
-         <string>Keep the case of the replacement's first letter as in each matching text first letter</string>
-        </property>
-        <property name="text">
-         <string>&amp;Preserve first case on replace</string>
-        </property>
-       </widget>
-      </item>
       <item row="4" column="0">
        <widget class="QCheckBox" name="expandMacrosCB">
         <property name="enabled">
@@ -296,16 +342,29 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="OnlyMaths">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="keepCaseCB">
         <property name="toolTip">
-         <string>Restrict search to math environments only</string>
+         <string>Keep the case of the replacement's first letter as in each matching text first letter</string>
         </property>
         <property name="text">
-         <string>Search on&amp;ly in maths</string>
+         <string>&amp;Preserve first case on replace</string>
         </property>
        </widget>
       </item>
+      <item row="5" column="0">
+       <spacer name="verticalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </item>
     <item>
@@ -315,8 +374,8 @@
       </property>
       <property name="sizeHint" stdset="0">
        <size>
-        <width>20</width>
-        <height>40</height>
+        <width>0</width>
+        <height>0</height>
        </size>
       </property>
      </spacer>
-- 
2.39.5