--- a/eric7/Graphics/PixmapDiagram.py Sun May 16 11:43:59 2021 +0200 +++ b/eric7/Graphics/PixmapDiagram.py Sun May 16 20:07:24 2021 +0200 @@ -7,12 +7,14 @@ Module implementing a dialog showing a pixmap. """ -from PyQt5.QtCore import Qt, QSize, QEvent -from PyQt5.QtGui import QPalette, QImage, QPixmap, QPainter, QFont, QColor -from PyQt5.QtWidgets import ( - QLabel, QSizePolicy, QScrollArea, QAction, QMenu, QToolBar +from PyQt6.QtCore import Qt, QSize, QEvent +from PyQt6.QtGui import ( + QPalette, QImage, QPixmap, QPainter, QFont, QColor, QAction ) -from PyQt5.QtPrintSupport import QPrinter, QPrintDialog +from PyQt6.QtWidgets import ( + QLabel, QSizePolicy, QScrollArea, QMenu, QToolBar +) +from PyQt6.QtPrintSupport import QPrinter, QPrintDialog from E5Gui import E5MessageBox from E5Gui.E5MainWindow import E5MainWindow @@ -344,7 +346,7 @@ """ Private slot called to show a print preview of the diagram. """ - from PyQt5.QtPrintSupport import QPrintPreviewDialog + from PyQt6.QtPrintSupport import QPrintPreviewDialog printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution) printer.setFullPage(True) @@ -380,7 +382,7 @@ painter.begin(printer) # calculate margin and width of printout - font = QFont("times", 10) + font = QFont(["times"], 10) painter.setFont(font) fm = painter.fontMetrics() fontHeight = fm.lineSpacing()