diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-04 15:33:31 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-04 15:45:04 -0300 |
| commit | 379d13b2b56a50251144c52273aa0352df7c0222 (patch) | |
| tree | 425d62327bae4043258d2172ce1ffcc90eb87c05 | |
| parent | eb329856512b9eb0ea3a7891af42c747837be427 (diff) | |
Do not do native menu bars in Linux for now
| -rw-r--r-- | changes/do_not_do_native_menu_in_linux | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changes/do_not_do_native_menu_in_linux b/changes/do_not_do_native_menu_in_linux new file mode 100644 index 00000000..2a117a7e --- /dev/null +++ b/changes/do_not_do_native_menu_in_linux @@ -0,0 +1 @@ +- Workaround a bug in Ubuntu where the menu is not displayed in the global menu bar. Fixes #5420.
\ No newline at end of file diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 04a98fac..5abfaa67 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -49,7 +49,7 @@ from leap.bitmask.gui.wizard import Wizard from leap.bitmask.gui.systray import SysTray from leap.bitmask import provider -from leap.bitmask.platform_init import IS_WIN, IS_MAC +from leap.bitmask.platform_init import IS_WIN, IS_MAC, IS_LINUX from leap.bitmask.platform_init.initializers import init_platform from leap.bitmask import backend @@ -157,7 +157,7 @@ class MainWindow(QtGui.QMainWindow): # setup UI self.ui = Ui_MainWindow() self.ui.setupUi(self) - self.menuBar().setNativeMenuBar(True) + self.menuBar().setNativeMenuBar(not IS_LINUX) self._backend = backend.Backend(bypass_checks) self._backend.start() |