weld FmSearchDialog

Change-Id: If7e87f725ea44732080fc0c57e4503c82b0cf4a0
Reviewed-on: https://gerrit.libreoffice.org/67595
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 18 insertions, 10 deletions

diff --git a/cui/uiconfig/ui/fmsearchdialog.ui b/cui/uiconfig/ui/fmsearchdialog.ui
index 1c752e543dd5..92a7ed83fdfd 100644
--- a/cui/uiconfig/ui/fmsearchdialog.ui
+++ b/cui/uiconfig/ui/fmsearchdialog.ui
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="RecordSearchDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="fmsearchdialog|RecordSearchDialog">Record Search</property>
+    <property name="modal">True</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="can_focus">False</property>
@@ -117,7 +123,7 @@
                                     <property name="hexpand">True</property>
                                     <property name="column_spacing">12</property>
                                     <child>
-                                      <object class="GtkComboBox" id="cmbSearchText">
+                                      <object class="GtkComboBoxText" id="cmbSearchText">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="valign">start</property>
@@ -125,7 +131,8 @@
                                         <property name="has_entry">True</property>
                                         <child internal-child="entry">
                                           <object class="GtkEntry" id="combobox-entry2">
-                                            <property name="can_focus">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="activates_default">True</property>
                                           </object>
                                         </child>
                                       </object>
@@ -279,7 +286,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkComboBox" id="lbField">
+                                          <object class="GtkComboBoxText" id="lbField">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="halign">start</property>
@@ -323,10 +330,10 @@
                                           <object class="GtkLabel" id="ftForm">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes" context="fmsearchdialog|ftForm">Form:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">lbForm</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -334,7 +341,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkComboBox" id="lbForm">
+                                          <object class="GtkComboBoxText" id="lbForm">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="halign">start</property>
@@ -375,8 +382,8 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
-                                    <property name="xalign">0</property>
                                     <property name="wrap">True</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -448,10 +455,10 @@
                               <object class="GtkLabel" id="ftPosition">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes" context="fmsearchdialog|ftPosition">_Position:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">lbPosition</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -459,7 +466,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="lbPosition">
+                              <object class="GtkComboBoxText" id="lbPosition">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
@@ -719,8 +726,8 @@
                           <object class="GtkLabel" id="ftRecordLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="fmsearchdialog|ftRecordLabel">Record:</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -780,6 +787,7 @@
       </object>
     </child>
     <action-widgets>
+      <action-widget response="-7">close</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
   </object>