GeoView : crosshair synchronization between providers.
config file named "None.ini" svn: r14781
This commit is contained in:
parent
21c6294599
commit
e8fbf6279a
@ -301,6 +301,8 @@ class GeoView(HtmlView):
|
|||||||
self.dbstate = dbstate
|
self.dbstate = dbstate
|
||||||
self.uistate = uistate
|
self.uistate = uistate
|
||||||
self.dbstate.connect('database-changed', self._new_database)
|
self.dbstate.connect('database-changed', self._new_database)
|
||||||
|
|
||||||
|
def build_widget(self):
|
||||||
self.no_network = False
|
self.no_network = False
|
||||||
self.placeslist = []
|
self.placeslist = []
|
||||||
self.displaytype = "person"
|
self.displaytype = "person"
|
||||||
@ -428,6 +430,7 @@ class GeoView(HtmlView):
|
|||||||
self.crosspath = urlparse.urlunsplit(('file', '',
|
self.crosspath = urlparse.urlunsplit(('file', '',
|
||||||
URL_SEP.join(fpath.split(os.sep)),
|
URL_SEP.join(fpath.split(os.sep)),
|
||||||
'', ''))
|
'', ''))
|
||||||
|
return HtmlView.build_widget(self)
|
||||||
|
|
||||||
def can_configure(self):
|
def can_configure(self):
|
||||||
"""
|
"""
|
||||||
@ -696,7 +699,7 @@ class GeoView(HtmlView):
|
|||||||
return
|
return
|
||||||
if widget.get_active():
|
if widget.get_active():
|
||||||
self.last_year = widget
|
self.last_year = widget
|
||||||
self._set_markersonpage(widget)
|
self._set_markers_and_crosshair_on_page(widget)
|
||||||
|
|
||||||
def _ask_new_page(self, widget, data=None): # pylint: disable-msg=W0613
|
def _ask_new_page(self, widget, data=None): # pylint: disable-msg=W0613
|
||||||
"""
|
"""
|
||||||
@ -972,9 +975,9 @@ class GeoView(HtmlView):
|
|||||||
self._savezoomandposition()
|
self._savezoomandposition()
|
||||||
if self.displaytype != "places":
|
if self.displaytype != "places":
|
||||||
# Need to wait the page is loaded to set the markers.
|
# Need to wait the page is loaded to set the markers.
|
||||||
gobject.timeout_add(1500, self._set_markersonpage, self.last_year)
|
gobject.timeout_add(1500, self._set_markers_and_crosshair_on_page, self.last_year)
|
||||||
|
|
||||||
def _set_markersonpage(self, widget):
|
def _set_markers_and_crosshair_on_page(self, widget):
|
||||||
"""
|
"""
|
||||||
get the year to select then call javascript
|
get the year to select then call javascript
|
||||||
"""
|
"""
|
||||||
@ -993,6 +996,9 @@ class GeoView(HtmlView):
|
|||||||
elif year != "no":
|
elif year != "no":
|
||||||
self.last_selected_year = year
|
self.last_selected_year = year
|
||||||
self._call_js_selectmarkers(year)
|
self._call_js_selectmarkers(year)
|
||||||
|
self.renderer.execute_script("javascript:addcrosshair('%d','%s')" %
|
||||||
|
(self._config.get("preferences.crosshair"),
|
||||||
|
self.crosspath))
|
||||||
|
|
||||||
def _call_js_selectmarkers(self, year):
|
def _call_js_selectmarkers(self, year):
|
||||||
"""
|
"""
|
||||||
@ -2252,7 +2258,6 @@ class GeoView(HtmlView):
|
|||||||
self.filter.hide()
|
self.filter.hide()
|
||||||
active = False
|
active = False
|
||||||
config.set('interface.filter', active)
|
config.set('interface.filter', active)
|
||||||
self.build_tree()
|
|
||||||
|
|
||||||
def filter_clicked(self):
|
def filter_clicked(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user