2006-10-22 Don Allingham <don@gramps-project.org>

* src/DataViews/_PersonView.py:  remove dead code
	* src/GrampsDb/_ReadGedcom.py: handle Legacy _PREF
	* src/DisplayModels/_PeopleModel.py: speed improvement on name



svn: r7424

gramps2/ChangeLog

@@ -1,3 +1,8 @@
+2006-10-22  Don Allingham  <don@gramps-project.org>
+	* 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  <shura@gramps-project.org>
 	* src/data/tips.xml.in (tip67): Escape angle bracket.
 

gramps2/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....

gramps2/help/C/gramps.xml

@@ -479,11 +479,12 @@
 
         <varlistentry>
           <term>Tip of the day</term>
-          <listitem>
-            <para>Displays the &quot;Tip of the day&quot; dialog.</para>
-          </listitem>
 
+          <listitem>
+            <para>Displays the "Tip of the day" dialog.</para>
+          </listitem>
         </varlistentry>
+
         <varlistentry>
           <term>Plugin status</term>
 
@@ -526,7 +527,7 @@
 
           <listitem>
             <para>This item displays a dialog with general information about
-	    the GRAMPS version you are running.</para>
+            the GRAMPS version you are running.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -4452,8 +4453,7 @@
                   <screenshot>
                     <mediaobject>
                       <imageobject>
-                        <imagedata depth="469"
+                        <imagedata depth="" fileref="figures/comp-people.png"
-                                   fileref="figures/comp-people.png"
                                    format="PNG" width="500" />
                       </imageobject>
 
@@ -4506,9 +4506,8 @@
                   <screenshot>
                     <mediaobject>
                       <imageobject>
-                        <imagedata depth="245"
+                        <imagedata depth="" fileref="figures/merge-people.png"
-                                   fileref="figures/merge-people.png"
+                                   format="PNG" width="" />
-                                   format="PNG" width="382" />
                       </imageobject>
 
                       <textobject>
@@ -4560,8 +4559,8 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata depth="224" fileref="figures/merge-src.png"
+                  <imagedata depth="" fileref="figures/merge-src.png"
-                             format="PNG" width="500" />
+                             format="PNG" width="" />
                 </imageobject>
 
                 <textobject>
@@ -4601,8 +4600,8 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata depth="185" fileref="figures/merge-plc.png"
+                  <imagedata depth="" fileref="figures/merge-plc.png"
-                             format="PNG" width="400" />
+                             format="PNG" width="" />
                 </imageobject>
 
                 <textobject>
@@ -4857,8 +4856,8 @@
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata depth="376" fileref="figures/edit-bm.png"
+                <imagedata depth="" fileref="figures/edit-bm.png" format="PNG"
-                           format="PNG" width="412" />
+                           width="" />
               </imageobject>
 
               <textobject>
@@ -4891,8 +4890,8 @@
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata depth="352" fileref="figures/find-people.png"
+                <imagedata depth="" fileref="figures/find-people.png"
-                           format="PNG" width="500" />
+                           format="PNG" width="" />
               </imageobject>
 
               <textobject>
@@ -5088,8 +5087,8 @@
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata depth="524" fileref="figures/bookreport.png"
+                <imagedata depth="" fileref="figures/bookreport.png"
-                           format="PNG" width="510" />
+                           format="PNG" width="" />
               </imageobject>
 
               <textobject>
@@ -6002,8 +6001,8 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata depth="410" fileref="figures/cfe-df.png"
+                  <imagedata depth="" fileref="figures/cfe-df.png"
-                             format="PNG" width="400" />
+                             format="PNG" width="" />
                 </imageobject>
 
                 <textobject>
@@ -6044,8 +6043,8 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata depth="297" fileref="figures/cfe-ar.png"
+                  <imagedata depth="" fileref="figures/cfe-ar.png"
-                             format="PNG" width="500" />
+                             format="PNG" width="" />
                 </imageobject>
 
                 <textobject>
