Geography : bug #06466 : History change when clicking on one marker
bug #06451 : incomplete precedent patch svn: r21368
This commit is contained in:
parent
6deead53fc
commit
bf65ad1e7c
@ -406,13 +406,6 @@ class GeoGraphyView(OsmGps, NavigationView):
|
||||
found = True
|
||||
if found:
|
||||
self.bubble_message(event, lat, lon, mark_selected)
|
||||
# add the first place found to history
|
||||
hobj = self.uistate.get_history(self.navigation_type(),
|
||||
self.navigation_group())
|
||||
place = self.dbstate.db.get_place_from_gramps_id(mark_selected[0][9])
|
||||
handle = place.get_handle()
|
||||
if handle and not hobj.lock and not (handle == hobj.present()):
|
||||
hobj.push(handle)
|
||||
self.uistate.set_busy_cursor(False)
|
||||
|
||||
def bubble_message(self, event, lat, lon, mark):
|
||||
|
@ -75,7 +75,7 @@ class MessageLayer(GObject.GObject, osmgpsmap.MapLayer):
|
||||
Initialize the layer
|
||||
"""
|
||||
GObject.GObject.__init__(self)
|
||||
self.message = []
|
||||
self.message = ""
|
||||
self.color = "black"
|
||||
self.font = "Sans"
|
||||
self.size = 13
|
||||
|
@ -205,7 +205,6 @@ class GeoClose(GeoGraphyView):
|
||||
active = self.get_active()
|
||||
if active:
|
||||
p1 = self.dbstate.db.get_person_from_handle(active)
|
||||
self.change_active(active)
|
||||
color = self._config.get('geography.color2')
|
||||
self._createmap(p1, color, self.place_list_active, False)
|
||||
if self.refperson:
|
||||
|
@ -234,7 +234,6 @@ class GeoFamClose(GeoGraphyView):
|
||||
f1 = None
|
||||
if active:
|
||||
f1 = self.dbstate.db.get_family_from_handle(active)
|
||||
self.change_active(active)
|
||||
color = self._config.get('geography.color2')
|
||||
self._createmap(f1, color, self.place_list_active, False)
|
||||
if self.reffamily:
|
||||
|
@ -195,11 +195,10 @@ class GeoPerson(GeoGraphyView):
|
||||
Rebuild the tree with the given person handle as the root.
|
||||
"""
|
||||
self.places_found = []
|
||||
if handle:
|
||||
self.change_active(handle)
|
||||
self._createmap(handle)
|
||||
active = self.get_active()
|
||||
if active:
|
||||
if handle:
|
||||
self._createmap(handle)
|
||||
elif active:
|
||||
p1 = self.dbstate.db.get_person_from_handle(active)
|
||||
self._createmap(p1)
|
||||
self.uistate.modify_statusbar(self.dbstate)
|
||||
|
Loading…
Reference in New Issue
Block a user