diff --git a/src/plugins/tool/PatchNames.py b/src/plugins/tool/PatchNames.py index ce77a1138..baf9a09fc 100644 --- a/src/plugins/tool/PatchNames.py +++ b/src/plugins/tool/PatchNames.py @@ -37,7 +37,6 @@ import re # #------------------------------------------------------------------------- import gtk -from gtk import glade import gobject #------------------------------------------------------------------------- @@ -202,17 +201,17 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow): base = os.path.dirname(__file__) glade_file = os.path.join(base, "patchnames.glade") - - self.top = glade.XML(glade_file, "top", "gramps") - window = self.top.get_widget('top') - self.top.signal_autoconnect({ + self.top = gtk.Builder() + self.top.add_from_file(glade_file) + window = self.top.get_object('top') + self.top.connect_signals({ "destroy_passed_object" : self.close, "on_ok_clicked" : self.on_ok_clicked, "on_help_clicked" : self.on_help_clicked, }) - self.list = self.top.get_widget("list") - self.set_window(window, self.top.get_widget('title'), self.label) + self.list = self.top.get_object("list") + self.set_window(window, self.top.get_object('title'), self.label) self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, diff --git a/src/plugins/tool/patchnames.glade b/src/plugins/tool/patchnames.glade index ea9d67e1a..f58b638a1 100644 --- a/src/plugins/tool/patchnames.glade +++ b/src/plugins/tool/patchnames.glade @@ -1,244 +1,228 @@ - - - - - - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 500 - 450 - 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-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - 0 - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Accept and close - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - False - GTK_PACK_END - - - - - - 6 - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 6 - False - False - - - - - - True - Below is a list of the nicknames, titles and family name prefixes that GRAMPS can extract from the + + + + + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 500 + 450 + 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-help + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + True + False + 2 + + + True + gtk-ok + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + _Accept and close + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + False + GTK_PACK_END + + + + + 6 + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 6 + False + False + + + + + True + Below is a list of the nicknames, titles and family name prefixes that GRAMPS can extract from the current database. If you accept the changes, GRAMPS will modify the entries that have been selected. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 10 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - 6 - False - True - - - - - 0 - True - True - - - - - - - + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 10 + + + 0 + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + True + False + False + True + + + + + 0 + True + True + + + + + True + GTK_BUTTONBOX_END + 6 + + + 6 + False + True + + + + + 0 + True + True + + + + + + helpbutton1 + button6 + button5 + + +