diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Debugger/DebugViewer.py
--- a/src/eric7/Debugger/DebugViewer.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Debugger/DebugViewer.py Tue Oct 18 16:06:21 2022 +0200
@@ -39,10 +39,10 @@
QSplitter,
)
-import UI.PixmapCache
-import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7 import Preferences
-from EricWidgets.EricTabWidget import EricTabWidget
+from eric7.EricWidgets.EricTabWidget import EricTabWidget
class DebugViewer(QWidget):
@@ -94,7 +94,7 @@
self.debugServer = debugServer
self.debugUI = None
- self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
+ self.setWindowIcon(EricPixmapCache.getIcon("eric"))
self.__mainLayout = QVBoxLayout()
self.__mainLayout.setContentsMargins(0, 3, 0, 0)
@@ -173,7 +173,7 @@
self.gvvWidgetVLayout.addLayout(self.gvvWidgetHLayout)
index = self.__tabWidget.addTab(
- self.gvvWidget, UI.PixmapCache.getIcon("globalVariables"), ""
+ self.gvvWidget, EricPixmapCache.getIcon("globalVariables"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows the list of global variables and their values.")
@@ -243,7 +243,7 @@
self.lvvWidgetVLayout.addLayout(self.lvvWidgetHLayout2)
index = self.__tabWidget.addTab(
- self.lvvWidget, UI.PixmapCache.getIcon("localVariables"), ""
+ self.lvvWidget, EricPixmapCache.getIcon("localVariables"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows the list of local variables and their values.")
@@ -263,7 +263,7 @@
# add the call stack viewer
self.callStackViewer = CallStackViewer(self.debugServer)
index = self.__tabWidget.addTab(
- self.callStackViewer, UI.PixmapCache.getIcon("callStack"), ""
+ self.callStackViewer, EricPixmapCache.getIcon("callStack"), ""
)
self.__tabWidget.setTabToolTip(index, self.tr("Shows the current call stack."))
self.callStackViewer.sourceFile.connect(self.sourceFile)
@@ -274,7 +274,7 @@
# add the call trace viewer
self.callTraceViewer = CallTraceViewer(self.debugServer, self)
index = self.__tabWidget.addTab(
- self.callTraceViewer, UI.PixmapCache.getIcon("callTrace"), ""
+ self.callTraceViewer, EricPixmapCache.getIcon("callTrace"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows a trace of the program flow.")
@@ -287,7 +287,7 @@
self.breakpointViewer = BreakPointViewer()
self.breakpointViewer.setModel(self.debugServer.getBreakPointModel())
index = self.__tabWidget.addTab(
- self.breakpointViewer, UI.PixmapCache.getIcon("breakpoints"), ""
+ self.breakpointViewer, EricPixmapCache.getIcon("breakpoints"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows a list of defined breakpoints.")
@@ -300,7 +300,7 @@
self.watchpointViewer = WatchPointViewer()
self.watchpointViewer.setModel(self.debugServer.getWatchPointModel())
index = self.__tabWidget.addTab(
- self.watchpointViewer, UI.PixmapCache.getIcon("watchpoints"), ""
+ self.watchpointViewer, EricPixmapCache.getIcon("watchpoints"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows a list of defined watchpoints.")
@@ -311,20 +311,20 @@
# add the exception logger
self.exceptionLogger = ExceptionLogger()
index = self.__tabWidget.addTab(
- self.exceptionLogger, UI.PixmapCache.getIcon("exceptions"), ""
+ self.exceptionLogger, EricPixmapCache.getIcon("exceptions"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows a list of raised exceptions.")
)
- from UI.PythonDisViewer import PythonDisViewer, PythonDisViewerModes
+ from eric7.UI.PythonDisViewer import PythonDisViewer, PythonDisViewerModes
# add the Python disassembly viewer
self.disassemblyViewer = PythonDisViewer(
None, mode=PythonDisViewerModes.TRACEBACK
)
index = self.__tabWidget.addTab(
- self.disassemblyViewer, UI.PixmapCache.getIcon("disassembly"), ""
+ self.disassemblyViewer, EricPixmapCache.getIcon("disassembly"), ""
)
self.__tabWidget.setTabToolTip(
index, self.tr("Shows a code disassembly in case of an exception.")
@@ -869,7 +869,7 @@
stateText = DebugViewer.StateMessage[state]
except KeyError:
stateText = self.tr("unknown state ({0})").format(state)
- debuggerItem.setIcon(0, UI.PixmapCache.getIcon(iconName))
+ debuggerItem.setIcon(0, EricPixmapCache.getIcon(iconName))
debuggerItem.setData(0, self.DebuggerStateRole, state)
debuggerItem.setText(1, stateText)
@@ -934,7 +934,7 @@
iconName = DebugViewer.StateIcon["running"]
itm = QTreeWidgetItem(debuggerItem, [thread["name"], stateText])
itm.setData(0, self.ThreadIdRole, thread["id"])
- itm.setIcon(0, UI.PixmapCache.getIcon(iconName))
+ itm.setIcon(0, EricPixmapCache.getIcon(iconName))
if currentChild == thread["name"]:
self.__debuggersList.setCurrentItem(itm)
if thread["id"] == currentID:
@@ -997,7 +997,7 @@
stateText = DebugViewer.StateMessage[state]
except KeyError:
stateText = self.tr("unknown state ({0})").format(state)
- childItem.setIcon(0, UI.PixmapCache.getIcon(iconName))
+ childItem.setIcon(0, EricPixmapCache.getIcon(iconName))
childItem.setText(1, stateText)
self.__debuggersList.header().resizeSections(
