svn: r17067
This commit is contained in:
parent
168b49d217
commit
4f076b9de7
@ -717,7 +717,7 @@ class AncestorTree(Report):
|
|||||||
self.canvas.add_title(title)
|
self.canvas.add_title(title)
|
||||||
|
|
||||||
#make the report as big as it wants to be.
|
#make the report as big as it wants to be.
|
||||||
compress = self.connect.get_val('compress')
|
compress = self.connect.get_val('compress_tree')
|
||||||
report = MakeReport(database, self.doc, self.canvas, font_normal,
|
report = MakeReport(database, self.doc, self.canvas, font_normal,
|
||||||
inlc_marr, compress)
|
inlc_marr, compress)
|
||||||
report.start()
|
report.start()
|
||||||
@ -880,7 +880,7 @@ class AncestorTreeOptions(MenuReportOptions):
|
|||||||
compress = BooleanOption(_('Co_mpress tree'), True)
|
compress = BooleanOption(_('Co_mpress tree'), True)
|
||||||
compress.set_help(_("Whether to remove any extra blank spaces set "
|
compress.set_help(_("Whether to remove any extra blank spaces set "
|
||||||
"aside for people that are unknown"))
|
"aside for people that are unknown"))
|
||||||
menu.add_option(category_name, "compress", compress)
|
menu.add_option(category_name, "compress_tree", compress)
|
||||||
|
|
||||||
#better to 'Show siblings of\nthe center person
|
#better to 'Show siblings of\nthe center person
|
||||||
#Spouse_disp = EnumeratedListOption(_("Show spouses of\nthe center "
|
#Spouse_disp = EnumeratedListOption(_("Show spouses of\nthe center "
|
||||||
|
@ -1236,7 +1236,7 @@ class GuiConnect():
|
|||||||
return CalcLines(database, display_repl)
|
return CalcLines(database, display_repl)
|
||||||
|
|
||||||
def working_lines(self, box):
|
def working_lines(self, box):
|
||||||
display = self.get_val("dsecend_disp")
|
display = self.get_val("descend_disp")
|
||||||
#if self.get_val('diffspouse'):
|
#if self.get_val('diffspouse'):
|
||||||
display_spou = self.get_val("spouse_disp")
|
display_spou = self.get_val("spouse_disp")
|
||||||
#else:
|
#else:
|
||||||
@ -1497,7 +1497,7 @@ class DescendTreeOptions(MenuReportOptions):
|
|||||||
disp = TextOption(_("Descendant\nDisplay Format"),
|
disp = TextOption(_("Descendant\nDisplay Format"),
|
||||||
["$n","%s $b" % _BORN,"%s $d" %_DIED])
|
["$n","%s $b" % _BORN,"%s $d" %_DIED])
|
||||||
disp.set_help(_("Display format for a descendant."))
|
disp.set_help(_("Display format for a descendant."))
|
||||||
menu.add_option(category_name, "dsecend_disp", disp)
|
menu.add_option(category_name, "descend_disp", disp)
|
||||||
|
|
||||||
bold = BooleanOption(_('Bold direct descendants'), True)
|
bold = BooleanOption(_('Bold direct descendants'), True)
|
||||||
bold.set_help(
|
bold.set_help(
|
||||||
|
@ -269,18 +269,15 @@ class DateFormat(GenericFormat):
|
|||||||
|
|
||||||
|
|
||||||
def modifier():
|
def modifier():
|
||||||
print "hi"
|
#ui_mods taken from date.py def lookup_modifier(self, modifier):
|
||||||
ui_mods = [_(""), _("before"), _("after"), _("about"),
|
ui_mods = ["", _("before"), _("after"), _("about"),
|
||||||
_(""), _(""), _("")]
|
"", "", ""]
|
||||||
return ui_mods[date.get_modifier()].capitalize()
|
return ui_mods[date.get_modifier()].capitalize()
|
||||||
|
|
||||||
def modifier_up():
|
|
||||||
return modifier.upper()
|
|
||||||
|
|
||||||
|
code = "ymdMo"
|
||||||
code = "ymdMoO"
|
upper = "O"
|
||||||
upper = ""
|
function = [year, month, day, month_up, modifier]
|
||||||
function = [year, month, day, month_up, modifier, modifier_up]
|
|
||||||
|
|
||||||
return self.generic_format(date, code, upper, function)
|
return self.generic_format(date, code, upper, function)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user