diff -r ad8ed15f90e5 -r a02b03b7bfec UI/UserInterface.py
--- a/UI/UserInterface.py Sun Mar 04 14:55:23 2018 +0100
+++ b/UI/UserInterface.py Mon Apr 02 12:04:18 2018 +0200
@@ -2566,7 +2566,9 @@
"""
self.__menus = {}
mb = self.menuBar()
- if Utilities.isLinuxPlatform():
+ # TODO: make this configurable (True default)
+ if Utilities.isLinuxPlatform() and \
+ not Preferences.getUI("UseNativeMenuBar"):
mb.setNativeMenuBar(False)
self.__menus["file"] = self.viewmanager.initFileMenu()
@@ -3720,12 +3722,12 @@
name = act.data()
if name:
if name == "__SHOW__":
- for text, tb in list(self.__toolbars.values()):
+ for _text, tb in self.__toolbars.values():
tb.show()
if self.__menus["toolbars"].isTearOffMenuVisible():
self.__menus["toolbars"].hideTearOffMenu()
elif name == "__HIDE__":
- for text, tb in list(self.__toolbars.values()):
+ for _text, tb in self.__toolbars.values():
tb.hide()
if self.__menus["toolbars"].isTearOffMenuVisible():
self.__menus["toolbars"].hideTearOffMenu()
@@ -3746,10 +3748,10 @@
name = act.data()
if name:
if name == "__SHOW__":
- for text, tb in list(self.__toolbars.values()):
+ for _text, tb in self.__toolbars.values():
tb.show()
elif name == "__HIDE__":
- for text, tb in list(self.__toolbars.values()):
+ for _text, tb in self.__toolbars.values():
tb.hide()
else:
tb = self.__toolbars[name][1]
@@ -4948,7 +4950,7 @@
ioEncoding = Preferences.getSystem("IOEncoding")
# loop through all running tool processes
- for program, toolProc, toolProcData in self.toolProcs:
+ for program, toolProc, _toolProcData in self.toolProcs:
toolProc.setReadChannel(QProcess.StandardError)
while toolProc.canReadLine():
