--- a/eric6/Snapshot/SnapshotRegionGrabber.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Snapshot/SnapshotRegionGrabber.py Tue Mar 02 17:17:09 2021 +0100
@@ -31,7 +31,7 @@
painter.save()
painter.setClipRegion(clip)
- painter.setPen(Qt.NoPen)
+ painter.setPen(Qt.PenStyle.NoPen)
painter.setBrush(outline)
painter.drawRect(rect)
if fill is not None and fill.isValid():
@@ -66,8 +66,11 @@
"""
super(SnapshotRegionGrabber, self).__init__(
None,
- Qt.X11BypassWindowManagerHint | Qt.WindowStaysOnTopHint |
- Qt.FramelessWindowHint | Qt.Tool)
+ Qt.WindowType.X11BypassWindowManagerHint |
+ Qt.WindowType.WindowStaysOnTopHint |
+ Qt.WindowType.FramelessWindowHint |
+ Qt.WindowType.Tool
+ )
if mode not in [SnapshotRegionGrabber.Rectangle,
SnapshotRegionGrabber.Ellipse]:
@@ -130,7 +133,7 @@
0, geom.x(), geom.y(), geom.width(), geom.height())
self.resize(self.__pixmap.size())
self.move(geom.x(), geom.y())
- self.setCursor(Qt.CrossCursor)
+ self.setCursor(Qt.CursorShape.CrossCursor)
self.show()
self.grabMouse()
@@ -150,11 +153,14 @@
pal = QPalette(QToolTip.palette())
font = QToolTip.font()
- handleColor = pal.color(QPalette.Active, QPalette.Highlight)
+ handleColor = pal.color(QPalette.ColorGroup.Active,
+ QPalette.ColorRole.Highlight)
handleColor.setAlpha(160)
overlayColor = QColor(0, 0, 0, 160)
- textColor = pal.color(QPalette.Active, QPalette.Text)
- textBackgroundColor = pal.color(QPalette.Active, QPalette.Base)
+ textColor = pal.color(QPalette.ColorGroup.Active,
+ QPalette.ColorRole.Text)
+ textBackgroundColor = pal.color(QPalette.ColorGroup.Active,
+ QPalette.ColorRole.Base)
painter.drawPixmap(0, 0, self.__pixmap)
painter.setFont(font)
@@ -162,12 +168,12 @@
if not self.__selection.isNull():
grey = QRegion(self.rect())
if self.__mode == SnapshotRegionGrabber.Ellipse:
- reg = QRegion(r, QRegion.Ellipse)
+ reg = QRegion(r, QRegion.RegionType.Ellipse)
else:
reg = QRegion(r)
grey = grey.subtracted(reg)
painter.setClipRegion(grey)
- painter.setPen(Qt.NoPen)
+ painter.setPen(Qt.PenStyle.NoPen)
painter.setBrush(overlayColor)
painter.drawRect(self.rect())
painter.setClipRect(self.rect())
@@ -178,13 +184,13 @@
painter.setBrush(textBackgroundColor)
self.__helpTextRect = painter.boundingRect(
self.rect().adjusted(2, 2, -2, -2),
- Qt.TextWordWrap, self.__helpText).translated(0, 0)
+ Qt.TextFlag.TextWordWrap, self.__helpText).translated(0, 0)
self.__helpTextRect.adjust(-2, -2, 4, 2)
drawRect(painter, self.__helpTextRect, textColor,
textBackgroundColor)
painter.drawText(
self.__helpTextRect.adjusted(3, 3, -3, -3),
- Qt.TextWordWrap, self.__helpText)
+ Qt.TextFlag.TextWordWrap, self.__helpText)
if self.__selection.isNull():
return
@@ -198,7 +204,8 @@
self.__locale.toString(self.__selection.width()),
self.__locale.toString(self.__selection.height())
)
- textRect = painter.boundingRect(self.rect(), Qt.AlignLeft, txt)
+ textRect = painter.boundingRect(self.rect(),
+ Qt.AlignmentFlag.AlignLeft, txt)
boundingRect = textRect.adjusted(-4, 0, 0, 0)
if (
@@ -236,7 +243,7 @@
# If the above didn't catch it, you are running on a very
# tiny screen...
drawRect(painter, boundingRect, textColor, textBackgroundColor)
- painter.drawText(textRect, Qt.AlignHCenter, txt)
+ painter.drawText(textRect, Qt.AlignmentFlag.AlignHCenter, txt)
if (
(r.height() > self.__handleSize * 2 and
@@ -244,7 +251,7 @@
not self.__mouseDown
):
self.__updateHandles()
- painter.setPen(Qt.NoPen)
+ painter.setPen(Qt.PenStyle.NoPen)
painter.setBrush(handleColor)
painter.setClipRegion(
self.__handleMask(SnapshotRegionGrabber.StrokeMask))
@@ -280,7 +287,7 @@
@param evt mouse press event (QMouseEvent)
"""
self.__showHelp = not self.__helpTextRect.contains(evt.pos())
- if evt.button() == Qt.LeftButton:
+ if evt.button() == Qt.MouseButton.LeftButton:
self.__mouseDown = True
self.__dragStartPoint = evt.pos()
self.__selectionBeforeDrag = QRect(self.__selection)
@@ -288,11 +295,11 @@
self.__newSelection = True
self.__selection = QRect()
else:
- self.setCursor(Qt.ClosedHandCursor)
- elif evt.button() == Qt.RightButton:
+ self.setCursor(Qt.CursorShape.ClosedHandCursor)
+ elif evt.button() == Qt.MouseButton.RightButton:
self.__newSelection = False
self.__selection = QRect()
- self.setCursor(Qt.CrossCursor)
+ self.setCursor(Qt.CursorShape.CrossCursor)
self.update()
def mouseMoveEvent(self, evt):
@@ -364,22 +371,22 @@
if not found:
self.__mouseOverHandle = None
if self.__selection.contains(evt.pos()):
- self.setCursor(Qt.OpenHandCursor)
+ self.setCursor(Qt.CursorShape.OpenHandCursor)
else:
- self.setCursor(Qt.CrossCursor)
+ self.setCursor(Qt.CursorShape.CrossCursor)
else:
if self.__mouseOverHandle in [self.__TLHandle,
self.__BRHandle]:
- self.setCursor(Qt.SizeFDiagCursor)
+ self.setCursor(Qt.CursorShape.SizeFDiagCursor)
elif self.__mouseOverHandle in [self.__TRHandle,
self.__BLHandle]:
- self.setCursor(Qt.SizeBDiagCursor)
+ self.setCursor(Qt.CursorShape.SizeBDiagCursor)
elif self.__mouseOverHandle in [self.__LHandle,
self.__RHandle]:
- self.setCursor(Qt.SizeHorCursor)
+ self.setCursor(Qt.CursorShape.SizeHorCursor)
elif self.__mouseOverHandle in [self.__THandle,
self.__BHandle]:
- self.setCursor(Qt.SizeVerCursor)
+ self.setCursor(Qt.CursorShape.SizeVerCursor)
def mouseReleaseEvent(self, evt):
"""
@@ -393,7 +400,7 @@
self.__mouseOverHandle is None and
self.__selection.contains(evt.pos())
):
- self.setCursor(Qt.OpenHandCursor)
+ self.setCursor(Qt.CursorShape.OpenHandCursor)
self.update()
def mouseDoubleClickEvent(self, evt):
@@ -410,9 +417,9 @@
@param evt key press event (QKeyEvent)
"""
- if evt.key() == Qt.Key_Escape:
+ if evt.key() == Qt.Key.Key_Escape:
self.grabbed.emit(QPixmap())
- elif evt.key() in [Qt.Key_Enter, Qt.Key_Return]:
+ elif evt.key() in [Qt.Key.Key_Enter, Qt.Key.Key_Return]:
self.__grabRect()
else:
evt.ignore()
@@ -504,7 +511,7 @@
Private method to grab the selected rectangle (i.e. do the snapshot).
"""
if self.__mode == SnapshotRegionGrabber.Ellipse:
- ell = QRegion(self.__selection, QRegion.Ellipse)
+ ell = QRegion(self.__selection, QRegion.RegionType.Ellipse)
if not ell.isEmpty():
self.__grabbing = True
@@ -513,23 +520,27 @@
translatedEll = ell.translated(xOffset, yOffset)
pixmap2 = QPixmap(ell.boundingRect().size())
- pixmap2.fill(Qt.transparent)
+ pixmap2.fill(Qt.GlobalColor.transparent)
pt = QPainter()
pt.begin(pixmap2)
- if pt.paintEngine().hasFeature(QPaintEngine.PorterDuff):
+ if pt.paintEngine().hasFeature(
+ QPaintEngine.PaintEngineFeature.PorterDuff
+ ):
pt.setRenderHints(
- QPainter.Antialiasing |
- QPainter.HighQualityAntialiasing |
- QPainter.SmoothPixmapTransform,
+ QPainter.RenderHint.Antialiasing |
+ QPainter.RenderHint.HighQualityAntialiasing |
+ QPainter.RenderHint.SmoothPixmapTransform,
True)
- pt.setBrush(Qt.black)
- pt.setPen(QPen(QBrush(Qt.black), 0.5))
+ pt.setBrush(Qt.GlobalColor.black)
+ pt.setPen(QPen(QBrush(Qt.GlobalColor.black), 0.5))
pt.drawEllipse(translatedEll.boundingRect())
- pt.setCompositionMode(QPainter.CompositionMode_SourceIn)
+ pt.setCompositionMode(
+ QPainter.CompositionMode.CompositionMode_SourceIn)
else:
pt.setClipRegion(translatedEll)
- pt.setCompositionMode(QPainter.CompositionMode_Source)
+ pt.setCompositionMode(
+ QPainter.CompositionMode.CompositionMode_Source)
pt.drawPixmap(pixmap2.rect(), self.__pixmap,
ell.boundingRect())
