Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for deleting tags in people model; fix for calendar graphical report when too many 2-line entries in day

Browse Source
This commit is contained in:
Doug Blank 2013-12-15 10:40:18 -05:00
parent be0239d255
commit cdefb047ef
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/gui/views/treemodels/peoplemodel.py
View File

@ -449,6 +449,7 @@ class PeopleBaseModel(object):
tag_priority = None tag_priority = None
for handle in data[COLUMN_TAGS]: for handle in data[COLUMN_TAGS]:
tag = self.db.get_tag_from_handle(handle) tag = self.db.get_tag_from_handle(handle)
if tag:
this_priority = tag.get_priority() this_priority = tag.get_priority()
if tag_priority is None or this_priority < tag_priority: if tag_priority is None or this_priority < tag_priority:
tag_color = tag.get_color() tag_color = tag.get_color()

16
gramps/plugins/drawreport/calendarreport.py
View File

@ -208,6 +208,7 @@ class Calendar(Report):
ptext = style_sheet.get_paragraph_style("CAL-Text") ptext = style_sheet.get_paragraph_style("CAL-Text")
pdaynames = style_sheet.get_paragraph_style("CAL-Daynames") pdaynames = style_sheet.get_paragraph_style("CAL-Daynames")
pnumbers = style_sheet.get_paragraph_style("CAL-Numbers") pnumbers = style_sheet.get_paragraph_style("CAL-Numbers")
numpos = pt2cm(pnumbers.get_font().get_size())
ptext1style = style_sheet.get_paragraph_style("CAL-Text1style") ptext1style = style_sheet.get_paragraph_style("CAL-Text1style")
long_days = self._dd.long_days long_days = self._dd.long_days
@ -267,24 +268,21 @@ class Calendar(Report):
header + week_row * cell_height) header + week_row * cell_height)
list_ = self.calendar.get(month, {}).get(thisday.day, []) list_ = self.calendar.get(month, {}).get(thisday.day, [])
list_.sort() # to get CAL-Holiday on bottom list_.sort() # to get CAL-Holiday on bottom
position = 0.0 position = spacing
for (format, p, m_list) in list_: for (format, p, m_list) in list_:
lines = p.count("\n") + 1 # lines in the text for line in reversed(p.split("\n")):
position += (lines * spacing)
current = 0
for line in p.split("\n"):
# make sure text will fit: # make sure text will fit:
numpos = pt2cm(pnumbers.get_font().get_size()) numpos = pt2cm(pnumbers.get_font().get_size())
if position + (current * spacing) - 0.1 >= cell_height - numpos: # font daynums if position - 0.1 >= cell_height - numpos: # font daynums
continue break
font = ptext.get_font() font = ptext.get_font()
line = string_trim(font, line, cm2pt(cell_width + 0.2)) line = string_trim(font, line, cm2pt(cell_width + 0.2))
self.doc.draw_text(format, line, self.doc.draw_text(format, line,
day_col * cell_width + 0.1, day_col * cell_width + 0.1,
header + (week_row + 1) * cell_height - position + (current * spacing) - 0.1, m_list[0]) header + (week_row + 1) * cell_height - position - 0.1, m_list[0])
if len(m_list) > 1: # index the spouse too if len(m_list) > 1: # index the spouse too
self.doc.draw_text(format, "",0,0, m_list[1]) self.doc.draw_text(format, "",0,0, m_list[1])
current += 1 position += spacing
current_ord += 1 current_ord += 1
if not something_this_week: if not something_this_week:
last_edge = 0 last_edge = 0