From 76cce7e656f5ed1194feea508f66acffba23e601 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 9 Sep 2006 17:10:13 +0000 Subject: [PATCH] 2006-09-09 Don Allingham * src/GrampsDb/_ReadXML.py: remove commented out code * src/Editors/_EditEvent.py: handle overwriting of date text * src/RelLib/_DateBase.py: allow optional dropping of date text on serialization * src/RelLib/_Date.py: allow optional dropping of date text on serialization * src/RelLib/_Event.py: allow optional dropping of date text on serialization svn: r7306 --- ChangeLog | 10 ++++ help/C/figures/select-person.png | Bin 30384 -> 22023 bytes help/C/gramps-manual.xml | 81 ++++++++----------------------- src/Editors/_EditEvent.py | 24 +++++++++ src/GrampsDb/_ReadXML.py | 5 -- src/RelLib/_Date.py | 9 +++- src/RelLib/_DateBase.py | 4 +- src/RelLib/_Event.py | 4 +- 8 files changed, 64 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad6ed202f..14afde107 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-09-09 Don Allingham + * src/GrampsDb/_ReadXML.py: remove commented out code + * src/Editors/_EditEvent.py: handle overwriting of date text + * src/RelLib/_DateBase.py: allow optional dropping of date text on + serialization + * src/RelLib/_Date.py: allow optional dropping of date text on + serialization + * src/RelLib/_Event.py: allow optional dropping of date text on + serialization + 2006-09-05 Alex Roitman * src/plugins/Verify.py: Import Errors. diff --git a/help/C/figures/select-person.png b/help/C/figures/select-person.png index e4f4b0f54a2a7673354f52ee7c864cb81cfdfacc..04f8141e5bcce6a75013f8b485f20b40b9b9e11a 100644 GIT binary patch literal 22023 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 PWq9=9u~r4d=GDIee>(`B literal 30384 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 diff --git a/help/C/gramps-manual.xml b/help/C/gramps-manual.xml index 7335bdd00..d13be43ca 100644 --- a/help/C/gramps-manual.xml +++ b/help/C/gramps-manual.xml @@ -418,54 +418,6 @@ - - Running GRAMPS for the first time - - The first time you run the program, GRAMPS will display the - "Getting Started" dialogs. Follow the directions that guide you through - Researcher information and the LDS - extensions sections. You should find them to be - self-explanatory. - - - Dialog boxes - - We'll make frequent reference in this manual to dialogs. A - dialog is simply a pop-up window into which you can enter - information. - - - We recommend you enter your personal information when GRAMPS - prompts you for it. GRAMPS uses this information strictly so it can - create valid GEDCOM output files (which require information about the - files' creator). If you wish, you can choose not to supply this - information, but be aware that unless and until you do, any GEDCOM files - you export will not be valid. - -
- GRAMPS Getting Started Window: Researcher Information - - - - - - - - - Shows Researcher Information Window. - - - -
- - - Entering personal information - - This information can be entered at any time in the Preferences - dialog, under the Database/Researcher Information category. - -
- @@ -525,6 +477,22 @@ + + Tip of the day + + Displays the "Tip of the day" dialog. + + + + + Plugin status + + + Use this item to display the status of any plugins you may + have added. + + + GRAMPS home page @@ -554,22 +522,11 @@ - Show plugin status + About - Use this item to display the status of any plugins you may - have added. - - - - - Open example database - - - Select this item to load the example database that is - included in your GRAMPS package. This database is composed of - fictitious people and serves as a useful example for learning how - to work with GRAMPS. + This item displays a dialog with general information about + the GRAMPS version you are running. diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py index e864bc32b..054514e86 100644 --- a/src/Editors/_EditEvent.py +++ b/src/Editors/_EditEvent.py @@ -224,6 +224,30 @@ class EditEvent(EditPrimary): self.callback(self.obj) self.close() + def data_has_changed(self): + """ + A date comparison can fail incorrectly because we have made the + decision to store entered text in the date. However, there is no + entered date when importing from a XML file, so we can get an + incorrect fail. + """ + + if self.db.readonly: + return False + elif self.obj.handle: + orig = self.get_from_handle(self.obj.handle) + if orig: + cmp_obj = orig + else: + cmp_obj = self.empty_object() + return cmp(cmp_obj.serialize(True)[1:], + self.obj.serialize(True)[1:]) != 0 + else: + cmp_obj = self.empty_object() + return cmp(cmp_obj.serialize(True)[1:], + self.obj.serialize()[1:]) != 0 + + class EditPersonEvent(EditEvent): def __init__(self, event, dbstate, uistate, track=[], callback=None): diff --git a/src/GrampsDb/_ReadXML.py b/src/GrampsDb/_ReadXML.py index aae43a328..8d3fa8beb 100644 --- a/src/GrampsDb/_ReadXML.py +++ b/src/GrampsDb/_ReadXML.py @@ -162,11 +162,6 @@ def importData(database, filename, callback=None,cl=0,use_trans=False): ErrorDialog(_("Error reading %s") % filename, _("The file is probably either corrupt or not a valid GRAMPS database.")) return -# except: -# if cl: -# import traceback -# traceback.print_exc() -# os._exit(1) xml_file.close() diff --git a/src/RelLib/_Date.py b/src/RelLib/_Date.py index 66585e077..10ba70a0c 100644 --- a/src/RelLib/_Date.py +++ b/src/RelLib/_Date.py @@ -135,12 +135,17 @@ class Date: self.text = u"" self.sortval = 0 - def serialize(self): + def serialize(self, no_text_date=False): """ Convert to a series of tuples for data storage """ + if no_text_date: + text = u'' + else: + text = self.text + return (self.calendar, self.modifier, self.quality, - self.dateval, self.text, self.sortval) + self.dateval, text, self.sortval) def unserialize(self, data): """ diff --git a/src/RelLib/_DateBase.py b/src/RelLib/_DateBase.py index dd113bec6..43fcafa35 100644 --- a/src/RelLib/_DateBase.py +++ b/src/RelLib/_DateBase.py @@ -53,11 +53,11 @@ class DateBase: else: self.date = Date() - def serialize(self): + def serialize(self, no_text_date=False): if self.date == None or (self.date.is_empty() and not self.date.text): date = None else: - date = self.date.serialize() + date = self.date.serialize(no_text_date) return date def unserialize(self,data): diff --git a/src/RelLib/_Event.py b/src/RelLib/_Event.py index 314e177ea..892ff373e 100644 --- a/src/RelLib/_Event.py +++ b/src/RelLib/_Event.py @@ -76,7 +76,7 @@ class Event(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase, self.description = "" self.type = EventType() - def serialize(self): + def serialize(self, no_text_date = False): """ Converts the data held in the event to a Python tuple that represents all the data elements. This method is used to convert @@ -93,7 +93,7 @@ class Event(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase, @rtype: tuple """ return (self.handle, self.gramps_id, self.type.serialize(), - DateBase.serialize(self), + DateBase.serialize(self, no_text_date), self.description, self.place, SourceBase.serialize(self), NoteBase.serialize(self),