diff --git a/src/.cvsignore b/src/.cvsignore index 04ab68864..574842560 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,3 +1,4 @@ Makefile *.pyc *.pyo +gramps.strings diff --git a/src/EditPerson.glade b/src/EditPerson.glade index 5114ffea6..a1213030d 100644 --- a/src/EditPerson.glade +++ b/src/EditPerson.glade @@ -13,7 +13,7 @@ - GtkWindow + GnomeDialog editPerson True @@ -23,17 +23,72 @@ Gramps - Edit Person GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False False True False + False + False GtkVBox + GnomeDialog:vbox vbox4 False 0 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox1 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 2 + False + True + GTK_PACK_END + + + + GtkButton + applyPerson + True + True + True + + clicked + on_apply_person_clicked + editPerson + Thu, 19 Oct 2000 19:26:54 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button15 + True + True + + clicked + destroy_passed_object + editPerson + Thu, 19 Oct 2000 19:25:50 GMT + + GNOME_STOCK_BUTTON_CANCEL + + GtkLabel @@ -3708,52 +3763,6 @@ 0 - - - GtkHButtonBox - hbuttonbox1 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 2 - False - True - - - - GtkButton - applyPerson - True - True - - clicked - on_apply_person_clicked - editPerson - Thu, 19 Oct 2000 19:26:54 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button15 - True - True - - clicked - destroy_passed_object - editPerson - Thu, 19 Oct 2000 19:25:50 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - - @@ -3792,7 +3801,7 @@ - GtkDialog + GnomeDialog name_edit Gramps - Alternate Name Editor GTK_WINDOW_TOPLEVEL @@ -3801,21 +3810,31 @@ True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox vbox32 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area hbox26 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -3824,49 +3843,32 @@ - GtkHButtonBox - hbuttonbox20 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button118 + True + True + True + + clicked + on_name_edit_ok_clicked + name_edit + Sat, 28 Jul 2001 21:08:16 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button118 - True - True - - clicked - on_name_edit_ok_clicked - name_edit - Sat, 28 Jul 2001 21:08:16 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button119 - True - True - - clicked - destroy_passed_object - name_edit - Thu, 26 Jul 2001 19:16:49 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button119 + True + True + + clicked + destroy_passed_object + name_edit + Thu, 26 Jul 2001 19:16:49 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -4285,6 +4287,7 @@ Very High GtkEntry alt_given True + True True True 0 @@ -4310,7 +4313,7 @@ Very High - GtkDialog + GnomeDialog addr_edit Gramps - Address Editor GTK_WINDOW_TOPLEVEL @@ -4319,21 +4322,31 @@ Very High True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox vbox34 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area hbox30 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -4342,49 +4355,32 @@ Very High - GtkHButtonBox - hbuttonbox21 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button121 + True + True + True + + clicked + on_addr_edit_ok_clicked + addr_edit + Sat, 28 Jul 2001 22:35:30 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button121 - True - True - - clicked - on_addr_edit_ok_clicked - addr_edit - Sat, 28 Jul 2001 22:35:30 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button122 - True - True - - clicked - destroy_passed_object - addr_edit - Thu, 26 Jul 2001 19:16:49 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button122 + True + True + + clicked + destroy_passed_object + addr_edit + Thu, 26 Jul 2001 19:16:49 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -4791,6 +4787,7 @@ Very High GtkEntry address_start True + True True True 0 @@ -4966,7 +4963,7 @@ Very High - GtkDialog + GnomeDialog url_edit Gramps - Internet Address Editor GTK_WINDOW_TOPLEVEL @@ -4975,21 +4972,31 @@ Very High True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox vbox36 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area hbox33 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -4998,49 +5005,32 @@ Very High - GtkHButtonBox - hbuttonbox22 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button124 + True + True + True + + clicked + on_url_edit_ok_clicked + url_edit + Sun, 29 Jul 2001 05:41:34 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button124 - True - True - - clicked - on_url_edit_ok_clicked - url_edit - Sun, 29 Jul 2001 05:41:34 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button125 - True - True - - clicked - destroy_passed_object - url_edit - Thu, 26 Jul 2001 19:16:49 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button125 + True + True + + clicked + destroy_passed_object + url_edit + Thu, 26 Jul 2001 19:16:49 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -5212,6 +5202,7 @@ Very High url_addr 400 True + True True True 0 diff --git a/src/EditPerson.py b/src/EditPerson.py index 92157c63d..7f2a336ee 100644 --- a/src/EditPerson.py +++ b/src/EditPerson.py @@ -94,9 +94,10 @@ class EditPerson: self.not_loaded = 1 self.lists_changed = 0 - self.top_window = libglade.GladeXML(const.editPersonFile, "editPerson") + self.top = libglade.GladeXML(const.editPersonFile, "editPerson") # widgets + self.window = self.get_widget("editPerson") self.notes_field = self.get_widget("personNotes") self.event_name_field = self.get_widget("eventName") self.event_place_field = self.get_widget("eventPlace") @@ -160,8 +161,20 @@ class EditPerson: self.birth = Event(person.getBirth()) self.pname = Name(person.getPrimaryName()) self.selected_icon = -1 + + # Typing CR selects OK button + self.window.editable_enters(self.notes_field); + self.window.editable_enters(self.given); + self.window.editable_enters(self.surname_field); + self.window.editable_enters(self.suffix); + self.window.editable_enters(self.title); + self.window.editable_enters(self.nick); + self.window.editable_enters(self.bdate); + self.window.editable_enters(self.bplace); + self.window.editable_enters(self.ddate); + self.window.editable_enters(self.dplace); - self.top_window.signal_autoconnect({ + self.top.signal_autoconnect({ "destroy_passed_object" : on_cancel_edit, "on_add_address_clicked" : on_add_addr_clicked, "on_add_aka_clicked" : on_add_aka_clicked, @@ -285,7 +298,7 @@ class EditPerson: # #--------------------------------------------------------------------- def get_widget(self,str): - return self.top_window.get_widget(str) + return self.top.get_widget(str) #--------------------------------------------------------------------- # @@ -1065,6 +1078,7 @@ def on_add_photo_clicked(obj): edit_person = obj.get_data(EDITPERSON) image_select = libglade.GladeXML(const.imageselFile,"imageSelect") edit_person.isel = image_select + window = image_select.get_widget("imageSelect") image_select.signal_autoconnect({ "on_savephoto_clicked" : on_savephoto_clicked, @@ -1075,8 +1089,9 @@ def on_add_photo_clicked(obj): edit_person.fname = image_select.get_widget("fname") edit_person.add_image = image_select.get_widget("image") edit_person.external = image_select.get_widget("private") - image_select.get_widget("imageSelect").set_data(EDITPERSON,edit_person) - image_select.get_widget("imageSelect").show() + window.editable_enters(image_select.get_widget("photoDescription")) + window.set_data(EDITPERSON,edit_person) + window.show() #------------------------------------------------------------------------- # @@ -1279,6 +1294,7 @@ def display_note(obj,data): en_obj = editnote.get_widget("editnote") en_obj.set_data(NOTEOBJ,data) en_obj.set_data(TEXTOBJ,textobj) + en_obj.editable_enters(textobj); textobj.set_point(0) textobj.insert_defaults(data.getNote()) @@ -1423,6 +1439,7 @@ def on_change_description(obj): window.get_widget("dialog1").set_data(PHOTO,photo) window.get_widget("dialog1").set_data(TEXT,text) window.get_widget("dialog1").set_data(OBJECT,obj.get_data(OBJECT)) + window.get_widget("dialog1").editable_enters(text) window.signal_autoconnect({ "on_cancel_clicked" : utils.destroy_passed_object, "on_ok_clicked" : on_ok_clicked, @@ -1483,6 +1500,12 @@ class EventEditor: self.top.get_widget("eventTitle").set_text(title) self.event_menu.set_popdown_strings(const.personalEvents) + # Typing CR selects OK button + self.window.editable_enters(self.name_field); + self.window.editable_enters(self.place_field); + self.window.editable_enters(self.date_field); + self.window.editable_enters(self.descr_field); + utils.build_confidence_menu(self.conf_menu) values = self.parent.db.getPlaceMap().values() @@ -1587,6 +1610,10 @@ class AttributeEditor: else: self.srcref = SourceRef() + # Typing CR selects OK button + self.window.editable_enters(self.type_field); + self.window.editable_enters(self.value_field); + name = parent.person.getPrimaryName().getName() self.top.get_widget("attrTitle").set_text(_("Attribute Editor for %s") % name) @@ -1696,6 +1723,11 @@ class NameEditor: self.top.get_widget("altTitle").set_text( _("Alternate Name Editor for %s") % full_name) + # Typing CR selects OK button + self.window.editable_enters(self.given_field); + self.window.editable_enters(self.surname_field); + self.window.editable_enters(self.suffix_field); + utils.build_confidence_menu(self.conf_menu) if name != None: @@ -1792,6 +1824,16 @@ class AddressEditor: text = _("Address Editor for %s") % name self.top.get_widget("addrTitle").set_text(text) + # Typing CR selects OK button + self.window.editable_enters(self.addr_start); + self.window.editable_enters(self.street); + self.window.editable_enters(self.city); + self.window.editable_enters(self.state); + self.window.editable_enters(self.country); + self.window.editable_enters(self.postal); + self.window.editable_enters(self.source_field); + self.window.editable_enters(self.note_field); + utils.build_confidence_menu(self.conf_menu) if addr != None: @@ -1883,6 +1925,9 @@ class UrlEditor: title = _("Internet Address Editor for %s") % name self.top.get_widget("urlTitle").set_text(title) + self.window.editable_enters(self.url_addr); + self.window.editable_enters(self.url_des); + if url != None: self.des.set_text(url.get_description()) self.addr.set_text(url.get_path()) diff --git a/src/EditPlace.py b/src/EditPlace.py index 036e74ea7..8c3c0e836 100644 --- a/src/EditPlace.py +++ b/src/EditPlace.py @@ -140,6 +140,15 @@ class EditPlace: self.top = self.top_window.get_widget("placeEditor") self.top.set_data(_PLACE,self) + # Typing CR selects OK button + self.top.editable_enters(self.title); + self.top.editable_enters(self.city); + self.top.editable_enters(self.county); + self.top.editable_enters(self.state); + self.top.editable_enters(self.country); + self.top.editable_enters(self.longitude); + self.top.editable_enters(self.latitude); + if self.place.getId() == "": self.top_window.get_widget("add_photo").set_sensitive(0) self.top_window.get_widget("delete_photo").set_sensitive(0) @@ -331,8 +340,10 @@ def on_add_photo_clicked(obj): edit_place.fname = image_select.get_widget("fname") edit_place.add_image = image_select.get_widget("image") edit_place.external = image_select.get_widget("private") - image_select.get_widget("imageSelect").set_data(_PLACE,edit_place) - image_select.get_widget("imageSelect").show() + window = image_select.get_widget("imageSelect") + window.editable_enters(image_select.get_widget("photoDescription")) + window.set_data(_PLACE,edit_place) + window.show() #------------------------------------------------------------------------- # @@ -452,6 +463,7 @@ def on_change_description(obj): window.get_widget("dialog1").set_data("p",photo) window.get_widget("dialog1").set_data("t",text) window.get_widget("dialog1").set_data("m",obj.get_data("m")) + window.get_widget("dialog1").editable_enters(text) window.signal_autoconnect({ "on_cancel_clicked" : utils.destroy_passed_object, "on_ok_clicked" : on_ok_clicked, @@ -730,6 +742,12 @@ class LocationEditor: self.county = self.top.get_widget("county") self.country = self.top.get_widget("country") + # Typing CR selects OK button + self.window.editable_enters(self.city); + self.window.editable_enters(self.county); + self.window.editable_enters(self.state); + self.window.editable_enters(self.country); + if parent.place: name = _("Location Editor for %s") % parent.place.get_title() else: diff --git a/src/EditSource.py b/src/EditSource.py index 0b3aafd8a..f114d3cd7 100644 --- a/src/EditSource.py +++ b/src/EditSource.py @@ -100,6 +100,10 @@ class EditSource: self.top_window.get_widget("add_photo").set_sensitive(0) self.top_window.get_widget("delete_photo").set_sensitive(0) + self.top.editable_enters(self.title); + self.top.editable_enters(self.author); + self.top.editable_enters(self.pubinfo); + #------------------------------------------------------------------------- # # add_thumbnail - Scale the image and add it to the IconList. @@ -212,8 +216,10 @@ def on_add_photo_clicked(obj): edit_source.fname = image_select.get_widget("fname") edit_source.add_image = image_select.get_widget("image") edit_source.external = image_select.get_widget("private") - image_select.get_widget("imageSelect").set_data(SOURCE,edit_source) - image_select.get_widget("imageSelect").show() + window = image_select.get_widget("imageSelect") + window.editable_enters(image_select.get_widget("photoDescription")) + window.set_data(SOURCE,edit_source) + window.show() #------------------------------------------------------------------------- # @@ -333,6 +339,7 @@ def on_change_description(obj): window.get_widget("dialog1").set_data("p",photo) window.get_widget("dialog1").set_data("t",text) window.get_widget("dialog1").set_data("m",obj.get_data("m")) + window.get_widget("dialog1").editable_enters(text) window.signal_autoconnect({ "on_cancel_clicked" : utils.destroy_passed_object, "on_ok_clicked" : on_ok_clicked, diff --git a/src/Find.py b/src/Find.py index 9187884e5..0ea102219 100644 --- a/src/Find.py +++ b/src/Find.py @@ -52,6 +52,7 @@ class Find: self.top = self.xml.get_widget("find") self.top.set_data(_OBJECT,self) self.entry = self.xml.get_widget("entry1") + self.top.editable_enters(self.entry) def find_next(self): """Advances to the next person that matches the dialog text""" diff --git a/src/Marriage.py b/src/Marriage.py index 6d4fb071a..60308213d 100644 --- a/src/Marriage.py +++ b/src/Marriage.py @@ -139,6 +139,10 @@ class Marriage: self.notes_field.insert_defaults(family.getNote()) self.notes_field.set_word_wrap(1) + # Typing CR selects OK button + top_window.editable_enters(self.notes_field); + top_window.editable_enters(self.get_widget("combo-entry1")); + self.redraw_events() self.redraw_attr_list() top_window.show() @@ -524,21 +528,22 @@ def on_delete_photo_clicked(obj): def on_add_photo_clicked(obj): marriage_obj = obj.get_data(MARRIAGE) - imageSelect = libglade.GladeXML(const.imageselFile,"imageSelect") + marriage_obj.imageSelect = imageSelect + imageSelect.signal_autoconnect({ "on_savephoto_clicked" : on_savephoto_clicked, "on_name_changed" : on_name_changed, "destroy_passed_object" : utils.destroy_passed_object }) - imageSelect.get_widget("imageSelect").set_data(MARRIAGE,marriage_obj) - imageSelect.get_widget("imageSelect").show() marriage_obj.fname = image_select.get_widget("fname") marriage_obj.add_image = image_select.get_widget("image") marriage_obj.external = image_select.get_widget("private") - - marriage_obj.imageSelect = imageSelect + window = imageSelect.get_widget("imageSelect") + window.editable_enters(image_select.get_widget("photoDescription")) + window.set_data(MARRIAGE,marriage_obj) + window.show() #------------------------------------------------------------------------- # @@ -614,6 +619,7 @@ def on_change_description(obj): window.get_widget("dialog1").set_data("p",photo) window.get_widget("dialog1").set_data("t",text) window.get_widget("dialog1").set_data("m",obj.get_data("m")) + window.get_widget("dialog1").editable_enters(text) window.signal_autoconnect({ "on_cancel_clicked" : utils.destroy_passed_object, "on_ok_clicked" : on_ok_clicked, @@ -729,6 +735,12 @@ class EventEditor: self.top.get_widget("eventTitle").set_text(name) self.event_menu.set_popdown_strings(const.marriageEvents) + # Typing CR selects OK button + self.window.editable_enters(self.name_field); + self.window.editable_enters(self.place_field); + self.window.editable_enters(self.date_field); + self.window.editable_enters(self.descr_field); + utils.build_confidence_menu(self.conf_menu) values = self.parent.db.getPlaceMap().values() @@ -833,6 +845,10 @@ class AttributeEditor: else: self.srcref = SourceRef() + # Typing CR selects OK button + self.window.editable_enters(self.type_field); + self.window.editable_enters(self.value_field); + father = parent.family.getFather() mother = parent.family.getMother() if father and mother: diff --git a/src/Sources.py b/src/Sources.py index a24d2dbf9..b990bf2b5 100644 --- a/src/Sources.py +++ b/src/Sources.py @@ -78,6 +78,10 @@ class SourceEditor: self.author_field = self.get_widget("sauthor") self.pub_field = self.get_widget("spubinfo") + # Typing CR selects OK button + self.sourceDisplay.editable_enters(self.get_widget("spage")) + self.sourceDisplay.editable_enters(self.get_widget("sdate")) + if self.source_ref: self.active_source = self.source_ref.getBase() else: diff --git a/src/StyleEditor.py b/src/StyleEditor.py index 5b7ec31ce..b169373eb 100644 --- a/src/StyleEditor.py +++ b/src/StyleEditor.py @@ -150,6 +150,11 @@ class StyleEditor: self.window.set_data("obj",self) self.pnames = self.top.get_widget("name") + # Typing CR selects OK button + self.window.editable_enters(self.top.get_widget("rmargin")) + self.window.editable_enters(self.top.get_widget("lmargin")) + self.window.editable_enters(self.top.get_widget("pad")) + self.top.get_widget("style_name").set_text(name) myMenu = gtk.GtkMenu() first = 0 diff --git a/src/bookmarks.glade b/src/bookmarks.glade index 83d0d0686..6559d6354 100644 --- a/src/bookmarks.glade +++ b/src/bookmarks.glade @@ -13,7 +13,7 @@ - GtkDialog + GnomeDialog top Gramps - Edit Bookmarks GTK_WINDOW_TOPLEVEL @@ -22,21 +22,31 @@ True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox1 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area1 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -45,47 +55,32 @@ - GtkHButtonBox - hbuttonbox1 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + ok + True + True + True + + clicked + on_ok_clicked + top + Wed, 14 Feb 2001 20:10:00 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - ok - True - True - - clicked - on_ok_clicked - top - Wed, 14 Feb 2001 20:10:00 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - cancel - True - True - - clicked - on_cancel_clicked - top - Wed, 14 Feb 2001 20:10:25 GMT - - GNOME_STOCK_BUTTON_CANCEL - + + GtkButton + cancel + True + True + + clicked + on_cancel_clicked + top + Wed, 14 Feb 2001 20:10:25 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -210,6 +205,7 @@ Wed, 14 Feb 2001 20:09:13 GMT GNOME_STOCK_BUTTON_UP + GTK_RELIEF_NORMAL @@ -224,6 +220,7 @@ Wed, 14 Feb 2001 20:09:23 GMT GNOME_STOCK_BUTTON_DOWN + GTK_RELIEF_NORMAL @@ -238,6 +235,7 @@ Wed, 14 Feb 2001 20:09:35 GMT + GTK_RELIEF_NORMAL diff --git a/src/config.glade b/src/config.glade index 45a4c6bde..94fea54a2 100644 --- a/src/config.glade +++ b/src/config.glade @@ -32,7 +32,7 @@ Wed, 22 Aug 2001 02:13:46 GMT Gramps - Preferences - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False False False @@ -1791,7 +1791,7 @@ AbiWord initDruid Gramps Startup Druid GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True False True diff --git a/src/dialog.glade b/src/dialog.glade index 6db120c4d..a8f4a2179 100644 --- a/src/dialog.glade +++ b/src/dialog.glade @@ -13,30 +13,40 @@ - GtkDialog + GnomeDialog event_edit Gramps - Event Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox1 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area1 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -45,49 +55,32 @@ - GtkHButtonBox - hbuttonbox18 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button111 + True + True + True + + clicked + on_event_edit_ok_clicked + event_edit + Thu, 26 Jul 2001 20:29:11 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button111 - True - True - - clicked - on_event_edit_ok_clicked - event_edit - Thu, 26 Jul 2001 20:29:11 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button113 - True - True - - clicked - destroy_passed_object - event_edit - Thu, 26 Jul 2001 19:16:49 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button113 + True + True + + clicked + destroy_passed_object + event_edit + Thu, 26 Jul 2001 19:16:49 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -370,6 +363,7 @@ GtkCombo:entry eventName True + True True True 0 @@ -601,30 +595,40 @@ Very High - GtkDialog + GnomeDialog attr_edit Gramps - Attribute Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox vbox30 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area hbox22 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -633,49 +637,32 @@ Very High - GtkHButtonBox - hbuttonbox19 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button115 + True + True + True + + clicked + on_attr_edit_ok_clicked + attr_edit + Sat, 28 Jul 2001 16:26:27 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button115 - True - True - - clicked - on_attr_edit_ok_clicked - attr_edit - Sat, 28 Jul 2001 16:26:27 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button116 - True - True - - clicked - destroy_passed_object - attr_edit - Thu, 26 Jul 2001 19:16:49 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button116 + True + True + + clicked + destroy_passed_object + attr_edit + Thu, 26 Jul 2001 19:16:49 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -838,6 +825,7 @@ Very High GtkCombo:entry attr_type True + True True True 0 @@ -1069,30 +1057,40 @@ Very High - GtkDialog + GnomeDialog loc_edit Gramps - Event Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox vbox32 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area hbox26 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -1101,49 +1099,32 @@ Very High - GtkHButtonBox - hbuttonbox20 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button118 + True + True + True + + clicked + on_loc_edit_ok_clicked + loc_edit + Mon, 20 Aug 2001 01:50:00 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button118 - True - True - - clicked - on_loc_edit_ok_clicked - loc_edit - Mon, 20 Aug 2001 01:50:00 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button119 - True - True - - clicked - destroy_passed_object - loc_edit - Thu, 26 Jul 2001 19:16:49 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button119 + True + True + + clicked + destroy_passed_object + loc_edit + Thu, 26 Jul 2001 19:16:49 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -1332,6 +1313,7 @@ Very High GtkEntry city True + True True True 0 diff --git a/src/editnote.glade b/src/editnote.glade index cd96baa61..e421089e2 100644 --- a/src/editnote.glade +++ b/src/editnote.glade @@ -13,7 +13,7 @@ - GtkDialog + GnomeDialog editnote Gramps - Edit Note GTK_WINDOW_TOPLEVEL @@ -22,21 +22,31 @@ True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox1 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area1 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -45,49 +55,31 @@ - GtkHButtonBox - hbuttonbox18 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button99 + True + True + + clicked + on_save_note_clicked + editnote + Tue, 29 May 2001 15:06:53 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button99 - True - True - - clicked - on_save_note_clicked - editnote - Tue, 29 May 2001 15:06:53 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button100 - True - True - - clicked - destroy_passed_object - editnote - Tue, 29 May 2001 15:06:38 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button100 + True + True + + clicked + destroy_passed_object + editnote + Tue, 29 May 2001 15:06:38 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -148,6 +140,7 @@ GtkText notetext True + True True diff --git a/src/gramps.glade b/src/gramps.glade index ef8a0b676..7272b92e3 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -2429,7 +2429,7 @@ 10 Gramps - Select File GTK_WINDOW_DIALOG - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True False True @@ -2470,21 +2470,89 @@ - GtkWindow + GnomeDialog spouseDialog Gramps - Choose Spouse GTK_WINDOW_DIALOG - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True False True False + False + False GtkVBox + GnomeDialog:vbox vbox11 False 0 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox6 + GTK_BUTTONBOX_SPREAD + 0 + 0 + 0 + 0 + 0 + + 10 + False + True + GTK_PACK_END + + + + GtkButton + spouseNewPerson + True + True + True + + clicked + on_new_spouse_clicked + spouseDialog + Thu, 23 Aug 2001 21:21:10 GMT + + + + + + GtkButton + spouseExistingPerson + True + True + + clicked + on_select_spouse_clicked + spouseDialog + Thu, 23 Aug 2001 21:21:01 GMT + + + + + + GtkButton + button117 + True + True + + clicked + destroy_passed_object + spouseDialog + + GNOME_STOCK_BUTTON_CANCEL + + GtkLabel @@ -2659,6 +2727,13 @@ GtkEntry given True + True + + activate + on_given_activate + spouseDialog + Sat, 22 Sep 2001 04:20:27 GMT + True True 0 @@ -2683,6 +2758,12 @@ GtkEntry surname True + + activate + on_surname_activate + spouseDialog + Sat, 22 Sep 2001 04:20:48 GMT + True True 0 @@ -2775,61 +2856,6 @@ - - - GtkHButtonBox - hbuttonbox6 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 10 - False - True - - - - GtkButton - button36 - True - True - - clicked - on_new_spouse_clicked - spouseDialog - Thu, 23 Aug 2001 21:21:10 GMT - - - GTK_RELIEF_NORMAL - - - - GtkButton - button37 - True - True - - clicked - on_select_spouse_clicked - spouseDialog - Thu, 23 Aug 2001 21:21:01 GMT - - - GTK_RELIEF_NORMAL - - - - GtkButton - button117 - True - True - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - - @@ -2879,6 +2905,7 @@ GtkButton button42 True + True True clicked @@ -2975,6 +3002,7 @@ GtkEntry motherName True + True False True 0 @@ -3360,7 +3388,7 @@ Unknown selectChild Gramps - Add Child GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True False False @@ -3401,6 +3429,7 @@ Unknown GtkButton button48 True + True True clicked @@ -3728,7 +3757,7 @@ Unknown marriageQuery Gramps - Marriage Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True False False @@ -3769,6 +3798,7 @@ Unknown GtkButton button52 True + True True clicked @@ -3885,10 +3915,10 @@ Unknown sourceEditor Gramps - Source Editor GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False False - False + True False False False @@ -3926,6 +3956,7 @@ Unknown GtkButton button88 True + True True clicked @@ -4110,6 +4141,7 @@ Unknown GtkEntry source_title True + True True True 0 @@ -4338,22 +4370,30 @@ Unknown - GtkWindow + GnomeDialog sourceDisplay Gramps - Source Information GTK_WINDOW_DIALOG - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True False True False + False + False GtkVBox + GnomeDialog:vbox vbox27 2 False 8 + + 4 + True + True + GtkHButtonBox @@ -4376,6 +4416,7 @@ Unknown GtkButton button94 True + True True clicked @@ -4642,6 +4683,7 @@ Unknown GtkCombo:entry combo-entry1 True + True changed on_source_changed @@ -4892,81 +4934,74 @@ Unknown - GtkDialog + GnomeDialog addChild Gramps - Add New Child GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True - True + False True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox12 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area12 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 - False + True True GTK_PACK_END - GtkHButtonBox - hbuttonbox19 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button98 + True + True + True + + clicked + on_addchild_ok_clicked + addChild + Wed, 14 Feb 2001 02:53:44 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button98 - True - True - - clicked - on_addchild_ok_clicked - addChild - Wed, 14 Feb 2001 02:53:44 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button99 - True - True - - clicked - destroy_passed_object - addChild - Wed, 14 Feb 2001 02:53:18 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button99 + True + True + + clicked + destroy_passed_object + addChild + Wed, 14 Feb 2001 02:53:18 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -5352,30 +5387,40 @@ Unknown - GtkDialog + GnomeDialog place_query Gramps - Delete a currently used Place GTK_WINDOW_DIALOG - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE True True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox13 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area13 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -5384,49 +5429,31 @@ Unknown - GtkHButtonBox - hbuttonbox25 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + force_delete + True + True + + clicked + on_force_delete_clicked + place_query + Tue, 21 Aug 2001 15:30:46 GMT + + GNOME_STOCK_BUTTON_YES + - - GtkButton - force_delete - True - True - - clicked - on_force_delete_clicked - place_query - Tue, 21 Aug 2001 15:30:46 GMT - - GNOME_STOCK_BUTTON_YES - GTK_RELIEF_NORMAL - - - - GtkButton - button116 - True - True - - clicked - destroy_passed_object - place_query - Tue, 21 Aug 2001 15:33:25 GMT - - GNOME_STOCK_BUTTON_NO - GTK_RELIEF_NORMAL - + + GtkButton + button116 + True + True + + clicked + destroy_passed_object + place_query + Tue, 21 Aug 2001 15:33:25 GMT + + GNOME_STOCK_BUTTON_NO @@ -5513,7 +5540,7 @@ Unknown - GtkDialog + GnomeDialog find Gramps - Find person GTK_WINDOW_TOPLEVEL @@ -5524,21 +5551,31 @@ Unknown True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox14 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area14 - 10 - True - 5 + GTK_BUTTONBOX_SPREAD + 8 + 85 + 27 + 7 + 0 0 False @@ -5547,64 +5584,46 @@ Unknown - GtkHButtonBox - hbuttonbox26 - GTK_BUTTONBOX_END - 15 - 85 - 27 - 3 - 0 - - 0 - True - True - + GtkButton + prev + True + True + + clicked + on_prev_clicked + find + Wed, 05 Sep 2001 02:55:37 GMT + + GNOME_STOCK_BUTTON_PREV + - - GtkButton - prev - True - True - - clicked - on_prev_clicked - find - Wed, 05 Sep 2001 02:55:37 GMT - - GNOME_STOCK_BUTTON_PREV - GTK_RELIEF_NORMAL - + + GtkButton + next + True + True + True + + clicked + on_next_clicked + find + Wed, 05 Sep 2001 02:55:23 GMT + + GNOME_STOCK_BUTTON_NEXT + - - GtkButton - next - True - True - - clicked - on_next_clicked - find - Wed, 05 Sep 2001 02:55:23 GMT - - GNOME_STOCK_BUTTON_NEXT - GTK_RELIEF_NORMAL - - - - GtkButton - button120 - True - True - - clicked - destroy_passed_object - find - Wed, 05 Sep 2001 02:55:07 GMT - - GNOME_STOCK_BUTTON_CLOSE - GTK_RELIEF_NORMAL - + + GtkButton + button120 + True + True + + clicked + destroy_passed_object + find + Wed, 05 Sep 2001 02:55:07 GMT + + GNOME_STOCK_BUTTON_CLOSE diff --git a/src/gramps_main.py b/src/gramps_main.py index 21689d52b..ff92affbd 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -305,6 +305,10 @@ def on_add_sp_clicked(obj): top.set_data(GIVEN,dialog.get_widget("given")) top.set_data(SURNAME,dialog.get_widget("surname")) + # Typing CR selects 'Add Existing' button + top.editable_enters(dialog.get_widget("given")) + top.editable_enters(dialog.get_widget("surname")) + dialog.signal_autoconnect({ "on_spouseList_select_row" : on_spouse_list_select_row, "on_select_spouse_clicked" : on_select_spouse_clicked, @@ -532,6 +536,13 @@ def on_add_new_child_clicked(obj): new_child_win.get_widget("mrel").set_text(_("Birth")) new_child_win.get_widget("frel").set_text(_("Birth")) + # Typing CR selects OK button + window = new_child_win.get_widget("addChild") + window.editable_enters(new_child_win.get_widget("childGiven")) + window.editable_enters(new_child_win.get_widget("childSurname")) + window.editable_enters(new_child_win.get_widget("mrel")) + window.editable_enters(new_child_win.get_widget("frel")) + #------------------------------------------------------------------------- # # diff --git a/src/imagesel.glade b/src/imagesel.glade index fe4ac61cb..f4009f960 100644 --- a/src/imagesel.glade +++ b/src/imagesel.glade @@ -2,8 +2,8 @@ - Marriage - marriage + Gramps + gramps src @@ -16,8 +16,8 @@ GnomeDialog imageSelect Gramps - Select a picture - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WINDOW_DIALOG + GTK_WIN_POS_NONE False 400 False @@ -59,6 +59,7 @@ GtkButton button79 True + True True clicked @@ -330,6 +331,7 @@ GnomeEntry:entry fname True + True changed on_name_changed @@ -342,6 +344,7 @@ + @@ -350,6 +353,7 @@ GnomeDialog dialog1 + Gramps - Change image description GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -392,6 +396,7 @@ GtkButton button82 True + True True clicked @@ -484,6 +489,7 @@ text 300 True + True True True 0 diff --git a/src/latin_ansel.py b/src/latin_ansel.py index d779738e8..4f2748948 100644 --- a/src/latin_ansel.py +++ b/src/latin_ansel.py @@ -20,6 +20,8 @@ import cStringIO +ANSEL_ERROR = "ANSEL Error" + _s1 = { 0xEA : { ord('A') : 0xC5, ord('a') : 0xE5 }, 0xE8 : { ord('A') : 0xC4, ord('E') : 0xCB, ord('I') : 0xCF, ord('O') : 0xD6, @@ -79,8 +81,6 @@ def ansel_to_latin(s): try: head,s = ansel_to_code(s) except Exception: - from traceback import print_exc - print_exc() head = s[0] s = s[1:0] buff.write(head) diff --git a/src/marriage.glade b/src/marriage.glade index 6a383b14d..bf9bb3c67 100644 --- a/src/marriage.glade +++ b/src/marriage.glade @@ -13,7 +13,7 @@ - GtkDialog + GnomeDialog marriageEditor delete_event @@ -27,21 +27,32 @@ True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox6 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area6 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -50,49 +61,32 @@ - GtkHButtonBox - hbuttonbox22 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button107 + True + True + True + + clicked + on_close_marriage_editor + marriageEditor + Tue, 31 Jul 2001 15:50:12 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button107 - True - True - - clicked - on_close_marriage_editor - marriageEditor - Tue, 31 Jul 2001 15:50:12 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button108 - True - True - - clicked - destroy_passed_object - marriageEditor - Tue, 31 Jul 2001 15:49:42 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button108 + True + True + + clicked + destroy_passed_object + marriageEditor + Tue, 31 Jul 2001 15:49:42 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -182,6 +176,7 @@ GtkCombo:entry combo-entry1 True + True True True 0 diff --git a/src/places.glade b/src/places.glade index 26cd36a5d..129541ea3 100644 --- a/src/places.glade +++ b/src/places.glade @@ -15,30 +15,40 @@ - GtkDialog + GnomeDialog placeEditor Gramps - Place Editor - GTK_WINDOW_TOPLEVEL + GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox12 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area12 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -47,49 +57,32 @@ - GtkHButtonBox - hbuttonbox25 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button126 + True + True + True + + clicked + on_apply_clicked + placeEditor + Sat, 18 Aug 2001 17:26:41 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button126 - True - True - - clicked - on_apply_clicked - placeEditor - Sat, 18 Aug 2001 17:26:41 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button127 - True - True - - clicked - destroy_passed_object - placeEditor - Thu, 18 Jan 2001 02:52:48 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button127 + True + True + + clicked + destroy_passed_object + placeEditor + Thu, 18 Jan 2001 02:52:48 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -130,9 +123,9 @@ GtkHSeparator hseparator13 - 0 - True - True + 5 + False + False @@ -406,6 +399,7 @@ GtkEntry place_title True + True True True 0 diff --git a/src/plugins.glade b/src/plugins.glade index facd191c9..2dbf5e309 100644 --- a/src/plugins.glade +++ b/src/plugins.glade @@ -13,7 +13,7 @@ - GtkWindow + GnomeDialog pluginsel Gramps - Plugin Selection GTK_WINDOW_DIALOG @@ -22,13 +22,80 @@ False True False + False + False GtkVBox + GnomeDialog:vbox vbox33 - 10 False 0 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox20 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button101 + True + True + + clicked + on_ok_clicked + pluginsel + Sun, 11 Mar 2001 22:54:53 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button102 + True + True + + clicked + on_apply_clicked + pluginsel + Sun, 11 Mar 2001 22:54:34 GMT + + GNOME_STOCK_BUTTON_APPLY + + + + GtkButton + button103 + True + True + + clicked + destroy_passed_object + pluginsel + Sun, 11 Mar 2001 22:54:19 GMT + + GNOME_STOCK_BUTTON_CANCEL + + GtkHPaned @@ -158,79 +225,11 @@ - - - GtkHSeparator - hseparator17 - - 4 - False - True - - - - - GtkHButtonBox - hbuttonbox20 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - False - True - - - - GtkButton - button101 - True - True - - clicked - on_ok_clicked - pluginsel - Sun, 11 Mar 2001 22:54:53 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button102 - True - True - - clicked - on_apply_clicked - pluginsel - Sun, 11 Mar 2001 22:54:34 GMT - - GNOME_STOCK_BUTTON_APPLY - - - - GtkButton - button103 - True - True - - clicked - destroy_passed_object - pluginsel - Sun, 11 Mar 2001 22:54:19 GMT - - GNOME_STOCK_BUTTON_CANCEL - - - GtkWindow + GnomeDialog report Gramps - Report Selection GTK_WINDOW_DIALOG @@ -239,13 +238,80 @@ False True False + False + False GtkVBox + GnomeDialog:vbox vbox35 - 10 False 0 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox21 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button104 + True + True + + clicked + on_report_ok_clicked + report + Thu, 22 Mar 2001 21:28:02 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button105 + True + True + + clicked + on_report_apply_clicked + report + Thu, 22 Mar 2001 21:28:11 GMT + + GNOME_STOCK_BUTTON_APPLY + + + + GtkButton + button106 + True + True + + clicked + destroy_passed_object + report + Sun, 11 Mar 2001 22:54:19 GMT + + GNOME_STOCK_BUTTON_CANCEL + + GtkHPaned @@ -375,74 +441,6 @@ - - - GtkHSeparator - hseparator20 - - 4 - False - True - - - - - GtkHButtonBox - hbuttonbox21 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - False - True - - - - GtkButton - button104 - True - True - - clicked - on_report_ok_clicked - report - Thu, 22 Mar 2001 21:28:02 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button105 - True - True - - clicked - on_report_apply_clicked - report - Thu, 22 Mar 2001 21:28:11 GMT - - GNOME_STOCK_BUTTON_APPLY - - - - GtkButton - button106 - True - True - - clicked - destroy_passed_object - report - Sun, 11 Mar 2001 22:54:19 GMT - - GNOME_STOCK_BUTTON_CANCEL - - diff --git a/src/plugins/Merge.py b/src/plugins/Merge.py index 12ea76887..545d1fcfa 100644 --- a/src/plugins/Merge.py +++ b/src/plugins/Merge.py @@ -772,8 +772,17 @@ class Merge: # # #--------------------------------------------------------------------- - def place_match(self,name1,name2): + def place_match(self,p1,p2): + if p1 == None: + name1 = "" + else: + name1 = p1.get_title() + if p2 == None: + name2 = "" + else: + name2 = p2.get_title() + if name1 == "" or name2 == "": return 0 if name1 == name2: diff --git a/src/styles.glade b/src/styles.glade index 232f5cc90..3bda6999c 100644 --- a/src/styles.glade +++ b/src/styles.glade @@ -16,7 +16,7 @@ - GtkDialog + GnomeDialog styles Gramps - Document Styles GTK_WINDOW_TOPLEVEL @@ -25,23 +25,33 @@ True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox1 300 250 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area1 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -50,49 +60,32 @@ - GtkHButtonBox - hbuttonbox1 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button1 + True + True + True + + clicked + on_ok_clicked + styles + Tue, 05 Jun 2001 13:12:07 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button1 - True - True - - clicked - on_ok_clicked - styles - Tue, 05 Jun 2001 13:12:07 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button2 - True - True - - clicked - destroy_passed_object - styles - Tue, 05 Jun 2001 13:11:44 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button2 + True + True + + clicked + destroy_passed_object + styles + Tue, 05 Jun 2001 13:11:44 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -261,7 +254,7 @@ - GtkDialog + GnomeDialog editor Gramps - Style Editor GTK_WINDOW_TOPLEVEL @@ -270,22 +263,32 @@ True True False + False + False GtkVBox - Dialog:vbox + GnomeDialog:vbox dialog-vbox2 600 False 0 + + 4 + True + True + - GtkHBox - Dialog:action_area + GtkHButtonBox + GnomeDialog:action_area dialog-action_area2 - 10 - True - 5 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 0 False @@ -294,49 +297,32 @@ - GtkHButtonBox - hbuttonbox2 - GTK_BUTTONBOX_END - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - + GtkButton + button7 + True + True + True + + clicked + on_save_style_clicked + editor + Tue, 05 Jun 2001 18:48:01 GMT + + GNOME_STOCK_BUTTON_OK + - - GtkButton - button7 - True - True - - clicked - on_save_style_clicked - editor - Tue, 05 Jun 2001 18:48:01 GMT - - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button8 - True - True - - clicked - destroy_passed_object - editor - Tue, 05 Jun 2001 18:47:41 GMT - - GNOME_STOCK_BUTTON_CANCEL - GTK_RELIEF_NORMAL - + + GtkButton + button8 + True + True + + clicked + destroy_passed_object + editor + Tue, 05 Jun 2001 18:47:41 GMT + + GNOME_STOCK_BUTTON_CANCEL @@ -410,6 +396,7 @@ GtkEntry style_name True + True True True 0