--- a/eric6/Debugger/DebugViewer.py Tue Jan 28 19:41:51 2020 +0100 +++ b/eric6/Debugger/DebugViewer.py Wed Jan 29 18:47:35 2020 +0100 @@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal from PyQt5.QtWidgets import ( QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QSizePolicy, QPushButton, - QComboBox, QLabel, QTreeWidget, QTreeWidgetItem, QHeaderView + QComboBox, QLabel, QTreeWidget, QTreeWidgetItem, QHeaderView, QFrame ) import UI.PixmapCache @@ -68,6 +68,25 @@ self.__mainLayout.setContentsMargins(0, 0, 0, 0) self.setLayout(self.__mainLayout) + # add the viewer showing the connected debug backends + self.__debuggersLayout = QHBoxLayout(self) + self.__debuggersLayout.addWidget(QLabel(self.tr("Debuggers:"))) + self.__debuggersCombo = QComboBox(self) + self.__debuggersCombo.setSizePolicy( + QSizePolicy.Expanding, QSizePolicy.Fixed) + self.__debuggersLayout.addWidget(self.__debuggersCombo) + self.__mainLayout.addLayout(self.__debuggersLayout) + + self.__debuggersCombo.currentTextChanged.connect( + self.__debuggerSelected) + + # add a line to separate debugger selector from debugger specific parts + hline = QFrame(self) + hline.setFrameStyle(QFrame.Sunken) + hline.setFrameShape(QFrame.HLine) + self.__mainLayout.addWidget(hline) + + # add the tab widget containing various debug related views self.__tabWidget = E5TabWidget() self.__mainLayout.addWidget(self.__tabWidget) @@ -239,18 +258,6 @@ self.__threadList.currentItemChanged.connect(self.__threadSelected) - # add the debugger viewer - self.__debuggersLayout = QHBoxLayout(self) - self.__debuggersLayout.addWidget(QLabel(self.tr("Debuggers:"))) - self.__debuggersCombo = QComboBox(self) - self.__debuggersCombo.setSizePolicy( - QSizePolicy.Expanding, QSizePolicy.Fixed) - self.__debuggersLayout.addWidget(self.__debuggersCombo) - self.__mainLayout.addLayout(self.__debuggersLayout) - - self.__debuggersCombo.currentTextChanged.connect( - self.__debuggerSelected) - self.__mainLayout.setStretchFactor(self.__tabWidget, 5) self.__mainLayout.setStretchFactor(self.__threadList, 1) @@ -528,6 +535,7 @@ self.currentStack = None self.stackComboBox.clear() self.__threadList.clear() + self.callStackViewer.clear() self.debugUI.getDebuggerData(debuggerId)