diff --git a/src/plugins/tool/Leak.py b/src/plugins/tool/Leak.py index ea0b5b123..83f38a847 100644 --- a/src/plugins/tool/Leak.py +++ b/src/plugins/tool/Leak.py @@ -39,7 +39,6 @@ from bsddb.db import DBError # GNOME/GTK modules # #------------------------------------------------------------------------ -from gtk import glade import gtk import pango import gc @@ -67,10 +66,11 @@ class Leak(Tool.Tool,ManagedWindow.ManagedWindow): ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__) glade_file = os.path.dirname(__file__) + os.sep + "leak.glade" - self.glade = glade.XML(glade_file,"top","gramps") + self.glade = gtk.Builder() + self.glade.add_from_file(glade_file) - self.window = self.glade.get_widget("top") - self.scroll = self.glade.get_widget("scrolledwindow1") + self.window = self.glade.get_object("top") + self.scroll = self.glade.get_object("scrolledwindow1") #add a listview to the scrollable self.list = gtk.TreeView() self.list.set_headers_visible(True) @@ -96,10 +96,10 @@ class Leak(Tool.Tool,ManagedWindow.ManagedWindow): gc.set_debug(gc.DEBUG_UNCOLLECTABLE|gc.DEBUG_OBJECTS|gc.DEBUG_SAVEALL) - self.set_window(self.window, self.glade.get_widget('title'), + self.set_window(self.window, self.glade.get_object('title'), self.title) - self.glade.signal_autoconnect({ + self.glade.connect_signals({ "on_apply_clicked" : self.apply_clicked, "on_close_clicked" : self.close, }) diff --git a/src/plugins/tool/leak.glade b/src/plugins/tool/leak.glade index 0023c42eb..3c4ad2dfd 100644 --- a/src/plugins/tool/leak.glade +++ b/src/plugins/tool/leak.glade @@ -1,197 +1,185 @@ - - - - - - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 450 - 500 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-refresh - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 6 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 6 - True - 2 - 1 - False - 6 - 6 - - - - True - <b>Uncollected Objects</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - - - - 0 - 1 - 1 - 2 - expand|shrink|fill - expand|shrink|fill - - - - - 0 - True - True - - - - - - 6 - True - GTK_BUTTONBOX_END - 6 - - - 0 - False - True - - - - - 0 - True - True - - - - - - - + + + + + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 450 + 500 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-refresh + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + GTK_PACK_END + + + + + 6 + True + False + 6 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 6 + True + 2 + 1 + False + 6 + 6 + + + True + <b>Uncollected Objects</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + + + 0 + 1 + 1 + 2 + expand|shrink|fill + expand|shrink|fill + + + + + 0 + True + True + + + + + 6 + True + GTK_BUTTONBOX_END + 6 + + + 0 + False + True + + + + + 0 + True + True + + + + + + button2 + button3 + + +