@@ -6108,8 +6107,8 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata depth="246" fileref="figures/scratch-pad.png"
+                  <imagedata depth="" fileref="figures/scratch-pad.png"
-                             format="PNG" width="500" />
+                             format="PNG" width="" />
                 </imageobject>
 
                 <textobject>
@@ -6229,7 +6228,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/prefs.png" format="PNG" />
+              <imagedata depth="" fileref="figures/prefs.png" format="PNG" />
             </imageobject>
 
             <textobject>
@@ -8401,75 +8400,277 @@
 
     <para>The somewhat incomplete list of contributors includes (in
     alphabetical order): <itemizedlist>
-<listitem><para>Tim Allen</para></listitem>
+        <listitem>
-<listitem><para>Larry Allingham</para></listitem>
+          <para>Tim Allen</para>
-<listitem><para>Jens Arvidsson</para></listitem>
+        </listitem>
-<listitem><para>Kees Bakker</para></listitem>
-<listitem><para>Marcos Bedinelli</para></listitem>
-<listitem><para>Wayne Bergeron</para></listitem>
-<listitem><para>Stefan Bjork</para></listitem>
-<listitem><para>Douglas S. Blank</para></listitem>
-<listitem><para>Radu Bogdan Mare</para></listitem>
-<listitem><para>Alexander Bogdashevsky</para></listitem>
-<listitem><para>Richard Bos</para></listitem>
-<listitem><para>Matt Brubeck</para></listitem>
-<listitem><para>Nathan Bullock</para></listitem>
-<listitem><para>Lorenzo Cappelletti</para></listitem>
-<listitem><para>Pier Luigi Cinquantini</para></listitem>
-<listitem><para>Bruce J. DeGrasse</para></listitem>
-<listitem><para>Daniel Durand</para></listitem>
-<listitem><para>Alexandre Duret-Lutz</para></listitem>
-<listitem><para>Billy C. Earney</para></listitem>
-<listitem><para>Baruch Even</para></listitem>
-<listitem><para>Bernd Felsche</para></listitem>
-<listitem><para>Egyeki Gergely</para></listitem>
-<listitem><para>Michel Guitel</para></listitem>
-<listitem><para>Steve Hall</para></listitem>
-<listitem><para>David R. Hampton</para></listitem>
-<listitem><para>Martin Hawlisch</para></listitem>
-<listitem><para>Anton Huber</para></listitem>
-<listitem><para>Frode Jemtland</para></listitem>
-<listitem><para>Mark Knoop</para></listitem>
-<listitem><para>Greg Kuperberg</para></listitem>
-<listitem><para>Arkadiusz Lipiec</para></listitem>
-<listitem><para>Lars Kr. Lundin</para></listitem>
-<listitem><para>Radek Malcic</para></listitem>
-<listitem><para>Benny Malengier</para></listitem>
-<listitem><para>Leonid Mamtchenkov</para></listitem>
-<listitem><para>Brian Matherly</para></listitem>
-<listitem><para>Tino Meinen</para></listitem>
-<listitem><para>Serge Noiraud</para></listitem>
-<listitem><para>Frederick Noronha</para></listitem>
-<listitem><para>Jeffrey C. Ollie</para></listitem>
-<listitem><para>Jiri Pejchal</para></listitem>
-<listitem><para>Donald A. Peterson</para></listitem>
-<listitem><para>Guillaume Pratte</para></listitem>
-<listitem><para>Alexandre Prokoudine</para></listitem>
-<listitem><para>Laurent Protois</para></listitem>
-<listitem><para>Matthieu Pupat</para></listitem>
-<listitem><para>Jérôme Rapinat</para></listitem>
-<listitem><para>Trevor Rhodes</para></listitem>
-<listitem><para>Alexander Roitman</para></listitem>
-<listitem><para>Soren Roug</para></listitem>
-<listitem><para>Jason Salaz</para></listitem>
-<listitem><para>Julio Sanchez</para></listitem>
-<listitem><para>Bernd Schandl</para></listitem>
-<listitem><para>Martin Senftleben</para></listitem>
-<listitem><para>Yaakov Selkowitz</para></listitem>
-<listitem><para>Gary Shao</para></listitem>
-<listitem><para>Arturas Sleinius</para></listitem>
-<listitem><para>Jim Smart</para></listitem>
-<listitem><para>Steve Swales</para></listitem>
-<listitem><para>Eero Tamminen</para></listitem>
-<listitem><para>Samuel Tardieu</para></listitem>
-<listitem><para>Richard Taylor</para></listitem>
-<listitem><para>James Treacy</para></listitem>
-<listitem><para>Lubo Vasko</para></listitem>
-<listitem><para>Sebastian Voecking</para></listitem>
-<listitem><para>Xing Wang</para></listitem>
-<listitem><para>Tim Waugh</para></listitem>
-<listitem><para>Jesper Zedlitz</para></listitem>
 
