Geography : bug 8612 and 8616 : gtk 3.16 introspection problem and change for new place structure.

This commit is contained in:
SNoiraud 2015-06-06 19:04:17 +02:00
parent 2a7bf82cf5
commit abf785be5e
9 changed files with 10 additions and 25 deletions

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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