Automatic horiz/vert switch also for Advanced Tab (completing e3677975).

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 19c0bacf123827be448668bb9ae6e6368abcff50..3d3bfa7da24e4ea67c4045bea803ca5feb86d106 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -68,9 +68,11 @@ FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
 void FindAndReplaceWidget::dockLocationChanged(Qt::DockWidgetArea area)
 {
        if (area == Qt::RightDockWidgetArea || area == Qt::LeftDockWidgetArea) {
-               dynamicLayout_->setDirection(QBoxLayout::TopToBottom);
+               dynamicLayoutBasic_->setDirection(QBoxLayout::TopToBottom);
+               dynamicLayoutAdvanced_->setDirection(QBoxLayout::TopToBottom);
        } else {
-               dynamicLayout_->setDirection(QBoxLayout::LeftToRight);
+               dynamicLayoutBasic_->setDirection(QBoxLayout::LeftToRight);
+               dynamicLayoutAdvanced_->setDirection(QBoxLayout::LeftToRight);
        }
 }
 

diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index 7a5cbaffff8ec1c5a688352644b60b79ba8926b9..51a08ccc5793ad7bacdbf99a492ac8e9eb45bb69 100644 (file)
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -20,13 +20,13 @@
    <string>TabWidget</string>
   </property>
   <property name="currentIndex">
-   <number>0</number>
+   <number>1</number>
   </property>
   <widget class="QWidget" name="basicTab">
    <attribute name="title">
     <string>Sear&amp;ch</string>
    </attribute>
-   <layout class="QVBoxLayout" name="dynamicLayout_">
+   <layout class="QVBoxLayout" name="dynamicLayoutBasic_">
     <item>
      <layout class="QVBoxLayout" name="findLayout">
       <item>
@@ -184,12 +184,18 @@
    <attribute name="title">
     <string>S&amp;ettings</string>
    </attribute>
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0" colspan="2">
+   <layout class="QVBoxLayout" name="dynamicLayoutAdvanced_">
+    <item>
      <widget class="QGroupBox" name="groupBox_2">
       <property name="enabled">
        <bool>true</bool>
       </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="toolTip">
        <string>The scope to which the search horizon is restricted</string>
       </property>
@@ -258,57 +264,77 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <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>
      </widget>
     </item>
-    <item row="1" column="0">
-     <widget class="QCheckBox" name="ignoreFormatCB">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="toolTip">
-       <string>If unchecked, the search will be limited to occurrences of the selected text and paragraph style</string>
-      </property>
-      <property name="text">
-       <string>Ignore &amp;format</string>
-      </property>
-      <property name="checked">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0" colspan="2">
-     <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="3" column="0">
-     <widget class="QCheckBox" name="expandMacrosCB">
-      <property name="enabled">
-       <bool>false</bool>
-      </property>
-      <property name="text">
-       <string>&amp;Expand macros</string>
-      </property>
-     </widget>
-    </item>
-    <item row="4" column="1">
-     <spacer name="verticalSpacer">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>105</width>
-        <height>2</height>
-       </size>
+    <item>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetMinimumSize</enum>
       </property>
-     </spacer>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="ignoreFormatCB">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="toolTip">
+         <string>If unchecked, the search will be limited to occurrences of the selected text and paragraph style</string>
+        </property>
+        <property name="text">
+         <string>Ignore &amp;format</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </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="3" column="0">
+       <widget class="QCheckBox" name="expandMacrosCB">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>&amp;Expand macros</string>
+        </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>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>