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

* src/plugins/EventCmp.py: improve Date/Place display (#0000226)

Browse Source 
svn: r7219
This commit is contained in:
Brian Matherly 2006-08-21 03:20:39 +00:00
parent e407d28d90
commit ead3374396
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2006-08-20 Brian Matherly <brian@gramps-project.org>
* src/plugins/EventCmp.py: improve Date/Place display (#0000226)
2006-08-20 Alex Roitman <shura@gramps-project.org> 2006-08-20 Alex Roitman <shura@gramps-project.org>
* src/DataViews/_EventView.py (column_names): Remove cause column. * src/DataViews/_EventView.py (column_names): Remove cause column.
* src/DisplayModels/_EventModel.py: Use constants for column * src/DisplayModels/_EventModel.py: Use constants for column

31
gramps2/src/plugins/EventCmp.py
View File

@ -257,6 +257,12 @@ class DisplayChart(ManagedWindow.ManagedWindow):
self.my_list.sort(self.sort.by_last_name) self.my_list.sort(self.sort.by_last_name)
self.event_titles = self.make_event_titles() self.event_titles = self.make_event_titles()
self.table_titles = [_("Person")]
for event_name in self.event_titles:
self.table_titles.append(event_name + _(" Date"))
self.table_titles.append(event_name + _(" Place"))
self.build_row_data() self.build_row_data()
self.draw_clist_display() self.draw_clist_display()
self.show() self.show()
@ -272,8 +278,8 @@ class DisplayChart(ManagedWindow.ManagedWindow):
titles = [] titles = []
index = 0 index = 0
for event_name in self.event_titles: for title in self.table_titles:
titles.append((event_name,index,150)) titles.append((title,index,150))
index = index + 1 index = index + 1
self.list = ListModel.ListModel(self.eventlist,titles) self.list = ListModel.ListModel(self.eventlist,titles)
@ -308,7 +314,7 @@ class DisplayChart(ManagedWindow.ManagedWindow):
tlist = [name] tlist = [name]
else: else:
tlist = [""] tlist = [""]
for ename in self.event_titles[3:]: for ename in self.event_titles:
if the_map.has_key(ename) and len(the_map[ename]) > 0: if the_map.has_key(ename) and len(the_map[ename]) > 0:
event_handle = the_map[ename][0] event_handle = the_map[ename][0]
del the_map[ename][0] del the_map[ename][0]
@ -320,10 +326,12 @@ class DisplayChart(ManagedWindow.ManagedWindow):
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
place = self.db.get_place_from_handle(place_handle).get_title() place = self.db.get_place_from_handle(place_handle).get_title()
tlist.append("%s\n%s" % (date, place)) tlist.append(date)
tlist.append(place)
added = 1 added = 1
else: else:
tlist.append("") tlist.append("")
tlist.append("")
if first: if first:
first = 0 first = 0
@ -356,8 +364,17 @@ class DisplayChart(ManagedWindow.ManagedWindow):
unsort_list = [ (the_map[item],item) for item in the_map.keys() ] unsort_list = [ (the_map[item],item) for item in the_map.keys() ]
unsort_list.sort(by_value) unsort_list.sort(by_value)
sort_list = [ item[1] for item in unsort_list ] sort_list = [ item[1] for item in unsort_list ]
# Move birth and death to the begining of the list
if the_map.has_key(_("Death")):
sort_list.remove(_("Death"))
sort_list = [_("Death")] + sort_list
if the_map.has_key(_("Birth")):
sort_list.remove(_("Birth"))
sort_list = [_("Birth")] + sort_list
return [_("Person"),_("Birth"),_("Death")] + sort_list return sort_list
def on_write_table(self,obj): def on_write_table(self,obj):
f = gtk.FileChooserDialog(_("Select filename"), f = gtk.FileChooserDialog(_("Select filename"),
@ -377,9 +394,9 @@ class DisplayChart(ManagedWindow.ManagedWindow):
doc = ODSDoc.ODSDoc(pstyle,BaseDoc.PAPER_PORTRAIT) doc = ODSDoc.ODSDoc(pstyle,BaseDoc.PAPER_PORTRAIT)
doc.creator(self.db.get_researcher().get_name()) doc.creator(self.db.get_researcher().get_name())
spreadsheet = TableReport(name,doc) spreadsheet = TableReport(name,doc)
spreadsheet.initialize(len(self.event_titles)) spreadsheet.initialize(len(self.table_titles))
spreadsheet.write_table_head(self.event_titles) spreadsheet.write_table_head(self.table_titles)
index = 0 index = 0
for top in self.row_data: for top in self.row_data: