svn: r5483
This commit is contained in:
Alex Roitman 2005-12-06 06:44:26 +00:00
parent 97cdbe6af4
commit cf825940d2
2 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,6 @@
2005-12-05 Alex Roitman <shura@gramps-project.org>
* merge some changes from gramps20.
2005-12-05 Don Allingham <don@gramps-project.org> 2005-12-05 Don Allingham <don@gramps-project.org>
* src/data/main*.css: fix H6 and SUP * src/data/main*.css: fix H6 and SUP

View File

@ -26,6 +26,7 @@
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -44,6 +45,7 @@ import gtk.gdk
import RelLib import RelLib
import PageView import PageView
import EditPerson import EditPerson
import Relationship
import NameDisplay import NameDisplay
import Utils import Utils
import DateHandler import DateHandler
@ -205,6 +207,9 @@ class PedView(PageView.PersonNavView):
def person_updated_cb(self,handle_list): def person_updated_cb(self,handle_list):
print "PedView.person_updated_cb" print "PedView.person_updated_cb"
self.rebuild_trees(self.dbstate.active) self.rebuild_trees(self.dbstate.active)
## if self.active_person and self.active_person.handle == handle_list[0]:
## self.active_person = self.db.get_person_from_handle(handle_list[0])
## self.load_canvas(self.active_person)
def person_rebuild(self): def person_rebuild(self):
print "PedView.person_rebuild" print "PedView.person_rebuild"
@ -301,6 +306,7 @@ class PedView(PageView.PersonNavView):
# Build ancestor tree # Build ancestor tree
lst = [None]*31 lst = [None]*31
self.find_tree(active_person,0,1,lst) self.find_tree(active_person,0,1,lst)
## self.find_tree(person,0,1,lst)
# Purge current table content # Purge current table content
for child in table_widget.get_children(): for child in table_widget.get_children():
@ -697,9 +703,9 @@ class PedView(PageView.PersonNavView):
child_menu = item.get_submenu() child_menu = item.get_submenu()
if find_children(self.db,child): if find_children(self.db,child):
label = gtk.Label('<b><i>%s</i></b>' % NameDisplay.displayer.display(child)) label = gtk.Label('<b><i>%s</i></b>' % escape(NameDisplay.displayer.display(child)))
else: else:
label = gtk.Label(NameDisplay.displayer.display(child)) label = gtk.Label(escape(NameDisplay.displayer.display(child)))
go_image = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO,gtk.ICON_SIZE_MENU) go_image = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO,gtk.ICON_SIZE_MENU)
go_image.show() go_image.show()
@ -734,9 +740,9 @@ class PedView(PageView.PersonNavView):
par_menu = item.get_submenu() par_menu = item.get_submenu()
if find_parents(self.db,par): if find_parents(self.db,par):
label = gtk.Label('<b><i>%s</i></b>' % NameDisplay.displayer.display(par)) label = gtk.Label('<b><i>%s</i></b>' % escape(NameDisplay.displayer.display(par)))
else: else:
label = gtk.Label(NameDisplay.displayer.display(par)) label = gtk.Label(escape(NameDisplay.displayer.display(par)))
go_image = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO,gtk.ICON_SIZE_MENU) go_image = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO,gtk.ICON_SIZE_MENU)
go_image.show() go_image.show()