summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-03-23 19:30:54 -0400
committerKali Kaneko <kali@leap.se>2016-03-23 19:30:54 -0400
commitf9cb960dea642ec2e9cced1ab4712577cc0f3469 (patch)
treef2539f9b411ad8b1e5675e28a53c738d5e2da131 /src
parente92e4f1e4d57957af5d8c9e08a6c3c9152409612 (diff)
[feature] add QtWebView to render pixelated mua
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py8
-rw-r--r--src/leap/bitmask/gui/qt_browser.py13
-rw-r--r--src/leap/bitmask/gui/ui/mainwindow.ui6
3 files changed, 27 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 759b454f..1f497d2d 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -60,6 +60,8 @@ from leap.bitmask.util.keyring_helpers import has_keyring
from leap.common.events import register
from leap.common.events import catalog
+from .qt_browser import PixelatedWindow
+
from leap.mail.imap.service.imap import IMAP_PORT
from ui_mainwindow import Ui_MainWindow
@@ -218,6 +220,8 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
self._backend_connect()
self.ui.action_preferences.triggered.connect(self._show_preferences)
+ self.ui.action_pixelated_mail.triggered.connect(
+ self._show_pixelated_browser)
self.ui.action_about_leap.triggered.connect(self._about)
self.ui.action_quit.triggered.connect(self.quit)
self.ui.action_wizard.triggered.connect(self._show_wizard)
@@ -568,6 +572,10 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
pref_win = PreferencesWindow(self, account, self.app)
pref_win.show()
+ def _show_pixelated_browser(self):
+ win = PixelatedWindow(self)
+ win.show()
+
def _update_eip_enabled_status(self, account=None, services=None):
"""
TRIGGER:
diff --git a/src/leap/bitmask/gui/qt_browser.py b/src/leap/bitmask/gui/qt_browser.py
new file mode 100644
index 00000000..4bd947cb
--- /dev/null
+++ b/src/leap/bitmask/gui/qt_browser.py
@@ -0,0 +1,13 @@
+from PySide import QtCore, QtWebKit, QtGui
+
+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))
+ self.setWindowTitle('Bitmask/Pixelated WebMail')
+ self.web.show()
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index b1d68c4a..976c0c0a 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -315,6 +315,7 @@
</property>
<addaction name="action_create_new_account"/>
<addaction name="action_advanced_key_management"/>
+ <addaction name="action_pixelated_mail"/>
<addaction name="separator"/>
<addaction name="action_preferences"/>
<addaction name="separator"/>
@@ -370,6 +371,11 @@
<string>Create a new account...</string>
</property>
</action>
+ <action name="action_pixelated_mail">
+ <property name="text">
+ <string>Bitmask Webmail</string>
+ </property>
+ </action>
<action name="action_advanced_key_management">
<property name="enabled">
<bool>false</bool>