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

Allow nodes with handles at higher levels in the tree

Browse Source 
svn: r13921
This commit is contained in:
Nick Hall 2009-12-26 19:42:22 +00:00
parent e8042007ff
commit 5422931318
2 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/views/treemodels/placetreemodel.py
View File

@ -86,37 +86,49 @@ class PlaceTreeModel(PlaceBaseModel, TreeBaseModel):
handle The handle of the gramps object. handle The handle of the gramps object.
data The object data. data The object data.
""" """
try: if data[5] is None:
level1 = data[5][0][4] # No primary location
except TypeError: level = [''] * 5
level1 = _('Unknown level1') else:
if not level1: level = [data[5][0][i] for i in range(4,-1,-1)]
level1 = _('Unknown level1')
try: node1 = (level[0], )
level2 = data[5][0][3] node2 = (level[1], level[0])
except TypeError: node3 = (level[2], level[1], level[0])
level2 = _('Unknown level2')
if not level2:
level2 = _('Unknown level2')
try:
level3 = data[5][0][2]
except TypeError:
level3 = _('Unknown level3')
if not level3:
level3 = _('Unknown level3')
node1 = (level1, )
node2 = (level2, level1)
node3 = (level3, level2, level1)
sort_key = self.sort_func(data) sort_key = self.sort_func(data)
self.add_node(None, node1, level1, None, add_parent=False) if not (level[3] or level[4]):
self.add_node(node1, node2, level2, None, add_parent=False) if level[2]:
self.add_node(node2, node3, level3, None, add_parent=False) self.add_node(None, node1, level[0], None, add_parent=False)
self.add_node(node1, node2, level[1], None, add_parent=False)
self.add_node(node2, handle, level[2], handle, add_parent=False)
elif level[1]:
self.add_node(None, node1, level[0], None, add_parent=False)
self.add_node(node1, handle, level[1], handle, add_parent=False)
elif level[0]:
self.add_node(None, handle, level[0], handle, add_parent=False)
else:
self.add_node(None, handle, sort_key, handle, add_parent=False)
else:
self.add_node(None, node1, level[0], None, add_parent=False)
self.add_node(node1, node2, level[1], None, add_parent=False)
self.add_node(node2, node3, level[2], None, add_parent=False)
self.add_node(node3, handle, sort_key, handle, add_parent=False) self.add_node(node3, handle, sort_key, handle, add_parent=False)
def column_name(self, data):
if data[5] is not None:
level = [data[5][0][i] for i in range(4,-1,-1)]
if not (level[3] or level[4]):
return unicode(level[2] or level[1] or level[0])
elif level[3] and level[4]:
return unicode(level[3] + ', ' + level[4])
elif level[3] or level[4]:
return unicode(level[3] or level[4])
else:
return unicode(data[2])
return unicode(data[2])
def column_header(self, node): def column_header(self, node):
""" """
Return a column heading. This is called for nodes with no associated Return a column heading. This is called for nodes with no associated

27
src/plugins/view/placetreeview.py
View File

@ -140,21 +140,22 @@ class PlaceTreeView(PlaceBaseView):
level1 = level2 = level3 = u"" level1 = level2 = level3 = u""
if len(pathlist) == 1: if len(pathlist) == 1:
path = pathlist[0] path = pathlist[0]
if len(path) == 1:
level1 = model.on_get_iter(path)[0]
elif len(path) == 2:
level2 = model.on_get_iter(path)[0]
level1 = model.on_get_iter(path)[1]
elif len(path) == 3:
node = model.on_get_iter(path) node = model.on_get_iter(path)
level3 = node[0] parent = model.on_iter_parent(node)
level2 = node[1] value = model.on_get_value(node, 0)
level1 = model.on_iter_parent(node)[1] if len(path) == 1:
level1 = value
elif len(path) == 2:
level2 = value
level1 = parent[0]
elif len(path) == 3:
level3 = value
level2 = parent[0]
level1 = parent[1]
else: else:
node = model.on_iter_parent(model.on_get_iter(path)) level3 = parent[0]
level3 = node[0] level2 = parent[1]
level2 = node[1] level1 = parent[2]
level1 = model.on_iter_parent(node)[1]
try: try:
place.get_main_location().set_country(level1) place.get_main_location().set_country(level1)