diff --git a/ChangeLog b/ChangeLog index cb635ca4c..f2e34cb8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Don Allingham + * src/DataViews/_PersonView.py: remove dead code + * src/GrampsDb/_ReadGedcom.py: handle Legacy _PREF + * src/DisplayModels/_PeopleModel.py: speed improvement on name + 2006-10-21 Alex Roitman * src/data/tips.xml.in (tip67): Escape angle bracket. diff --git a/TODO b/TODO index 7796fcc6e..42328ae9d 100644 --- a/TODO +++ b/TODO @@ -13,12 +13,9 @@ * Add autofill feature for City, Church parish, County, State and Country? * Move LDS temple info out of const.py and into an XML file * Enhanced web page generator -* GEDCOM 6.0 import/export -* View all sources related to a particular object * Make the descendant graph adapt to the page size, not stuck with the current 3 entries per page. * Add slideshow generation ability to web page generator -* Enhance privacy handling * Add parameter definition of Filter Rules to the filter itself, so it can be removed from the filter editor and used by PeopleView. * And a whole lot more.... diff --git a/help/C/figures/bookreport.png b/help/C/figures/bookreport.png index 5709f71b7..cacb20cd2 100644 Binary files a/help/C/figures/bookreport.png and b/help/C/figures/bookreport.png differ diff --git a/help/C/figures/cfe-ar.png b/help/C/figures/cfe-ar.png index aaae11db4..e44c8ac99 100644 Binary files a/help/C/figures/cfe-ar.png and b/help/C/figures/cfe-ar.png differ diff --git a/help/C/figures/cfe-df.png b/help/C/figures/cfe-df.png index 3dd45d74d..d8cc1f89a 100644 Binary files a/help/C/figures/cfe-df.png and b/help/C/figures/cfe-df.png differ diff --git a/help/C/figures/comp-people.png b/help/C/figures/comp-people.png index 93dd197c0..f8a57dc3c 100644 Binary files a/help/C/figures/comp-people.png and b/help/C/figures/comp-people.png differ diff --git a/help/C/figures/edit-bm.png b/help/C/figures/edit-bm.png index 5963f0297..c13e9826d 100644 Binary files a/help/C/figures/edit-bm.png and b/help/C/figures/edit-bm.png differ diff --git a/help/C/figures/find-people.png b/help/C/figures/find-people.png index 91c842096..259a4c065 100644 Binary files a/help/C/figures/find-people.png and b/help/C/figures/find-people.png differ diff --git a/help/C/figures/merge-people.png b/help/C/figures/merge-people.png index 8bde127a9..9906bae8b 100644 Binary files a/help/C/figures/merge-people.png and b/help/C/figures/merge-people.png differ diff --git a/help/C/figures/merge-plc.png b/help/C/figures/merge-plc.png index 2e4739f65..320d57d45 100644 Binary files a/help/C/figures/merge-plc.png and b/help/C/figures/merge-plc.png differ diff --git a/help/C/figures/merge-src.png b/help/C/figures/merge-src.png index 566acf6ae..364505446 100644 Binary files a/help/C/figures/merge-src.png and b/help/C/figures/merge-src.png differ diff --git a/help/C/figures/prefs.png b/help/C/figures/prefs.png index 3079ebbd1..302d7d7e2 100644 Binary files a/help/C/figures/prefs.png and b/help/C/figures/prefs.png differ diff --git a/help/C/figures/scratch-pad.png b/help/C/figures/scratch-pad.png index f0a156e86..8d2c63d34 100644 Binary files a/help/C/figures/scratch-pad.png and b/help/C/figures/scratch-pad.png differ diff --git a/help/C/gramps.xml b/help/C/gramps.xml index 05209f2f5..a21561950 100644 --- a/help/C/gramps.xml +++ b/help/C/gramps.xml @@ -479,11 +479,12 @@ Tip of the day - - Displays the "Tip of the day" dialog. - + + Displays the "Tip of the day" dialog. + + Plugin status @@ -526,7 +527,7 @@ This item displays a dialog with general information about - the GRAMPS version you are running. + the GRAMPS version you are running. @@ -4452,8 +4453,7 @@ - @@ -4506,9 +4506,8 @@ - + @@ -4560,8 +4559,8 @@ - + @@ -4601,8 +4600,8 @@ - + @@ -4857,8 +4856,8 @@ - + @@ -4891,8 +4890,8 @@ - + @@ -5088,8 +5087,8 @@ - + @@ -6002,8 +6001,8 @@ - + @@ -6044,8 +6043,8 @@ - + @@ -6108,8 +6107,8 @@ - + @@ -6229,7 +6228,7 @@ - + @@ -8401,75 +8400,277 @@ The somewhat incomplete list of contributors includes (in alphabetical order): -Tim Allen -Larry Allingham -Jens Arvidsson -Kees Bakker -Marcos Bedinelli -Wayne Bergeron -Stefan Bjork -Douglas S. Blank -Radu Bogdan Mare -Alexander Bogdashevsky -Richard Bos -Matt Brubeck -Nathan Bullock -Lorenzo Cappelletti -Pier Luigi Cinquantini -Bruce J. DeGrasse -Daniel Durand -Alexandre Duret-Lutz -Billy C. Earney -Baruch Even -Bernd Felsche -Egyeki Gergely -Michel Guitel -Steve Hall -David R. Hampton -Martin Hawlisch -Anton Huber -Frode Jemtland -Mark Knoop -Greg Kuperberg -Arkadiusz Lipiec -Lars Kr. Lundin -Radek Malcic -Benny Malengier -Leonid Mamtchenkov -Brian Matherly -Tino Meinen -Serge Noiraud -Frederick Noronha -Jeffrey C. Ollie -Jiri Pejchal -Donald A. Peterson -Guillaume Pratte -Alexandre Prokoudine -Laurent Protois -Matthieu Pupat -Jérôme Rapinat -Trevor Rhodes -Alexander Roitman -Soren Roug -Jason Salaz -Julio Sanchez -Bernd Schandl -Martin Senftleben -Yaakov Selkowitz -Gary Shao -Arturas Sleinius -Jim Smart -Steve Swales -Eero Tamminen -Samuel Tardieu -Richard Taylor -James Treacy -Lubo Vasko -Sebastian Voecking -Xing Wang -Tim Waugh -Jesper Zedlitz + + Tim Allen + + + Larry Allingham + + + + Jens Arvidsson + + + + Kees Bakker + + + + Marcos Bedinelli + + + + Wayne Bergeron + + + + Stefan Bjork + + + + Douglas S. Blank + + + + Radu Bogdan Mare + + + + Alexander Bogdashevsky + + + + Richard Bos + + + + Matt Brubeck + + + + Nathan Bullock + + + + Lorenzo Cappelletti + + + + Pier Luigi Cinquantini + + + + Bruce J. DeGrasse + + + + Daniel Durand + + + + Alexandre Duret-Lutz + + + + Billy C. Earney + + + + Baruch Even + + + + Bernd Felsche + + + + Egyeki Gergely + + + + Michel Guitel + + + + Steve Hall + + + + David R. Hampton + + + + Martin Hawlisch + + + + Anton Huber + + + + Frode Jemtland + + + + Mark Knoop + + + + Greg Kuperberg + + + + Arkadiusz Lipiec + + + + Lars Kr. Lundin + + + + Radek Malcic + + + + Benny Malengier + + + + Leonid Mamtchenkov + + + + Brian Matherly + + + + Tino Meinen + + + + Serge Noiraud + + + + Frederick Noronha + + + + Jeffrey C. Ollie + + + + Jiri Pejchal + + + + Donald A. Peterson + + + + Guillaume Pratte + + + + Alexandre Prokoudine + + + + Laurent Protois + + + + Matthieu Pupat + + + + Jérôme Rapinat + + + + Trevor Rhodes + + + + Alexander Roitman + + + + Soren Roug + + + + Jason Salaz + + + + Julio Sanchez + + + + Bernd Schandl + + + + Martin Senftleben + + + + Yaakov Selkowitz + + + + Gary Shao + + + + Arturas Sleinius + + + + Jim Smart + + + + Steve Swales + + + + Eero Tamminen + + + + Samuel Tardieu + + + + Richard Taylor + + + + James Treacy + + + + Lubo Vasko + + + + Sebastian Voecking + + + + Xing Wang + + + + Tim Waugh + + + + Jesper Zedlitz + If you know of somebody else who should be listed here, please let us know. diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index 317268c27..98bdcd3d4 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -85,7 +85,6 @@ class PersonView(PageView.PersonNavView): self.inactive = False dbstate.connect('database-changed',self.change_db) - #dbstate.connect('active-changed',self.goto_active_person) self.handle_col = PeopleModel.COLUMN_INT_ID self.model = None self.generic_filter = None @@ -574,7 +573,6 @@ class PersonView(PageView.PersonNavView): person = self.active_person self.remove_from_person_list(person) - #self.remove_from_history(handle) self.dbstate.db.remove_person(handle, trans) self.uistate.phistory.back() @@ -593,8 +591,6 @@ class PersonView(PageView.PersonNavView): column = gtk.TreeViewColumn(_('Name'), self.renderer,text=0) column.set_resizable(True) - #column.set_clickable(True) - #column.connect('clicked',self.sort_clicked) column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) column.set_fixed_width(225) self.tree.append_column(column) diff --git a/src/DisplayModels/_PeopleModel.py b/src/DisplayModels/_PeopleModel.py index ee0116363..0d54b5980 100644 --- a/src/DisplayModels/_PeopleModel.py +++ b/src/DisplayModels/_PeopleModel.py @@ -411,9 +411,7 @@ class PeopleModel(gtk.GenericTreeModel): return spouses_names def column_name(self, data, node): - n = Name() - n.unserialize(data[PeopleModel._NAME_COL]) - return NameDisplay.displayer.sorted_name(n) + return NameDisplay.displayer.raw_sorted_name(data[PeopleModel._NAME_COL]) def column_id(self, data, node): return data[PeopleModel._ID_COL] diff --git a/src/GrampsDb/_ReadGedcom.py b/src/GrampsDb/_ReadGedcom.py index 1cb065e15..fff5ed706 100644 --- a/src/GrampsDb/_ReadGedcom.py +++ b/src/GrampsDb/_ReadGedcom.py @@ -1261,7 +1261,7 @@ class GedcomParser(UpdateCallback): def parse_ftw_relations(self,level): mrel = RelLib.ChildRefType() frel = RelLib.ChildRefType() - + while True: matches = self.get_next() if self.level_is_finished(matches, level): @@ -1275,12 +1275,12 @@ class GedcomParser(UpdateCallback): elif matches[1] == TOKEN_ADOP: mrel = _TYPE_ADOPT frel = _TYPE_ADOPT - # Legacy + # Legacy elif matches[1] == TOKEN__STAT: mrel = _TYPE_BIRTH frel = _TYPE_BIRTH - # Legacy _PREF - elif matches[1] and matches[1][0] == TOKEN_UNKNOWN: + # Legacy _PREF + elif matches[1] and matches[1] == TOKEN__PRIMARY: pass else: self.not_recognized(level+1)