summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-03-07 18:02:58 -0300
committerTomás Touceda <chiiph@leap.se>2014-03-07 18:02:58 -0300
commit2f46572ef137bb20c04f443a36361569b4b9e120 (patch)
tree5f821037b488eeee6d538854c6d22bd8befff063 /src/leap/bitmask/gui
parent540d6eb995ee87856f6670707309b8e4d5bfc282 (diff)
Remove qtreactor dependency
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py1
-rw-r--r--src/leap/bitmask/gui/twisted_main.py18
2 files changed, 1 insertions, 18 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index eeab7e2b..9ee62e17 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -134,6 +134,7 @@ class MainWindow(QtGui.QMainWindow):
:type bypass_checks: bool
"""
QtGui.QMainWindow.__init__(self)
+ self.menuBar().setNativeMenuBar(False)
# register leap events ########################################
register(signal=proto.UPDATER_NEW_UPDATES,
diff --git a/src/leap/bitmask/gui/twisted_main.py b/src/leap/bitmask/gui/twisted_main.py
index e11af7bd..1e876c57 100644
--- a/src/leap/bitmask/gui/twisted_main.py
+++ b/src/leap/bitmask/gui/twisted_main.py
@@ -27,24 +27,6 @@ from twisted.internet import error
logger = logging.getLogger(__name__)
-def start(app):
- """
- Start the mainloop.
-
- :param app: the main qt QApplication instance.
- :type app: QtCore.QApplication
- """
- from twisted.internet import reactor
- logger.debug('starting twisted reactor')
-
- # this seems to be troublesome under some
- # unidentified settings.
- #reactor.run()
-
- reactor.runReturn()
- app.exec_()
-
-
def quit(app):
"""
Stop the mainloop.