diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py index 6e1917aff..d5671c569 100644 --- a/gramps/plugins/lib/maps/geography.py +++ b/gramps/plugins/lib/maps/geography.py @@ -390,9 +390,7 @@ class GeoGraphyView(OsmGps, NavigationView): clearmap.show() menu.append(clearmap) menu.show() - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 1 diff --git a/gramps/plugins/lib/maps/placeselection.py b/gramps/plugins/lib/maps/placeselection.py index c57fbeca4..fd0c11432 100644 --- a/gramps/plugins/lib/maps/placeselection.py +++ b/gramps/plugins/lib/maps/placeselection.py @@ -193,7 +193,8 @@ class PlaceSelection(ManagedWindow, OsmGps): self.oldvalue) ) for place in self.places: - self.plist.append(place) + p = (place[0].value, place[1].value, place[2].value, place[3]) + self.plist.append(p) # here, we could add value from geography names services ... # if we found no place, we must create a default place. diff --git a/gramps/plugins/view/geoclose.py b/gramps/plugins/view/geoclose.py index db6b555a9..72e0349b7 100644 --- a/gramps/plugins/view/geoclose.py +++ b/gramps/plugins/view/geoclose.py @@ -535,9 +535,7 @@ class GeoClose(GeoGraphyView): event, lat, lon, prevmark) itemoption.append(center) menu.show() - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 0 diff --git a/gramps/plugins/view/geoevents.py b/gramps/plugins/view/geoevents.py index 7d001a37f..19e731e98 100644 --- a/gramps/plugins/view/geoevents.py +++ b/gramps/plugins/view/geoevents.py @@ -369,9 +369,7 @@ class GeoEvents(GeoGraphyView): bookm.show() bookm.connect("activate", self.add_bookmark_from_popup, hdle) itemoption.append(bookm) - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 1 diff --git a/gramps/plugins/view/geofamclose.py b/gramps/plugins/view/geofamclose.py index 7d6bd03a7..a800c8ff4 100644 --- a/gramps/plugins/view/geofamclose.py +++ b/gramps/plugins/view/geofamclose.py @@ -678,9 +678,7 @@ class GeoFamClose(GeoGraphyView): event, lat, lon, prevmark) itemoption.append(center) menu.show() - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 0 diff --git a/gramps/plugins/view/geofamily.py b/gramps/plugins/view/geofamily.py index 94444dbad..788b977f2 100644 --- a/gramps/plugins/view/geofamily.py +++ b/gramps/plugins/view/geofamily.py @@ -446,9 +446,7 @@ class GeoFamily(GeoGraphyView): add_item.show() menu.append(add_item) self.add_event_bubble_message(event, lat, lon, prevmark, add_item) - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 1 diff --git a/gramps/plugins/view/geomoves.py b/gramps/plugins/view/geomoves.py index 4884462da..7d443cd91 100644 --- a/gramps/plugins/view/geomoves.py +++ b/gramps/plugins/view/geomoves.py @@ -610,9 +610,7 @@ class GeoMoves(GeoGraphyView): bookm.connect("activate", self.add_bookmark_from_popup, hdle) itemoption.append(bookm) menu.show() - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 1 diff --git a/gramps/plugins/view/geoperson.py b/gramps/plugins/view/geoperson.py index 8f8e81c12..f9ae36b99 100644 --- a/gramps/plugins/view/geoperson.py +++ b/gramps/plugins/view/geoperson.py @@ -490,9 +490,7 @@ class GeoPerson(GeoGraphyView): center.connect("activate", self.center_here, event, lat, lon, prevmark) itemoption.append(center) menu.show() - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 1 diff --git a/gramps/plugins/view/geoplaces.py b/gramps/plugins/view/geoplaces.py index e3d05a107..3c7f3d8a7 100644 --- a/gramps/plugins/view/geoplaces.py +++ b/gramps/plugins/view/geoplaces.py @@ -359,9 +359,7 @@ class GeoPlaces(GeoGraphyView): bookm.show() bookm.connect("activate", self.add_bookmark_from_popup, hdle) itemoption.append(bookm) - menu.popup(None, None, - lambda menu, data: (event.get_root_coords()[0], - event.get_root_coords()[1], True), + menu.popup(None, None, None, None, event.button, event.time) return 1