* src/DataViews/_PersonView.py (column_names): Remove cause of death.

* src/DisplayModels/_PeopleModel.py (__init__): Update the order
	of marker and tooltip columns;
	(column_cause_of_death): remove method;
	(COLUMN_DEFS): Remove 'cause of death' column.
	* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_10): Reset event
	and person view columns to the default.
	* src/GrampsDb/_GrampsDbBase.py (get_event_column_order): Remove
	cause column from the default list.
	(get_person_column_order): Remove cause of death column.



svn: r7224

src/GrampsDb/_GrampsBSDDB.py

@@ -1878,6 +1878,24 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
     def gramps_upgrade_10(self):
         print "Upgrading to DB version 10 -- this may take a while"
 
+        # Remove event column metadata, since columns have changed.
+        # This will reset all columns to defaults in event view
+        for name in (PERSON_COL_KEY,EVENT_COL_KEY):
+            try:
+                if self.UseTXN:
+                    # Start transaction if needed
+                    the_txn = self.env.txn_begin()
+                else:
+                    the_txn = None
+                self.metadata.delete(name,txn=the_txn)
+                if self.UseTXN:
+                    the_txn.commit()
+                else:
+                    self.metadata.sync()
+            except KeyError:
+                if self.UseTXN:
+                    the_txn.abort()
+
         # Create one secondary index for reference_map
         # because every commit will require this to exist
         table_flags = self.open_flags()

src/GrampsDb/_GrampsDbBase.py

@@ -1925,7 +1925,7 @@ class GrampsDbBase(GrampsDBCallback):
         """
         default = [(1, 1, 100), (1, 2, 100), (1, 3, 150), (0, 4, 150),
                    (1, 5, 150), (0, 6, 150), (0, 7, 100), (0, 8, 100),
-                   (0, 9, 100)]
+                   ]
         return self._get_column_order(PERSON_COL_KEY, default)
 
     def _get_columns(self, key, default):
@@ -1993,7 +1993,7 @@ class GrampsDbBase(GrampsDBCallback):
         database's metadata.
         """
         default = [(1, 0, 200), (1, 1, 75), (1, 2, 100), (1, 3, 150),
-                   (1, 4, 200), (1, 5, 100), (0, 6, 100)]
+                   (1, 4, 200), (0, 5, 100)]
         return self._get_columns(EVENT_COL_KEY, default)
 
     def get_repository_column_order(self):