diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 86a11ce9a..f4d309772 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -10,6 +10,12 @@ * src/po/de.po: Change Priesterweihe to Ordination. * src/plugins/FamilyGroup.py: Translation corrections. + * src/EditPerson.py: Rename photo into media. + * src/EditPlace.py: Rename photo into media. + * src/EditSource.py: Rename photo into media. + * src/ImageSelect.py: Rename photo into media. + * src/Marriage.py: Rename photo into media. + 2004-02-21 Alex Roitman * src/ImageSelect.py: Corrections. * src/RelLib.py: Corrections. diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 392e6157a..a819507c8 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -355,8 +355,8 @@ class EditPerson: "on_add_aka_clicked" : self.on_add_aka_clicked, "on_add_attr_clicked" : self.on_add_attr_clicked, "on_add_url_clicked" : self.on_add_url_clicked, - "on_addphoto_clicked" : self.gallery.on_add_photo_clicked, - "on_selectphoto_clicked" : self.gallery.on_select_photo_clicked, + "on_addphoto_clicked" : self.gallery.on_add_media_clicked, + "on_selectphoto_clicked" : self.gallery.on_select_media_clicked, "on_aka_delete_clicked" : self.on_aka_delete_clicked, "on_aka_update_clicked" : self.on_aka_update_clicked, "on_apply_person_clicked" : self.on_apply_person_clicked, @@ -366,9 +366,9 @@ class EditPerson: "on_delete_attr_clicked" : self.on_delete_attr_clicked, "on_delete_event" : self.on_delete_event, "on_delete_url_clicked" : self.on_delete_url_clicked, - "on_deletephoto_clicked" : self.gallery.on_delete_photo_clicked, + "on_deletephoto_clicked" : self.gallery.on_delete_media_clicked, "on_edit_properties_clicked": self.gallery.popup_change_description, - "on_editphoto_clicked" : self.gallery.on_edit_photo_clicked, + "on_editphoto_clicked" : self.gallery.on_edit_media_clicked, "on_editperson_switch_page" : self.on_switch_page, "on_event_add_clicked" : self.on_event_add_clicked, "on_event_delete_clicked" : self.on_event_delete_clicked, diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index 8cbefe339..751b6346f 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -168,10 +168,10 @@ class EditPlace: self.top_window.signal_autoconnect({ "on_switch_page" : self.on_switch_page, - "on_addphoto_clicked" : self.glry.on_add_media_object_clicked, - "on_selectphoto_clicked" : self.glry.on_select_photo_clicked, - "on_deletephoto_clicked" : self.glry.on_delete_photo_clicked, - "on_edit_photo_clicked" : self.glry.on_edit_photo_clicked, + "on_addphoto_clicked" : self.glry.on_add_media_clicked, + "on_selectphoto_clicked" : self.glry.on_select_media_clicked, + "on_deletephoto_clicked" : self.glry.on_delete_media_clicked, + "on_edit_photo_clicked" : self.glry.on_edit_media_clicked, "on_edit_properties_clicked": self.glry.popup_change_description, "on_add_url_clicked" : self.on_add_url_clicked, "on_delete_url_clicked" : self.on_delete_url_clicked, diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index 7c5064224..551dd0099 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -101,10 +101,10 @@ class EditSource: self.top_window.signal_autoconnect({ "on_switch_page" : self.on_switch_page, - "on_addphoto_clicked" : self.gallery.on_add_media_object_clicked, - "on_selectphoto_clicked" : self.gallery.on_select_photo_clicked, - "on_deletephoto_clicked" : self.gallery.on_delete_photo_clicked, - "on_editphoto_clicked" : self.gallery.on_edit_photo_clicked, + "on_addphoto_clicked" : self.gallery.on_add_media_clicked, + "on_selectphoto_clicked" : self.gallery.on_select_media_clicked, + "on_deletephoto_clicked" : self.gallery.on_delete_media_clicked, + "on_editphoto_clicked" : self.gallery.on_edit_media_clicked, "on_edit_properties_clicked": self.gallery.popup_change_description, "on_sourceEditor_help_clicked" : self.on_help_clicked, "on_sourceEditor_ok_clicked" : self.on_source_apply_clicked, diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index 892636265..b66026e8a 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -563,12 +563,12 @@ class Gallery(ImageSelect): selection_data.set(selection_data.target, 8, id[4]) self.drag_item = None - def on_add_photo_clicked(self, obj): + def on_add_media_clicked(self, obj): """User wants to add a new photo. Create a dialog to find out which photo they want.""" self.create_add_dialog() - def on_select_photo_clicked(self,obj): + def on_select_media_clicked(self,obj): """User wants to add a new object that is already in a database. Create a dialog to find out which object they want.""" @@ -584,7 +584,7 @@ class Gallery(ImageSelect): self.parent.lists_changed = 1 self.load_images() - def on_delete_photo_clicked(self, obj): + def on_delete_media_clicked(self, obj): """User wants to delete a new photo. Remove it from the displayed thumbnails, and remove it from the dataobj photo list.""" @@ -601,7 +601,7 @@ class Gallery(ImageSelect): self.parent.lists_changed = 1 self.load_images() - def on_edit_photo_clicked(self, obj): + def on_edit_media_clicked(self, obj): """User wants to delete a new photo. Remove it from the displayed thumbnails, and remove it from the dataobj photo list.""" diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index d9c1526e4..538bd1fe3 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -106,14 +106,14 @@ class Marriage: "on_attr_down_clicked" : self.on_attr_down_clicked, "on_add_attr_clicked" : self.on_add_attr_clicked, "on_delete_attr_clicked" : self.on_delete_attr_clicked, - "on_addphoto_clicked" : self.gallery.on_add_media_object_clicked, - "on_selectphoto_clicked" : self.gallery.on_select_photo_clicked, + "on_addphoto_clicked" : self.gallery.on_add_media_clicked, + "on_selectphoto_clicked" : self.gallery.on_select_media_clicked, "on_close_marriage_editor" : self.on_close_marriage_editor, "on_delete_event" : self.on_delete_event, "on_lds_src_clicked" : self.lds_src_clicked, "on_lds_note_clicked" : self.lds_note_clicked, - "on_deletephoto_clicked" : self.gallery.on_delete_photo_clicked, - "on_edit_photo_clicked" : self.gallery.on_edit_photo_clicked, + "on_deletephoto_clicked" : self.gallery.on_delete_media_clicked, + "on_edit_photo_clicked" : self.gallery.on_edit_media_clicked, "on_edit_properties_clicked": self.gallery.popup_change_description, "on_marriageAddBtn_clicked" : self.on_add_clicked, "on_event_update_clicked" : self.on_event_update_clicked,