Switch to side-by-side view

--- a/src/qtgui/advsearch.ui
+++ b/src/qtgui/advsearch.ui
@@ -63,6 +63,32 @@
                                 <property name="margin">
                                     <number>8</number>
                                 </property>
+                                <widget class="QLabel" row="0" column="0">
+                                    <property name="name">
+                                        <cstring>andWordsTL</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string>All these words</string>
+                                    </property>
+                                </widget>
+                                <widget class="QLineEdit" row="0" column="1">
+                                    <property name="name">
+                                        <cstring>andWordsLE</cstring>
+                                    </property>
+                                </widget>
+                                <widget class="QLabel" row="1" column="0">
+                                    <property name="name">
+                                        <cstring>phraseTL</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string>This exact phrase</string>
+                                    </property>
+                                </widget>
+                                <widget class="QLineEdit" row="1" column="1">
+                                    <property name="name">
+                                        <cstring>phraseLE</cstring>
+                                    </property>
+                                </widget>
                                 <widget class="QLabel" row="2" column="0">
                                     <property name="name">
                                         <cstring>orWordsTL</cstring>
@@ -76,56 +102,43 @@
                                         <cstring>orWordsLE</cstring>
                                     </property>
                                 </widget>
+                                <widget class="QLabel" row="3" column="0">
+                                    <property name="name">
+                                        <cstring>orWords1TL</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string>Any of these words</string>
+                                    </property>
+                                </widget>
+                                <widget class="QLineEdit" row="3" column="1">
+                                    <property name="name">
+                                        <cstring>orWords1LE</cstring>
+                                    </property>
+                                </widget>
                                 <widget class="QLabel" row="4" column="0">
                                     <property name="name">
+                                        <cstring>noWordsTL</cstring>
+                                    </property>
+                                    <property name="text">
+                                        <string>None of these words</string>
+                                    </property>
+                                </widget>
+                                <widget class="QLineEdit" row="4" column="1">
+                                    <property name="name">
+                                        <cstring>noWordsLE</cstring>
+                                    </property>
+                                </widget>
+                                <widget class="QLabel" row="5" column="0">
+                                    <property name="name">
                                         <cstring>textLabel1_2</cstring>
                                     </property>
                                     <property name="text">
                                         <string>File name matching</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="4" column="1">
+                                <widget class="QLineEdit" row="5" column="1">
                                     <property name="name">
                                         <cstring>fileNameLE</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="3" column="0">
-                                    <property name="name">
-                                        <cstring>noWordsTL</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>None of these words</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="3" column="1">
-                                    <property name="name">
-                                        <cstring>noWordsLE</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>andWordsTL</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>All these words</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>andWordsLE</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>phraseTL</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>This exact phrase</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>phraseLE</cstring>
                                     </property>
                                 </widget>
                             </grid>
@@ -483,6 +496,7 @@
 </connections>
 <includes>
     <include location="local" impldecl="in declaration">recoll.h</include>
+    <include location="local" impldecl="in declaration">searchdata.h</include>
     <include location="local" impldecl="in implementation">advsearch.ui.h</include>
 </includes>
 <signals>