--- a/src/eric7/Debugger/DebugUI.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Debugger/DebugUI.py Tue Oct 18 16:06:21 2022 +0200
@@ -15,11 +15,11 @@
from PyQt6.QtGui import QKeySequence
from PyQt6.QtWidgets import QMenu, QToolBar, QApplication, QDialog
-from EricGui.EricAction import EricAction, createActionGroup
-from EricWidgets import EricMessageBox
-
-from UI.Info import Program
-from UI.NotificationWidget import NotificationTypes
+from eric7.EricGui.EricAction import EricAction, createActionGroup
+from eric7.EricWidgets import EricMessageBox
+
+from eric7.UI.Info import Program
+from eric7.UI.NotificationWidget import NotificationTypes
from .DebugClientCapabilities import (
HasDebugger,
@@ -28,12 +28,11 @@
HasCoverage,
)
-from Globals import recentNameBreakpointConditions
-
-import Preferences
-import Utilities
-import UI.PixmapCache
-import UI.Config
+from eric7.Globals import recentNameBreakpointConditions
+
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.UI import Config
class DebugUI(QObject):
@@ -210,7 +209,7 @@
@type int
"""
self.ui.showNotification(
- UI.PixmapCache.getPixmap("debug48"),
+ EricPixmapCache.getPixmap("debug48"),
self.tr("Notification"),
notification,
kind=kind,
@@ -238,7 +237,7 @@
self.runAct = EricAction(
self.tr("Run Script"),
- UI.PixmapCache.getIcon("runScript"),
+ EricPixmapCache.getIcon("runScript"),
self.tr("&Run Script..."),
Qt.Key.Key_F2,
0,
@@ -259,7 +258,7 @@
self.runProjectAct = EricAction(
self.tr("Run Project"),
- UI.PixmapCache.getIcon("runProject"),
+ EricPixmapCache.getIcon("runProject"),
self.tr("Run &Project..."),
QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F2),
0,
@@ -281,7 +280,7 @@
self.coverageAct = EricAction(
self.tr("Coverage run of Script"),
- UI.PixmapCache.getIcon("coverageScript"),
+ EricPixmapCache.getIcon("coverageScript"),
self.tr("Coverage run of Script..."),
0,
0,
@@ -304,7 +303,7 @@
self.coverageProjectAct = EricAction(
self.tr("Coverage run of Project"),
- UI.PixmapCache.getIcon("coverageProject"),
+ EricPixmapCache.getIcon("coverageProject"),
self.tr("Coverage run of Project..."),
0,
0,
@@ -328,7 +327,7 @@
self.profileAct = EricAction(
self.tr("Profile Script"),
- UI.PixmapCache.getIcon("profileScript"),
+ EricPixmapCache.getIcon("profileScript"),
self.tr("Profile Script..."),
0,
0,
@@ -348,7 +347,7 @@
self.profileProjectAct = EricAction(
self.tr("Profile Project"),
- UI.PixmapCache.getIcon("profileProject"),
+ EricPixmapCache.getIcon("profileProject"),
self.tr("Profile Project..."),
0,
0,
@@ -369,7 +368,7 @@
self.debugAct = EricAction(
self.tr("Debug Script"),
- UI.PixmapCache.getIcon("debugScript"),
+ EricPixmapCache.getIcon("debugScript"),
self.tr("&Debug Script..."),
Qt.Key.Key_F5,
0,
@@ -391,7 +390,7 @@
self.debugProjectAct = EricAction(
self.tr("Debug Project"),
- UI.PixmapCache.getIcon("debugProject"),
+ EricPixmapCache.getIcon("debugProject"),
self.tr("Debug &Project..."),
QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F5),
0,
@@ -413,7 +412,7 @@
self.restartAct = EricAction(
self.tr("Restart"),
- UI.PixmapCache.getIcon("debugRestart"),
+ EricPixmapCache.getIcon("debugRestart"),
self.tr("Restart"),
Qt.Key.Key_F4,
0,
@@ -435,7 +434,7 @@
self.stopAct = EricAction(
self.tr("Stop"),
- UI.PixmapCache.getIcon("stopScript"),
+ EricPixmapCache.getIcon("stopScript"),
self.tr("Stop"),
QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F10),
0,
@@ -456,7 +455,7 @@
act = EricAction(
self.tr("Continue"),
- UI.PixmapCache.getIcon("continue"),
+ EricPixmapCache.getIcon("continue"),
self.tr("&Continue"),
Qt.Key.Key_F6,
0,
@@ -477,7 +476,7 @@
act = EricAction(
self.tr("Continue to Cursor"),
- UI.PixmapCache.getIcon("continueToCursor"),
+ EricPixmapCache.getIcon("continueToCursor"),
self.tr("Continue &To Cursor"),
QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F6),
0,
@@ -502,7 +501,7 @@
act = EricAction(
self.tr("Continue Until"),
- UI.PixmapCache.getIcon("continueUntil"),
+ EricPixmapCache.getIcon("continueUntil"),
self.tr("Continue &Until"),
QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_F6),
0,
@@ -528,7 +527,7 @@
act = EricAction(
self.tr("Move Instruction Pointer to Cursor"),
- UI.PixmapCache.getIcon("moveInstructionPointer"),
+ EricPixmapCache.getIcon("moveInstructionPointer"),
self.tr("&Jump To Cursor"),
Qt.Key.Key_F12,
0,
@@ -557,7 +556,7 @@
act = EricAction(
self.tr("Single Step"),
- UI.PixmapCache.getIcon("step"),
+ EricPixmapCache.getIcon("step"),
self.tr("Sin&gle Step"),
Qt.Key.Key_F7,
0,
@@ -579,7 +578,7 @@
act = EricAction(
self.tr("Step Over"),
- UI.PixmapCache.getIcon("stepOver"),
+ EricPixmapCache.getIcon("stepOver"),
self.tr("Step &Over"),
Qt.Key.Key_F8,
0,
@@ -607,7 +606,7 @@
act = EricAction(
self.tr("Step Out"),
- UI.PixmapCache.getIcon("stepOut"),
+ EricPixmapCache.getIcon("stepOut"),
self.tr("Step Ou&t"),
Qt.Key.Key_F9,
0,
@@ -634,7 +633,7 @@
act = EricAction(
self.tr("Stop"),
- UI.PixmapCache.getIcon("stepQuit"),
+ EricPixmapCache.getIcon("stepQuit"),
self.tr("&Stop"),
Qt.Key.Key_F10,
0,
@@ -714,7 +713,7 @@
self.dbgToggleBpAct = EricAction(
self.tr("Toggle Breakpoint"),
- UI.PixmapCache.getIcon("breakpointToggle"),
+ EricPixmapCache.getIcon("breakpointToggle"),
self.tr("Toggle Breakpoint"),
QKeySequence(self.tr("Shift+F11", "Debug|Toggle Breakpoint")),
0,
@@ -734,7 +733,7 @@
self.dbgEditBpAct = EricAction(
self.tr("Edit Breakpoint"),
- UI.PixmapCache.getIcon("cBreakpointToggle"),
+ EricPixmapCache.getIcon("cBreakpointToggle"),
self.tr("Edit Breakpoint..."),
QKeySequence(self.tr("Shift+F12", "Debug|Edit Breakpoint")),
0,
@@ -754,7 +753,7 @@
self.dbgNextBpAct = EricAction(
self.tr("Next Breakpoint"),
- UI.PixmapCache.getIcon("breakpointNext"),
+ EricPixmapCache.getIcon("breakpointNext"),
self.tr("Next Breakpoint"),
QKeySequence(self.tr("Ctrl+Shift+PgDown", "Debug|Next Breakpoint")),
0,
@@ -773,7 +772,7 @@
self.dbgPrevBpAct = EricAction(
self.tr("Previous Breakpoint"),
- UI.PixmapCache.getIcon("breakpointPrevious"),
+ EricPixmapCache.getIcon("breakpointPrevious"),
self.tr("Previous Breakpoint"),
QKeySequence(self.tr("Ctrl+Shift+PgUp", "Debug|Previous Breakpoint")),
0,
@@ -868,7 +867,7 @@
@return the generated toolbars (list of QToolBar)
"""
starttb = QToolBar(self.tr("Start"), self.ui)
- starttb.setIconSize(UI.Config.ToolBarIconSize)
+ starttb.setIconSize(Config.ToolBarIconSize)
starttb.setObjectName("StartToolbar")
starttb.setToolTip(self.tr("Start"))
@@ -882,7 +881,7 @@
starttb.addAction(self.debugProjectAct)
debugtb = QToolBar(self.tr("Debug"), self.ui)
- debugtb.setIconSize(UI.Config.ToolBarIconSize)
+ debugtb.setIconSize(Config.ToolBarIconSize)
debugtb.setObjectName("DebugToolbar")
debugtb.setToolTip(self.tr("Debug"))
@@ -1358,7 +1357,7 @@
timeout = None
kind = NotificationTypes.INFORMATION
self.ui.showNotification(
- UI.PixmapCache.getPixmap("debug48"),
+ EricPixmapCache.getPixmap("debug48"),
self.tr("Program terminated"),
msg,
kind=kind,
