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

GeoView : Force gtkmozembed the first time instead of webkit.

Browse Source 
sidebar and bottombar don't use configuration parameter anymore.


svn: r16426
This commit is contained in:
Serge Noiraud 2011-01-21 20:25:03 +00:00
parent 680a780a8c
commit b4096bae73
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/view/geoview.py
View File

@ -303,7 +303,7 @@ class GeoView(HtmlView):
('preferences.network-timeout', 5), ('preferences.network-timeout', 5),
('preferences.network-periodicity', 10), ('preferences.network-periodicity', 10),
('preferences.network-site', 'www.gramps-project.org'), ('preferences.network-site', 'www.gramps-project.org'),
('preferences.webkit', True), ('preferences.webkit', False),
) )
def __init__(self, pdata, dbstate, uistate): def __init__(self, pdata, dbstate, uistate):
@ -484,10 +484,6 @@ class GeoView(HtmlView):
self.config_crosshair) self.config_crosshair)
self._config.connect("preferences.network-test", self._config.connect("preferences.network-test",
self.config_network_test) self.config_network_test)
self._config.connect("bottombar.visible",
self._size_request_for_bars)
self._config.connect("sidebar.visible",
self._size_request_for_bars)
def config_update_int(self, obj, constant): def config_update_int(self, obj, constant):
""" """
@ -908,7 +904,7 @@ class GeoView(HtmlView):
widget.parent.get_child2().get_allocation().height - 30 ) widget.parent.get_child2().get_allocation().height - 30 )
self.width = ( widget.parent.parent.get_allocation().width - self.width = ( widget.parent.parent.get_allocation().width -
widget.parent.parent.get_child2().get_allocation().width - 30 ) widget.parent.parent.get_child2().get_allocation().width - 30 )
if not self._config.get('sidebar.visible'): if not self.sidebar.is_visible():
if self.side is not None: if self.side is not None:
self.width = widget.parent.parent.get_allocation().width - 24 self.width = widget.parent.parent.get_allocation().width - 24
else: else:
@ -917,7 +913,7 @@ class GeoView(HtmlView):
_LOG.debug("No sidebar : map width=%d" % self.width ) _LOG.debug("No sidebar : map width=%d" % self.width )
else: else:
_LOG.debug("Sidebar : map width=%d" % self.width ) _LOG.debug("Sidebar : map width=%d" % self.width )
if not self._config.get('bottombar.visible'): if not self.bottombar.is_visible():
if self.bottom is not None: if self.bottom is not None:
self.height = ( widget.parent.get_allocation().height - self.header_size - 24 ) self.height = ( widget.parent.get_allocation().height - self.header_size - 24 )
else: else: