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

Geography : bug #06466 : History change when clicking on one marker

Browse Source 
bug #06451 : incomplete precedent patch


svn: r21368
This commit is contained in:
Serge Noiraud 2013-02-17 12:48:55 +00:00
parent 6deead53fc
commit bf65ad1e7c
5 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/plugins/lib/maps/geography.py
View File

@ -406,13 +406,6 @@ class GeoGraphyView(OsmGps, NavigationView):
found = True found = True
if found: if found:
self.bubble_message(event, lat, lon, mark_selected) 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) self.uistate.set_busy_cursor(False)
def bubble_message(self, event, lat, lon, mark): def bubble_message(self, event, lat, lon, mark):

2
gramps/plugins/lib/maps/messagelayer.py
View File

@ -75,7 +75,7 @@ class MessageLayer(GObject.GObject, osmgpsmap.MapLayer):
Initialize the layer Initialize the layer
""" """
GObject.GObject.__init__(self) GObject.GObject.__init__(self)
self.message = [] self.message = ""
self.color = "black" self.color = "black"
self.font = "Sans" self.font = "Sans"
self.size = 13 self.size = 13

1
gramps/plugins/view/geoclose.py
View File

@ -205,7 +205,6 @@ class GeoClose(GeoGraphyView):
active = self.get_active() active = self.get_active()
if active: if active:
p1 = self.dbstate.db.get_person_from_handle(active) p1 = self.dbstate.db.get_person_from_handle(active)
self.change_active(active)
color = self._config.get('geography.color2') color = self._config.get('geography.color2')
self._createmap(p1, color, self.place_list_active, False) self._createmap(p1, color, self.place_list_active, False)
if self.refperson: if self.refperson:

1
gramps/plugins/view/geofamclose.py
View File

@ -234,7 +234,6 @@ class GeoFamClose(GeoGraphyView):
f1 = None f1 = None
if active: if active:
f1 = self.dbstate.db.get_family_from_handle(active) f1 = self.dbstate.db.get_family_from_handle(active)
self.change_active(active)
color = self._config.get('geography.color2') color = self._config.get('geography.color2')
self._createmap(f1, color, self.place_list_active, False) self._createmap(f1, color, self.place_list_active, False)
if self.reffamily: if self.reffamily:

7
gramps/plugins/view/geoperson.py
View File

@ -195,11 +195,10 @@ class GeoPerson(GeoGraphyView):
Rebuild the tree with the given person handle as the root. Rebuild the tree with the given person handle as the root.
""" """
self.places_found = [] self.places_found = []
if handle:
self.change_active(handle)
self._createmap(handle)
active = self.get_active() active = self.get_active()
if active: if handle:
self._createmap(handle)
elif active:
p1 = self.dbstate.db.get_person_from_handle(active) p1 = self.dbstate.db.get_person_from_handle(active)
self._createmap(p1) self._createmap(p1)
self.uistate.modify_statusbar(self.dbstate) self.uistate.modify_statusbar(self.dbstate)