--- /usr/share/gnome-terminal/find-dialog.ui	2010-08-18 08:52:31.000000000 +0200
+++ txt/find-dialog.ui	2010-08-18 14:29:27.231235013 +0200
@@ -2,7 +2,7 @@
 <!--*- mode: xml -*-->
 <interface>
   <object class="GtkDialog" id="find-dialog">
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">Find</property>
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -23,7 +23,6 @@
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="homogeneous">False</property>
-        <property name="spacing">18</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
@@ -52,101 +51,122 @@
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
-            <property name="visible">True</property>
-            <property name="homogeneous">False</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="search-label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Search for:</property>
-                <property name="use_underline">True</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="mnemonic_widget">search-entry</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxEntry" id="search-entry">
-                <property name="visible">True</property>
-                <property name="add_tearoffs">False</property>
-                <property name="has_frame">True</property>
-                <property name="focus_on_click">True</property>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
             <property name="homogeneous">False</property>
-            <property name="spacing">12</property>
+            <property name="border_width">6</property>
             <child>
-              <object class="GtkCheckButton" id="match-case-checkbutton">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">_Match case</property>
-                <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">False</property>
-                <property name="active">False</property>
-                <property name="inconsistent">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">12</property>
+                <property name="width_request">250</property>
+                <child>
+                  <object class="GtkLabel" id="search-label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Search for:</property>
+                    <property name="use_underline">True</property>
+                    <property name="selectable">False</property>
+                    <property name="mnemonic_widget">search-entry</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxEntry" id="search-entry">
+                    <property name="visible">True</property>
+                    <property name="focus_on_click">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="padding">0</property>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="entire-word-checkbutton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Match _entire word only</property>
-                <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">False</property>
-                <property name="active">False</property>
-                <property name="inconsistent">False</property>
-                <property name="draw_indicator">True</property>
+              <object class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkVBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkCheckButton" id="match-case-checkbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_Match case</property>
+                        <property name="use_underline">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="entire-word-checkbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Match _as word</property>
+                        <property name="use_underline">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox4">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkCheckButton" id="search-backwards-checkbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Search _backwards</property>
+                        <property name="use_underline">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="wrap-around-checkbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_Wrap around</property>
+                        <property name="use_underline">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="padding">6</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -155,59 +175,14 @@
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Match as _regular expression</property>
                 <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">False</property>
-                <property name="active">False</property>
-                <property name="inconsistent">False</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="search-backwards-checkbutton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Search _backwards</property>
-                <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">False</property>
-                <property name="active">True</property>
-                <property name="inconsistent">False</property>
                 <property name="draw_indicator">True</property>
               </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="wrap-around-checkbutton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">_Wrap around</property>
-                <property name="use_underline">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">False</property>
-                <property name="active">True</property>
-                <property name="inconsistent">False</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="padding">6</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
