3719: Pedigree View: should display engagement date if no marriage known; added markup dates to family view to show fallback dates, and invalid dates; pedigreeview shows abbrev. date with markup, and tooltip details

svn: r16250

src/plugins/view/familyview.py

@@ -73,6 +73,7 @@ class FamilyView(ListView):
     COL_TAGS = 5
     COL_CHAN = 6
     # name of the columns
+    MARKUP_COLS = [COL_MARDATE]
     COLUMN_NAMES = [
         _('ID'),
         _('Father'),
@@ -114,7 +115,8 @@ class FamilyView(ListView):
             signal_map, dbstate.db.get_family_bookmarks(),
             Bookmarks.FamilyBookmarks, nav_group,
             multiple=True,
-            filter_class=FamilySidebarFilter)
+            filter_class=FamilySidebarFilter,
+            markup=FamilyView.MARKUP_COLS)
 
         self.func_list.update({
             '<CONTROL>J' : self.jump,

src/plugins/view/pedigreeview.py

@@ -1218,11 +1218,12 @@ class PedigreeView(NavigationView):
                ((self.tree_style == 1 and positions[i][2]) or
                (self.tree_style in [0, 2] and (level+1) < size)):
                 if lst[i] and lst[i][2]:
-                    text = self.format_helper.format_relation(lst[i][2], 1)
+                    text = self.format_helper.format_relation(lst[i][2], 1, True)
                 else:
                     text = " "
                 label = gtk.Label(text)
                 label.set_justify(gtk.JUSTIFY_LEFT)
+                label.set_use_markup(True)
                 label.set_line_wrap(True)
                 label.set_alignment(0.1, 0.5)
                 if self.tree_style in [0, 2]: