[PATCH 1/4] findbar: Convert from GtkTable to GtkGrid

[Peter Tyser <ptyser gmail com>]

Signed-off-by: Peter Tyser <ptyser gmail com>
---
 data/ui/findbar.ui | 69 +++++++++++++++++++++++++-----------------------------
 meld/ui/findbar.py |  4 ++--
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/data/ui/findbar.ui b/data/ui/findbar.ui
index 799e405..cb541ac 100644
--- a/data/ui/findbar.ui
+++ b/data/ui/findbar.ui
@@ -13,18 +13,10 @@
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkTable" id="findbar">
+      <object class="GtkGrid" id="findbar">
         <property name="can_focus">False</property>
-        <property name="n_rows">2</property>
-        <property name="n_columns">6</property>
         <property name="column_spacing">6</property>
         <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -66,11 +58,9 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -117,9 +107,9 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="right_attach">4</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -132,8 +122,10 @@
             <property name="mnemonic_widget">find_entry</property>
           </object>
           <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -148,9 +140,9 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -163,10 +155,10 @@
             <property name="mnemonic_widget">replace_entry</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -180,11 +172,9 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -245,11 +235,10 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">4</property>
-            <property name="right_attach">5</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
-            <property name="x_padding">7</property>
+            <property name="left_attach">3</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -284,12 +273,18 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">5</property>
-            <property name="right_attach">6</property>
-            <property name="x_options"/>
-            <property name="x_padding">6</property>
+            <property name="left_attach">4</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index 4657749..cd25fba 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -56,7 +56,7 @@ class FindBar(gnomeglade.Component):
         self.hbuttonbox2.hide()
         if text:
             self.find_entry.set_text(text)
-        self.widget.set_row_spacings(0)
+        self.widget.set_row_spacing(0)
         self.widget.show()
         self.find_entry.grab_focus()
 
@@ -78,7 +78,7 @@ class FindBar(gnomeglade.Component):
         self.textview = textview
         if text:
             self.find_entry.set_text(text)
-        self.widget.set_row_spacings(6)
+        self.widget.set_row_spacing(6)
         self.widget.show_all()
         self.find_entry.grab_focus()
         self.wrap_box.set_visible(False)
-- 
1.8.3.2