diff --git a/src/QuickReports.py b/src/QuickReports.py index 622396f26..4f6e6a8d7 100644 --- a/src/QuickReports.py +++ b/src/QuickReports.py @@ -3,6 +3,7 @@ # # Copyright (C) 2007 B. Malengier # Copyright (C) 2008 Brian G. Matherly +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/ScratchPad.py b/src/ScratchPad.py index 7d51536b2..49c1f11c6 100644 --- a/src/ScratchPad.py +++ b/src/ScratchPad.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2000-2007 Donald N. Allingham +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modiy # it under the terms of the GNU General Public License as published by @@ -142,15 +143,6 @@ def obj2target(target): } return d[target] if target in d else None -# FIXME: CITATION: Dropping a citation onto an embedded tab should open -# CitationEdit. However, note should behave similarly, and although there is -# code to call EditNote, EditNote does not appear to be called. I don't -# understand how to get the editor called. - -# FIXME: CITATION: It should be possible to drop a source onto an embedded tab, -# with CitationEdit being opened, However, It is not possible to do the drop, -# and as described above I do not understand how to get the editor called. - def model_contains(model, data): """ Returns True if data is a row in model. diff --git a/src/Simple/_SimpleAccess.py b/src/Simple/_SimpleAccess.py index 9fccc8fed..572dc8a85 100644 --- a/src/Simple/_SimpleAccess.py +++ b/src/Simple/_SimpleAccess.py @@ -3,6 +3,7 @@ # # Copyright (C) 2007 Donald N. Allingham # Copyright (C) 2010 Jakim Friant +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/Simple/_SimpleTable.py b/src/Simple/_SimpleTable.py index aeb744223..d6d93c615 100644 --- a/src/Simple/_SimpleTable.py +++ b/src/Simple/_SimpleTable.py @@ -3,6 +3,7 @@ # # Copyright (C) 2008 Donald N. Allingham # Copyright (C) 2009 Douglas S. Blank +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/gen/lib/mediaref.py b/src/gen/lib/mediaref.py index 9f6e2b44a..d7d6b6aae 100644 --- a/src/gen/lib/mediaref.py +++ b/src/gen/lib/mediaref.py @@ -89,7 +89,7 @@ class MediaRef(SecondaryObject, PrivacyBase, CitationBase, NoteBase, RefBase, :returns: Returns the list of child objects that may carry textual data. :rtype: list """ - return self.attribute_list # + self.source_list + return self.attribute_list def get_citation_child_list(self): """ diff --git a/src/gen/plug/__init__.py b/src/gen/plug/__init__.py index 785dc4c3e..2975fd97f 100644 --- a/src/gen/plug/__init__.py +++ b/src/gen/plug/__init__.py @@ -3,6 +3,7 @@ # # Copyright (C) 2008 Brian G. Matherly # Copyright (C) 2010 Jakim Friant +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/gen/plug/_pluginreg.py b/src/gen/plug/_pluginreg.py index a53de80ee..a3b30f737 100644 --- a/src/gen/plug/_pluginreg.py +++ b/src/gen/plug/_pluginreg.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2009 Benny Malengier +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/gui/editors/editcitation.py b/src/gui/editors/editcitation.py index 15f6947b0..3f297f8ef 100644 --- a/src/gui/editors/editcitation.py +++ b/src/gui/editors/editcitation.py @@ -381,6 +381,9 @@ class EditCitation(EditPrimary): def save(self, *obj): """Save the data.""" self.ok_button.set_sensitive(False) + # FIXME: CITATION: It should be possible to save a citation even when + # there is no data in it. On the other hand, it should not be possible + # to save a source that has no data. if self.object_is_empty(): ErrorDialog(_("Cannot save citation"), _("No data exists for this citation. Please " @@ -388,6 +391,8 @@ class EditCitation(EditPrimary): self.ok_button.set_sensitive(True) return + # FIXME: CITATION: Not only citations, but also sources should be + # checked for duplicate Gramps IDs. (uses_dupe_id, gramps_id) = self._uses_duplicate_id() if uses_dupe_id: prim_object = self.get_from_gramps_id(gramps_id) @@ -439,7 +444,8 @@ class EditCitation(EditPrimary): entered date when importing from a XML file, so we can get an incorrect fail. """ - + # FIXME: CITATION: This should check whether either the citation data or + # the source data has changed. if self.db.readonly: return False elif self.obj.handle: diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py index e967f2225..8cfa71d2a 100644 --- a/src/plugins/export/ExportGedcom.py +++ b/src/plugins/export/ExportGedcom.py @@ -7,6 +7,7 @@ # Copyright (C) 2008 Robert Cheramy # Copyright (C) 2010 Jakim Friant # Copyright (C) 2010 Nick Hall +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/plugins/gramplet/QuickViewGramplet.py b/src/plugins/gramplet/QuickViewGramplet.py index 6187d771b..d1957accf 100644 --- a/src/plugins/gramplet/QuickViewGramplet.py +++ b/src/plugins/gramplet/QuickViewGramplet.py @@ -1,6 +1,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2007-2009 Douglas S. Blank +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py index 3f213e349..12cd23011 100644 --- a/src/plugins/import/ImportGedcom.py +++ b/src/plugins/import/ImportGedcom.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2000-2006 Donald N. Allingham +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/plugins/quickview/References.py b/src/plugins/quickview/References.py index 33fce1287..52d983517 100644 --- a/src/plugins/quickview/References.py +++ b/src/plugins/quickview/References.py @@ -3,6 +3,7 @@ # # Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2007-2008 Brian G. Matherly +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/plugins/quickview/quickview.gpr.py b/src/plugins/quickview/quickview.gpr.py index c5bdbfe52..0dc12dd87 100644 --- a/src/plugins/quickview/quickview.gpr.py +++ b/src/plugins/quickview/quickview.gpr.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2009 Benny Malengier +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/plugins/tool/Check.py b/src/plugins/tool/Check.py index 27a8a8b74..1d496224a 100644 --- a/src/plugins/tool/Check.py +++ b/src/plugins/tool/Check.py @@ -4,6 +4,7 @@ # Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2008 Brian G. Matherly # Copyright (C) 2010 Jakim Friant +# Copyright (C) 2011 Tim G Lyons # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by