diff -r e2b36c2167b7 -r 5371a22cf2aa eric6/UI/UserInterface.py
--- a/eric6/UI/UserInterface.py Sat Sep 05 11:26:33 2020 +0200
+++ b/eric6/UI/UserInterface.py Sat Oct 03 11:13:46 2020 +0200
@@ -448,6 +448,8 @@
self.debugViewer.exceptionLogger.addException)
debugServer.clientLine.connect(
self.debugViewer.breakpointViewer.highlightBreakpoint)
+ debugServer.clientDisassembly.connect(
+ self.debugViewer.disassemblyViewer.showDisassembly)
debugServer.clientProcessStdout.connect(self.appendToStdout)
debugServer.clientProcessStderr.connect(self.appendToStderr)
debugServer.appendStdout.connect(self.appendToStdout)
@@ -486,6 +488,8 @@
self.preferencesChanged.connect(
self.backgroundService.preferencesOrProjectChanged)
self.preferencesChanged.connect(self.__previewer.preferencesChanged)
+ self.preferencesChanged.connect(self.__astViewer.preferencesChanged)
+ self.preferencesChanged.connect(self.__disViewer.preferencesChanged)
if self.browser is not None:
self.browser.sourceFile[str].connect(
@@ -789,6 +793,12 @@
self.__astViewer = PythonAstViewer(self.viewmanager, splitter)
splitter.addWidget(self.__astViewer)
+ # Create DIS viewer
+ logging.debug("Creating Python Disassembly Viewer")
+ from .PythonDisViewer import PythonDisViewer
+ self.__disViewer = PythonDisViewer(self.viewmanager, parent=splitter)
+ splitter.addWidget(self.__disViewer)
+
# Create layout with toolbox windows embedded in dock windows
if self.__layoutType == "Toolboxes":
logging.debug("Creating toolboxes...")
@@ -3688,7 +3698,7 @@
if deleteAttachFile:
os.remove(attachFile)
else:
- body = "\r\n----\r\n{0}----\r\n{1}----\r\n{2}".format(
+ body = "\r\n----\r\n{0}\r\n----\r\n{1}\r\n----\r\n{2}".format(
Utilities.generateVersionInfo("\r\n"),
Utilities.generatePluginsVersionInfo("\r\n"),
Utilities.generateDistroInfo("\r\n"))
@@ -4154,7 +4164,7 @@
"""
menu.clear()
- for name, (text, tb, category) in sorted(
+ for name, (text, tb, _category) in sorted(
self.__toolbars.items(), key=lambda t: t[1][0]
):
act = menu.addAction(text)
@@ -4196,12 +4206,12 @@
name = act.data()
if name:
if name == "__SHOW__":
- for _text, tb, category in self.__toolbars.values():
+ for _text, tb, _category in self.__toolbars.values():
tb.show()
if self.__menus["toolbars"].isTearOffMenuVisible():
self.__menus["toolbars"].hideTearOffMenu()
elif name == "__HIDE__":
- for _text, tb, category in self.__toolbars.values():
+ for _text, tb, _category in self.__toolbars.values():
tb.hide()
if self.__menus["toolbars"].isTearOffMenuVisible():
self.__menus["toolbars"].hideTearOffMenu()
@@ -4223,10 +4233,10 @@
name = act.data()
if name:
if name == "__SHOW__":
- for _text, tb, category in self.__toolbars.values():
+ for _text, tb, _category in self.__toolbars.values():
tb.show()
elif name == "__HIDE__":
- for _text, tb, category in self.__toolbars.values():
+ for _text, tb, _category in self.__toolbars.values():
tb.hide()
else:
tb = self.__toolbars[name][1]
