[conduit] update db tester to gtkbuilder

[John Stowers <jstowers src gnome org>]

commit 5514ee85973a5dd7db0156aaa1916fad103a938b
Author: John Stowers <john stowers gmail com>
Date:   Thu Jan 7 16:38:49 2010 +0100

    update db tester to gtkbuilder

 tools/test-db-wrapper/main.py                 |   11 ++--
 tools/test-db-wrapper/{main.glade => main.ui} |   64 ++++++++++++++----------
 2 files changed, 42 insertions(+), 33 deletions(-)
---
diff --git a/tools/test-db-wrapper/main.py b/tools/test-db-wrapper/main.py
index eb5b008..ca84f6c 100755
--- a/tools/test-db-wrapper/main.py
+++ b/tools/test-db-wrapper/main.py
@@ -4,7 +4,6 @@ import sys
 import os.path
 import tempfile
 import gtk
-import gtk.glade
 import pango
 import random
 import traceback
@@ -19,19 +18,19 @@ class Tester(object):
     def __init__(self, table, db):
         self.table = table
         self.db = db
-        gladeFile = os.path.join(os.path.dirname(__file__),"main.glade")
-        widgets = gtk.glade.XML(gladeFile, "MainWindow")
+        gtkbuilder = gtk.Builder()
+        gtkbuilder.add_from_file(os.path.join(os.path.dirname(__file__),"main.ui"))
         dic = { "add_clicked"       : self.on_add_clicked,
                 "edit_clicked"      : self.on_edit_clicked,
                 "delete_clicked"    : self.on_delete_clicked
                 }
-        widgets.signal_autoconnect(dic)
-        window = widgets.get_widget("MainWindow")
+        gtkbuilder.connect_signals(dic)
+        window = gtkbuilder.get_object("MainWindow")
         window.set_position(gtk.WIN_POS_CENTER)
         window.connect('destroy', self.on_quit)
 
 
-        scroller = widgets.get_widget("scrolledwindow")
+        scroller = gtkbuilder.get_object("scrolledwindow")
         self.treeview = gtk.TreeView()
         self.treeview.set_headers_visible(True)
         self.treeview.set_fixed_height_mode(True)
diff --git a/tools/test-db-wrapper/main.glade b/tools/test-db-wrapper/main.ui
similarity index 65%
rename from tools/test-db-wrapper/main.glade
rename to tools/test-db-wrapper/main.ui
index ee1242c..051102d 100644
--- a/tools/test-db-wrapper/main.glade
+++ b/tools/test-db-wrapper/main.ui
@@ -1,80 +1,90 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.0 on Wed Sep 26 23:01:19 2007 -->
-<glade-interface>
-  <widget class="GtkWindow" id="MainWindow">
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="MainWindow">
     <property name="width_request">400</property>
     <property name="height_request">700</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
-      <widget class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow">
+          <object class="GtkScrolledWindow" id="scrolledwindow">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <placeholder/>
             </child>
-          </widget>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="add_clicked"/>
-              </widget>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-edit</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-edit</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="edit_clicked"/>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button3">
+              <object class="GtkButton" id="button3">
+                <property name="label">gtk-delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-delete</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="delete_clicked"/>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>