Geography : bug 8612 and 8616 : gtk 3.16 introspection problem and change for new place structure.
This commit is contained in:
parent
2a7bf82cf5
commit
abf785be5e
@ -390,9 +390,7 @@ class GeoGraphyView(OsmGps, NavigationView):
|
|||||||
clearmap.show()
|
clearmap.show()
|
||||||
menu.append(clearmap)
|
menu.append(clearmap)
|
||||||
menu.show()
|
menu.show()
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@ -193,7 +193,8 @@ class PlaceSelection(ManagedWindow, OsmGps):
|
|||||||
self.oldvalue)
|
self.oldvalue)
|
||||||
)
|
)
|
||||||
for place in self.places:
|
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 ...
|
# here, we could add value from geography names services ...
|
||||||
|
|
||||||
# if we found no place, we must create a default place.
|
# if we found no place, we must create a default place.
|
||||||
|
@ -535,9 +535,7 @@ class GeoClose(GeoGraphyView):
|
|||||||
event, lat, lon, prevmark)
|
event, lat, lon, prevmark)
|
||||||
itemoption.append(center)
|
itemoption.append(center)
|
||||||
menu.show()
|
menu.show()
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
@ -369,9 +369,7 @@ class GeoEvents(GeoGraphyView):
|
|||||||
bookm.show()
|
bookm.show()
|
||||||
bookm.connect("activate", self.add_bookmark_from_popup, hdle)
|
bookm.connect("activate", self.add_bookmark_from_popup, hdle)
|
||||||
itemoption.append(bookm)
|
itemoption.append(bookm)
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@ -678,9 +678,7 @@ class GeoFamClose(GeoGraphyView):
|
|||||||
event, lat, lon, prevmark)
|
event, lat, lon, prevmark)
|
||||||
itemoption.append(center)
|
itemoption.append(center)
|
||||||
menu.show()
|
menu.show()
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
@ -446,9 +446,7 @@ class GeoFamily(GeoGraphyView):
|
|||||||
add_item.show()
|
add_item.show()
|
||||||
menu.append(add_item)
|
menu.append(add_item)
|
||||||
self.add_event_bubble_message(event, lat, lon, prevmark, add_item)
|
self.add_event_bubble_message(event, lat, lon, prevmark, add_item)
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@ -610,9 +610,7 @@ class GeoMoves(GeoGraphyView):
|
|||||||
bookm.connect("activate", self.add_bookmark_from_popup, hdle)
|
bookm.connect("activate", self.add_bookmark_from_popup, hdle)
|
||||||
itemoption.append(bookm)
|
itemoption.append(bookm)
|
||||||
menu.show()
|
menu.show()
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@ -490,9 +490,7 @@ class GeoPerson(GeoGraphyView):
|
|||||||
center.connect("activate", self.center_here, event, lat, lon, prevmark)
|
center.connect("activate", self.center_here, event, lat, lon, prevmark)
|
||||||
itemoption.append(center)
|
itemoption.append(center)
|
||||||
menu.show()
|
menu.show()
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@ -359,9 +359,7 @@ class GeoPlaces(GeoGraphyView):
|
|||||||
bookm.show()
|
bookm.show()
|
||||||
bookm.connect("activate", self.add_bookmark_from_popup, hdle)
|
bookm.connect("activate", self.add_bookmark_from_popup, hdle)
|
||||||
itemoption.append(bookm)
|
itemoption.append(bookm)
|
||||||
menu.popup(None, None,
|
menu.popup(None, None, None,
|
||||||
lambda menu, data: (event.get_root_coords()[0],
|
|
||||||
event.get_root_coords()[1], True),
|
|
||||||
None, event.button, event.time)
|
None, event.button, event.time)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user