Merge branch 'master' of ssh://tonks/qutebrowser

This commit is contained in:
Florian Bruhin 2014-11-30 17:30:27 +01:00
commit 302fcec3ed

View File

@ -121,6 +121,7 @@ class WebView(QWebView):
self.page().networkAccessManager().sslErrors.connect( self.page().networkAccessManager().sslErrors.connect(
lambda *args: setattr(self, '_has_ssl_errors', True)) lambda *args: setattr(self, '_has_ssl_errors', True))
self.viewing_source = False self.viewing_source = False
self.setZoomFactor(float(config.get('ui', 'default-zoom')) / 100)
def __repr__(self): def __repr__(self):
url = utils.elide(self.url().toDisplayString(), 50) url = utils.elide(self.url().toDisplayString(), 50)