diff options
| author | Kali Kaneko <kali@leap.se> | 2014-03-10 03:27:10 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-03-10 03:27:10 -0400 |
| commit | b762e09f6f20c07fccc66325079584213388102d (patch) | |
| tree | e05bb63f227a46c7f4c1aefe5a766408230a3169 /src/leap/bitmask/gui | |
| parent | 92290fa7df14fd6282b362dba39b01c562a5725c (diff) | |
| parent | 2f46572ef137bb20c04f443a36361569b4b9e120 (diff) | |
Merge remote-tracking branch 'chiiph/feature/remove_qtreactor' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/twisted_main.py | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 5dc9b0f3..004d135b 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. |