+        <listitem>
+          <para>Larry Allingham</para>
+        </listitem>
+
+        <listitem>
+          <para>Jens Arvidsson</para>
+        </listitem>
+
+        <listitem>
+          <para>Kees Bakker</para>
+        </listitem>
+
+        <listitem>
+          <para>Marcos Bedinelli</para>
+        </listitem>
+
+        <listitem>
+          <para>Wayne Bergeron</para>
+        </listitem>
+
+        <listitem>
+          <para>Stefan Bjork</para>
+        </listitem>
+
+        <listitem>
+          <para>Douglas S. Blank</para>
+        </listitem>
+
+        <listitem>
+          <para>Radu Bogdan Mare</para>
+        </listitem>
+
+        <listitem>
+          <para>Alexander Bogdashevsky</para>
+        </listitem>
+
+        <listitem>
+          <para>Richard Bos</para>
+        </listitem>
+
+        <listitem>
+          <para>Matt Brubeck</para>
+        </listitem>
+
+        <listitem>
+          <para>Nathan Bullock</para>
+        </listitem>
+
+        <listitem>
+          <para>Lorenzo Cappelletti</para>
+        </listitem>
+
+        <listitem>
+          <para>Pier Luigi Cinquantini</para>
+        </listitem>
+
+        <listitem>
+          <para>Bruce J. DeGrasse</para>
+        </listitem>
+
+        <listitem>
+          <para>Daniel Durand</para>
+        </listitem>
+
+        <listitem>
+          <para>Alexandre Duret-Lutz</para>
+        </listitem>
+
+        <listitem>
+          <para>Billy C. Earney</para>
+        </listitem>
+
+        <listitem>
+          <para>Baruch Even</para>
+        </listitem>
+
+        <listitem>
+          <para>Bernd Felsche</para>
+        </listitem>
+
+        <listitem>
+          <para>Egyeki Gergely</para>
+        </listitem>
+
+        <listitem>
+          <para>Michel Guitel</para>
+        </listitem>
+
+        <listitem>
+          <para>Steve Hall</para>
+        </listitem>
+
+        <listitem>
+          <para>David R. Hampton</para>
+        </listitem>
+
+        <listitem>
+          <para>Martin Hawlisch</para>
+        </listitem>
+
+        <listitem>
+          <para>Anton Huber</para>
+        </listitem>
+
+        <listitem>
+          <para>Frode Jemtland</para>
+        </listitem>
+
+        <listitem>
+          <para>Mark Knoop</para>
+        </listitem>
+
+        <listitem>
+          <para>Greg Kuperberg</para>
+        </listitem>
+
+        <listitem>
+          <para>Arkadiusz Lipiec</para>
+        </listitem>
+
+        <listitem>
+          <para>Lars Kr. Lundin</para>
+        </listitem>
+
+        <listitem>
+          <para>Radek Malcic</para>
+        </listitem>
+
+        <listitem>
+          <para>Benny Malengier</para>
+        </listitem>
+
+        <listitem>
+          <para>Leonid Mamtchenkov</para>
+        </listitem>
+
+        <listitem>
+          <para>Brian Matherly</para>
+        </listitem>
+
+        <listitem>
+          <para>Tino Meinen</para>
+        </listitem>
+
+        <listitem>
+          <para>Serge Noiraud</para>
+        </listitem>
+
+        <listitem>
+          <para>Frederick Noronha</para>
+        </listitem>
+
+        <listitem>
+          <para>Jeffrey C. Ollie</para>
+        </listitem>
+
+        <listitem>
+          <para>Jiri Pejchal</para>
+        </listitem>
+
+        <listitem>
+          <para>Donald A. Peterson</para>
+        </listitem>
+
+        <listitem>
+          <para>Guillaume Pratte</para>
+        </listitem>
+
+        <listitem>
+          <para>Alexandre Prokoudine</para>
+        </listitem>
+
+        <listitem>
+          <para>Laurent Protois</para>
+        </listitem>
+
+        <listitem>
+          <para>Matthieu Pupat</para>
+        </listitem>
+
+        <listitem>
+          <para>Jérôme Rapinat</para>
+        </listitem>
+
+        <listitem>
+          <para>Trevor Rhodes</para>
+        </listitem>
+
+        <listitem>
+          <para>Alexander Roitman</para>
+        </listitem>
+
+        <listitem>
+          <para>Soren Roug</para>
+        </listitem>
+
+        <listitem>
+          <para>Jason Salaz</para>
+        </listitem>
+
+        <listitem>
+          <para>Julio Sanchez</para>
+        </listitem>
+
+        <listitem>
+          <para>Bernd Schandl</para>
+        </listitem>
+
+        <listitem>
+          <para>Martin Senftleben</para>
+        </listitem>
+
+        <listitem>
+          <para>Yaakov Selkowitz</para>
+        </listitem>
+
+        <listitem>
+          <para>Gary Shao</para>
+        </listitem>
+
+        <listitem>
+          <para>Arturas Sleinius</para>
+        </listitem>
+
+        <listitem>
+          <para>Jim Smart</para>
+        </listitem>
+
+        <listitem>
+          <para>Steve Swales</para>
+        </listitem>
+
+        <listitem>
+          <para>Eero Tamminen</para>
+        </listitem>
+
+        <listitem>
+          <para>Samuel Tardieu</para>
+        </listitem>
+
+        <listitem>
+          <para>Richard Taylor</para>
+        </listitem>
+
+        <listitem>
+          <para>James Treacy</para>
+        </listitem>
+
+        <listitem>
+          <para>Lubo Vasko</para>
+        </listitem>
+
+        <listitem>
+          <para>Sebastian Voecking</para>
+        </listitem>
+
+        <listitem>
+          <para>Xing Wang</para>
+        </listitem>
+
+        <listitem>
+          <para>Tim Waugh</para>
+        </listitem>
+
+        <listitem>
+          <para>Jesper Zedlitz</para>
+        </listitem>
       </itemizedlist> If you know of somebody else who should be listed here,
     please let us know.</para>
 

gramps2/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)

gramps2/src/DisplayModels/_PeopleModel.py

@@ -411,9 +411,7 @@ class PeopleModel(gtk.GenericTreeModel):
         return spouses_names
 
     def column_name(self, data, node):
-        n = Name()
+        return NameDisplay.displayer.raw_sorted_name(data[PeopleModel._NAME_COL])
-        n.unserialize(data[PeopleModel._NAME_COL])
-        return NameDisplay.displayer.sorted_name(n)
 
     def column_id(self, data, node):
         return data[PeopleModel._ID_COL]

gramps2/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
+                # Legacy _PREF
-            elif matches[1] and matches[1][0] == TOKEN_UNKNOWN:
+            elif matches[1] and matches[1] == TOKEN__PRIMARY:
                 pass
             else:
                 self.not_recognized(level+1)