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

GeoView : Invalid prefs.js path for gtkmozembed proxy.

Browse Source 
HtmlView doesn't need size: no more scrollbars.
          Adapt zoom to be sure all markers are visible.


svn: r11511
This commit is contained in:
Serge Noiraud 2008-12-23 18:28:33 +00:00
parent f7155868d8
commit 7b7cf2e792
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/DataViews/GeoView.py
View File

@ -203,7 +203,7 @@ class RendererMozilla(Renderer):
set_profile_path(MOZEMBED_PATH, MOZEMBED_SUBPATH) set_profile_path(MOZEMBED_PATH, MOZEMBED_SUBPATH)
self.__set_mozembed_proxy() self.__set_mozembed_proxy()
self.window = gtkmozembed.MozEmbed() self.window = gtkmozembed.MozEmbed()
self.window.set_size_request(800, 600) #self.window.set_size_request(800, 600)
self.browser = MOZIL self.browser = MOZIL
def open(self, url): def open(self, url):
@ -225,7 +225,7 @@ class RendererMozilla(Renderer):
proxy = os.environ['http_proxy'] proxy = os.environ['http_proxy']
if proxy: if proxy:
host_port = None host_port = None
prefs = open(MOZEMBED_PATH+MOZEMBED_SUBPATH+"/prefs.js","w+") prefs = open(MOZEMBED_SUBPATH+"/prefs.js","w+")
parts = urlparse.urlparse(proxy) parts = urlparse.urlparse(proxy)
if not parts[0] or parts[0] == 'http': if not parts[0] or parts[0] == 'http':
host_port = parts[1] host_port = parts[1]
@ -256,7 +256,7 @@ class RendererMozilla(Renderer):
prefs.close() prefs.close()
except: except:
try: # trying to remove pref.js in case of proxy change. try: # trying to remove pref.js in case of proxy change.
os.remove(MOZEMBED_PATH+MOZEMBED_SUBPATH+"/prefs.js") os.remove(MOZEMBED_SUBPATH+"/prefs.js")
except: except:
pass pass
pass # We don't use a proxy or the http_proxy variable is not set. pass # We don't use a proxy or the http_proxy variable is not set.
@ -377,7 +377,6 @@ class HtmlView(PageView.PageView):
</head> </head>
<body > <body >
<H4>%(content)s</H4> <H4>%(content)s</H4>
</div>
</body> </body>
</html> </html>
""" % { 'height' : 600, """ % { 'height' : 600,
@ -409,7 +408,7 @@ class GeoView(HtmlView):
# Create a temporary dot file # Create a temporary dot file
(handle,self.htmlfile) = tempfile.mkstemp(".html","GeoV", (handle,self.htmlfile) = tempfile.mkstemp(".html","GeoV",
MOZEMBED_PATH ) MOZEMBED_PATH+'/htmlview' )
def on_delete(self): def on_delete(self):
""" """
@ -860,7 +859,7 @@ class GeoView(HtmlView):
self.centered = 0 self.centered = 0
margin = 10 margin = 10
self.mapview.write(" <div id=\"map\" style=\"width: %dpx; height: %dpx; margin: %d\"></div>\n" % self.mapview.write(" <div id=\"map\" style=\"width: %dpx; height: %dpx; margin: %d\"></div>\n" %
( ( self.width - margin*2 ), ( self.height * 0.8 ), margin )) ( ( self.width - margin*4 ), ( self.height * 0.73 ), margin ))
self.mapview.write(" <script type=\"text/javascript\">\n") self.mapview.write(" <script type=\"text/javascript\">\n")
self.mapview.write(" var mapstraction = new Mapstraction('map','%s');\n"%self.usedmap) self.mapview.write(" var mapstraction = new Mapstraction('map','%s');\n"%self.usedmap)
self.mapview.write(" mapstraction.addControls({ pan: true, zoom: 'large', ") self.mapview.write(" mapstraction.addControls({ pan: true, zoom: 'large', ")
@ -952,6 +951,7 @@ class GeoView(HtmlView):
self.zoom = zoomlat self.zoom = zoomlat
else: else:
self.zoom = zoomlong self.zoom = zoomlong
self.zoom -= 1
LOG.debug("zoomlat = %f\n" % zoomlat) LOG.debug("zoomlat = %f\n" % zoomlat)
LOG.debug("zoomlong = %f\n" % zoomlong) LOG.debug("zoomlong = %f\n" % zoomlong)
LOG.debug("self.zoom = %f\n" % self.zoom) LOG.debug("self.zoom = %f\n" % self.zoom)