summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-07 12:18:24 -0400
committerKali Kaneko <kali@leap.se>2016-04-08 10:38:45 -0400
commit130f1a8753bfe63f5575fc2011a15af9a0752170 (patch)
tree76bda13fb0dffb51fbee921742143b31218897d8 /src/leap
parent939fefc012213d3aa433caec47e2e0b19d64901e (diff)
[bug] allow resizing browser window
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py1
-rw-r--r--src/leap/bitmask/gui/qt_browser.py14
2 files changed, 11 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index ace3f863..168de8ed 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -579,6 +579,7 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
def _show_pixelated_browser(self):
win = PixelatedWindow(self)
win.show()
+ win.load_app()
def _update_eip_enabled_status(self, account=None, services=None):
"""
diff --git a/src/leap/bitmask/gui/qt_browser.py b/src/leap/bitmask/gui/qt_browser.py
index e480b363..b75bfb64 100644
--- a/src/leap/bitmask/gui/qt_browser.py
+++ b/src/leap/bitmask/gui/qt_browser.py
@@ -26,8 +26,14 @@ PIXELATED_URI = 'http://localhost:9090'
class PixelatedWindow(QtGui.QDialog):
def __init__(self, parent):
- QtGui.QDialog.__init__(self, parent)
- self.web = QtWebKit.QWebView(self)
- self.web.load(QtCore.QUrl(PIXELATED_URI))
+ super(PixelatedWindow, self).__init__(parent)
+ self.view = QtWebKit.QWebView(self)
+
+ layout = QtGui.QGridLayout()
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(self.view)
+ self.setLayout(layout)
self.setWindowTitle('Bitmask/Pixelated WebMail')
- self.web.show()
+
+ def load_app(self):
+ self.view.load(QtCore.QUrl(PIXELATED_URI))