diff --git a/src/plugins/tool/ChangeTypes.py b/src/plugins/tool/ChangeTypes.py index e4f2d2177..74c614219 100644 --- a/src/plugins/tool/ChangeTypes.py +++ b/src/plugins/tool/ChangeTypes.py @@ -37,7 +37,7 @@ from gettext import ngettext # GNOME/GTK modules # #------------------------------------------------------------------------ -from gtk import glade +import gtk #------------------------------------------------------------------------ # @@ -79,10 +79,11 @@ class ChangeTypes(Tool.BatchTool, ManagedWindow.ManagedWindow): base = os.path.dirname(__file__) glade_file = "%s/%s" % (base,"changetype.glade") - self.glade = glade.XML(glade_file,"top","gramps") + self.glade = gtk.Builder() + self.glade.add_from_file(glade_file) - self.auto1 = self.glade.get_widget("original") - self.auto2 = self.glade.get_widget("new") + self.auto1 = self.glade.get_object("original") + self.auto2 = self.glade.get_object("new") # Need to display localized event names etype = EventType() @@ -98,10 +99,10 @@ class ChangeTypes(Tool.BatchTool, ManagedWindow.ManagedWindow): etype.set_from_xml_str(self.options.handler.options_dict['totype']) self.auto2.child.set_text(str(etype)) - window = self.glade.get_widget('top') - self.set_window(window,self.glade.get_widget('title'),self.title) + window = self.glade.get_object('top') + self.set_window(window,self.glade.get_object('title'),self.title) - self.glade.signal_autoconnect({ + self.glade.connect_signals({ "on_close_clicked" : self.close, "on_apply_clicked" : self.on_apply_clicked, }) diff --git a/src/plugins/tool/changetype.glade b/src/plugins/tool/changetype.glade index 6bc2ea9c9..8090cecfd 100644 --- a/src/plugins/tool/changetype.glade +++ b/src/plugins/tool/changetype.glade @@ -1,244 +1,231 @@ - - - - - - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - - True - False - 8 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 10 - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 10 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - This tool will rename all events of one type to a different type. Once completed, this cannot be undone by the regular Undo function. - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 12 - 12 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 12 - True - 2 - 2 - False - 6 - 12 - - - - True - _Original event type: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _New event type: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - True - True - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - True - True - - - 1 - 2 - 0 - 1 - fill - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - + + + + + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 8 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + GTK_PACK_END + + + + + 10 + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 10 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + This tool will rename all events of one type to a different type. Once completed, this cannot be undone by the regular Undo function. + False + False + GTK_JUSTIFY_LEFT + True + False + 0.5 + 0.5 + 12 + 12 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 12 + True + 2 + 2 + False + 6 + 12 + + + True + _Original event type: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + _New event type: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + False + True + True + + + 1 + 2 + 1 + 2 + fill + fill + + + + + True + False + True + True + + + 1 + 2 + 0 + 1 + fill + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + button5 + button3 + + +