[ontv] * PreferencesDialog rewritten to stop depeding on libglade

[Olof Kindgren <olki src gnome org>]

commit 7ef1c7868515a6a1707a1f1657f0bc6e4c52d622
Author: Olof Kindgren <olki src gnome org>
Date:   Thu Jan 14 23:30:19 2010 +0100

    * PreferencesDialog rewritten to stop depeding on libglade
    
    This should get rid of all dependencies to libglade

 data/Makefile.am |    3 +--
 data/ontv.ui     |    1 +
 ontv/dialogs.py  |   41 +++++++++++++++++++++--------------------
 3 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 63646a8..638612d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,8 +19,7 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
 @INTLTOOL_SERVER_RULE@
 
 gladedir   = $(datadir)/ontv
-glade_DATA = ontv.glade	\
-	ontv.ui
+glade_DATA = ontv.ui
 
 uidir   = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_OnTVApplet.xml
diff --git a/data/ontv.ui b/data/ontv.ui
index 8d9126a..2b53ab7 100644
--- a/data/ontv.ui
+++ b/data/ontv.ui
@@ -263,6 +263,7 @@
                                             <property name="use_underline">True</property>
                                             <property name="active">True</property>
                                             <property name="draw_indicator">True</property>
+                                            <property name="group">upcoming_programs_below_radiobutton</property>
                                           </object>
                                           <packing>
                                             <property name="position">1</property>
diff --git a/ontv/dialogs.py b/ontv/dialogs.py
index 512541b..c9a6297 100644
--- a/ontv/dialogs.py
+++ b/ontv/dialogs.py
@@ -172,33 +172,34 @@ class PreferencesDialog:
         self.__auto_reload_id = None
 
     def __get_widgets(self):
-        xml = gtk.glade.XML(gui.glade_file, domain=NAME.lower())
+        builder = gtk.Builder()
+        builder.add_from_file(gui.ui_file)
 
-        self.dialog = xml.get_widget("preferences_dialog")
-        self.notebook = xml.get_widget("notebook")
+        self.dialog = builder.get_object("preferences_dialog")
+        self.notebook = builder.get_object("notebook")
 
         # General tab
-        self.grabber_command_entry = xml.get_widget("grabber_command_entry")
-        self.output_file_entry = xml.get_widget("output_file_entry")
-        self.browse_button = xml.get_widget("browse_button")
-        self.current_programs_checkbutton = xml.get_widget("current_programs_checkbutton")
-        self.upcoming_programs_checkbutton = xml.get_widget("upcoming_programs_checkbutton")
-        self.position_hbox = xml.get_widget("position_hbox")
-        self.upcoming_programs_below_radiobutton = xml.get_widget("upcoming_programs_below_radiobutton")
-        self.upcoming_programs_right_radiobutton = xml.get_widget("upcoming_programs_right_radiobutton")
+        self.grabber_command_entry = builder.get_object("grabber_command_entry")
+        self.output_file_entry = builder.get_object("output_file_entry")
+        self.browse_button = builder.get_object("browse_button")
+        self.current_programs_checkbutton = builder.get_object("current_programs_checkbutton")
+        self.upcoming_programs_checkbutton = builder.get_object("upcoming_programs_checkbutton")
+        self.position_hbox = builder.get_object("position_hbox")
+        self.upcoming_programs_below_radiobutton = builder.get_object("upcoming_programs_below_radiobutton")
+        self.upcoming_programs_right_radiobutton = builder.get_object("upcoming_programs_right_radiobutton")
 
         # Channels tab
-        self.channels_treeview = xml.get_widget("channels_treeview")
-        self.channels_image = xml.get_widget("channels_image")
+        self.channels_treeview = builder.get_object("channels_treeview")
+        self.channels_image = builder.get_object("channels_image")
 
         # Reminders tab
-        self.reminders_treeview = xml.get_widget("reminders_treeview")
-        self.program_entry = xml.get_widget("program_entry")
-        self.channels_comboboxentry = xml.get_widget("channels_comboboxentry")
-        self.notify_spinbutton = xml.get_widget("notify_spinbutton")
-        self.add_reminder_button = xml.get_widget("add_reminder_button")
-        self.update_reminder_button = xml.get_widget("update_reminder_button")
-        self.remove_reminder_button = xml.get_widget("remove_reminder_button")
+        self.reminders_treeview = builder.get_object("reminders_treeview")
+        self.program_entry = builder.get_object("program_entry")
+        self.channels_comboboxentry = builder.get_object("channels_comboboxentry")
+        self.notify_spinbutton = builder.get_object("notify_spinbutton")
+        self.add_reminder_button = builder.get_object("add_reminder_button")
+        self.update_reminder_button = builder.get_object("update_reminder_button")
+        self.remove_reminder_button = builder.get_object("remove_reminder_button")
 
     def __make_channels_treeview(self):
         self.channels_model = gtk.ListStore(object)