diff --git a/src/plugins/tool/Desbrowser.py b/src/plugins/tool/Desbrowser.py index 083c72e90..bd259d114 100644 --- a/src/plugins/tool/Desbrowser.py +++ b/src/plugins/tool/Desbrowser.py @@ -36,7 +36,6 @@ import os # #------------------------------------------------------------------------ import gtk -from gtk import glade #------------------------------------------------------------------------ # @@ -80,18 +79,18 @@ class DesBrowse(Tool.ActivePersonTool, ManagedWindow.ManagedWindow): base = os.path.dirname(__file__) glade_file = base + os.sep + "desbrowse.glade" - - self.glade = glade.XML(glade_file,"top","gramps") - self.glade.signal_autoconnect({ + self.glade = gtk.Builder() + self.glade.add_from_file(glade_file) + self.glade.connect_signals({ "destroy_passed_object" : self.close, "on_help_clicked" : self.on_help_clicked, }) - window = self.glade.get_widget("top") - self.set_window(window,self.glade.get_widget('title'), + window = self.glade.get_object("top") + self.set_window(window,self.glade.get_object('title'), self.active_name) - self.tree = self.glade.get_widget("tree1") + self.tree = self.glade.get_object("tree1") col = gtk.TreeViewColumn('',gtk.CellRendererText(),text=0) self.tree.append_column(col) self.tree.set_rules_hint(True) diff --git a/src/plugins/tool/Eval.py b/src/plugins/tool/Eval.py index 9ca6d0d16..3685fe00f 100644 --- a/src/plugins/tool/Eval.py +++ b/src/plugins/tool/Eval.py @@ -39,7 +39,7 @@ from gettext import gettext as _ # GNOME/GTK modules # #------------------------------------------------------------------------ -from gtk import glade +import gtk #------------------------------------------------------------------------ # @@ -62,21 +62,24 @@ class Eval(Tool.Tool,ManagedWindow.ManagedWindow): Tool.Tool.__init__(self,dbstate, options_class, name) ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__) - glade_file = "%s/%s" % (os.path.dirname(__file__),"eval.glade") - self.glade = glade.XML(glade_file,"top","gramps") + base = os.path.dirname(__file__) + glade_file = base + os.sep + "eval.glade" + glade_file = '/tmp/eval.glade' + self.glade = gtk.Builder() + self.glade.add_from_file(glade_file) - window = self.glade.get_widget("top") - self.dbuf = self.glade.get_widget("display").get_buffer() - self.ebuf = self.glade.get_widget("eval").get_buffer() - self.error = self.glade.get_widget("error").get_buffer() + window = self.glade.get_object("top") + self.dbuf = self.glade.get_object("display").get_buffer() + self.ebuf = self.glade.get_object("eval").get_buffer() + self.error = self.glade.get_object("error").get_buffer() - self.glade.signal_autoconnect({ + self.glade.connect_signals({ "on_apply_clicked" : self.apply_clicked, "on_close_clicked" : self.close, "on_clear_clicked" : self.clear_clicked, }) - self.set_window(window,self.glade.get_widget('title'),self.title) + self.set_window(window,self.glade.get_object('title'),self.title) self.show() def build_menu_names(self, obj): diff --git a/src/plugins/tool/desbrowse.glade b/src/plugins/tool/desbrowse.glade index 082b7eb96..c7be996ab 100644 --- a/src/plugins/tool/desbrowse.glade +++ b/src/plugins/tool/desbrowse.glade @@ -1,154 +1,144 @@ - - - - - - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 450 - 400 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - False - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 10 - False - False - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - - - - - 0 - True - True - - - - - - True - <i>Double-click on the row to edit personal information</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - - + + + + + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 450 + 400 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + False + + + + True + False + 0 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + GTK_PACK_END + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 10 + False + False + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + False + False + True + + + + + 0 + True + True + + + + + True + <i>Double-click on the row to edit personal information</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + button1 + button2 + + +