--- a/src/eric7/Graphics/SvgDiagram.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Graphics/SvgDiagram.py Tue Oct 18 16:06:21 2022 +0200 @@ -13,12 +13,13 @@ from PyQt6.QtPrintSupport import QPrinter, QPrintDialog from PyQt6.QtSvgWidgets import QSvgWidget -from EricWidgets.EricMainWindow import EricMainWindow -from EricWidgets.EricZoomWidget import EricZoomWidget +from eric7.EricWidgets.EricMainWindow import EricMainWindow +from eric7.EricWidgets.EricZoomWidget import EricZoomWidget -import UI.Config +from eric7.EricGui import EricPixmapCache +from eric7.UI import Config -import Preferences +from eric7 import Preferences class SvgDiagram(EricMainWindow): @@ -91,9 +92,9 @@ self.setCentralWidget(self.svgView) self.__zoomWidget = EricZoomWidget( - UI.PixmapCache.getPixmap("zoomOut"), - UI.PixmapCache.getPixmap("zoomIn"), - UI.PixmapCache.getPixmap("zoomReset"), + EricPixmapCache.getPixmap("zoomOut"), + EricPixmapCache.getPixmap("zoomIn"), + EricPixmapCache.getPixmap("zoomReset"), self, ) self.statusBar().addPermanentWidget(self.__zoomWidget) @@ -118,14 +119,18 @@ """ Private method to initialize the view actions. """ - self.closeAct = QAction(UI.PixmapCache.getIcon("close"), self.tr("Close"), self) + self.closeAct = QAction( + EricPixmapCache.getIcon("close"), self.tr("Close"), self + ) self.closeAct.triggered.connect(self.close) - self.printAct = QAction(UI.PixmapCache.getIcon("print"), self.tr("Print"), self) + self.printAct = QAction( + EricPixmapCache.getIcon("print"), self.tr("Print"), self + ) self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self + EricPixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self ) self.printPreviewAct.triggered.connect(self.__printPreviewDiagram) @@ -156,11 +161,11 @@ Private method to populate the toolbars with our actions. """ self.windowToolBar = QToolBar(self.tr("Window"), self) - self.windowToolBar.setIconSize(UI.Config.ToolBarIconSize) + self.windowToolBar.setIconSize(Config.ToolBarIconSize) self.windowToolBar.addAction(self.closeAct) self.graphicsToolBar = QToolBar(self.tr("Graphics"), self) - self.graphicsToolBar.setIconSize(UI.Config.ToolBarIconSize) + self.graphicsToolBar.setIconSize(Config.ToolBarIconSize) self.graphicsToolBar.addAction(self.printPreviewAct) self.graphicsToolBar.addAction(self.printAct)