--- a/eric6/Snapshot/SnapshotFreehandGrabber.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Snapshot/SnapshotFreehandGrabber.py Tue Mar 02 17:17:09 2021 +0100
@@ -28,7 +28,8 @@
"""
clip = QRegion(polygon)
clip = clip - QRegion(polygon)
- pen = QPen(outline, 1, Qt.SolidLine, Qt.SquareCap, Qt.BevelJoin)
+ pen = QPen(outline, 1, Qt.PenStyle.SolidLine, Qt.PenCapStyle.SquareCap,
+ Qt.PenJoinStyle.BevelJoin)
painter.save()
painter.setClipRegion(clip)
@@ -55,8 +56,11 @@
"""
super(SnapshotFreehandGrabber, self).__init__(
None,
- Qt.X11BypassWindowManagerHint | Qt.WindowStaysOnTopHint |
- Qt.FramelessWindowHint | Qt.Tool)
+ Qt.WindowType.X11BypassWindowManagerHint |
+ Qt.WindowType.WindowStaysOnTopHint |
+ Qt.WindowType.FramelessWindowHint |
+ Qt.WindowType.Tool
+ )
self.__selection = QPolygon()
self.__mouseDown = False
@@ -99,7 +103,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()
@@ -119,11 +123,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)
@@ -132,8 +139,8 @@
# Draw outline around selection.
# Important: the 1px-wide outline is *also* part of the
# captured free-region
- pen = QPen(handleColor, 1, Qt.SolidLine, Qt.SquareCap,
- Qt.BevelJoin)
+ pen = QPen(handleColor, 1, Qt.PenStyle.SolidLine,
+ Qt.PenCapStyle.SquareCap, Qt.PenJoinStyle.BevelJoin)
painter.setPen(pen)
painter.drawPolygon(pol)
@@ -141,7 +148,7 @@
grey = QRegion(self.rect())
grey = grey - QRegion(pol)
painter.setClipRegion(grey)
- painter.setPen(Qt.NoPen)
+ painter.setPen(Qt.PenStyle.NoPen)
painter.setBrush(overlayColor)
painter.drawRect(self.rect())
painter.setClipRect(self.rect())
@@ -152,13 +159,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)
drawPolygon(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.isEmpty():
return
@@ -173,7 +180,8 @@
self.__locale.toString(boundingRect.width()),
self.__locale.toString(boundingRect.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)
polBoundingRect = pol.boundingRect()
@@ -227,14 +235,14 @@
# If the above didn't catch it, you are running on a very
# tiny screen...
drawPolygon(painter, boundingRect, textColor, textBackgroundColor)
- painter.drawText(textRect, Qt.AlignHCenter, txt)
+ painter.drawText(textRect, Qt.AlignmentFlag.AlignHCenter, txt)
if (
(polBoundingRect.height() > self.__handleSize * 2 and
polBoundingRect.width() > self.__handleSize * 2) or
not self.__mouseDown
):
- painter.setBrush(Qt.transparent)
+ painter.setBrush(Qt.GlobalColor.transparent)
painter.setClipRegion(QRegion(pol))
painter.drawPolygon(QPolygon(self.rect()))
@@ -247,19 +255,20 @@
self.__pBefore = evt.pos()
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 = QPolygon(self.__selection)
- if not self.__selection.containsPoint(evt.pos(), Qt.WindingFill):
+ if not self.__selection.containsPoint(evt.pos(),
+ Qt.FillRule.WindingFill):
self.__newSelection = True
self.__selection = QPolygon()
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 = QPolygon()
- self.setCursor(Qt.CrossCursor)
+ self.setCursor(Qt.CursorShape.CrossCursor)
self.update()
def mouseMoveEvent(self, evt):
@@ -288,10 +297,11 @@
if self.__selection.boundingRect().isEmpty():
return
- if self.__selection.containsPoint(evt.pos(), Qt.WindingFill):
- self.setCursor(Qt.OpenHandCursor)
+ if self.__selection.containsPoint(evt.pos(),
+ Qt.FillRule.WindingFill):
+ self.setCursor(Qt.CursorShape.OpenHandCursor)
else:
- self.setCursor(Qt.CrossCursor)
+ self.setCursor(Qt.CursorShape.CrossCursor)
def mouseReleaseEvent(self, evt):
"""
@@ -301,8 +311,8 @@
"""
self.__mouseDown = False
self.__newSelection = False
- if self.__selection.containsPoint(evt.pos(), Qt.WindingFill):
- self.setCursor(Qt.OpenHandCursor)
+ if self.__selection.containsPoint(evt.pos(), Qt.FillRule.WindingFill):
+ self.setCursor(Qt.CursorShape.OpenHandCursor)
self.update()
def mouseDoubleClickEvent(self, evt):
@@ -319,9 +329,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.__grabRegion()
else:
evt.ignore()
@@ -339,23 +349,27 @@
translatedPol = pol.translated(xOffset, yOffset)
pixmap2 = QPixmap(pol.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.drawPolygon(translatedPol)
- pt.setCompositionMode(QPainter.CompositionMode_SourceIn)
+ pt.setCompositionMode(
+ QPainter.CompositionMode.CompositionMode_SourceIn)
else:
pt.setClipRegion(QRegion(translatedPol))
- pt.setCompositionMode(QPainter.CompositionMode_Source)
+ pt.setCompositionMode(
+ QPainter.CompositionMode.CompositionMode_Source)
pt.drawPixmap(pixmap2.rect(), self.__pixmap, pol.boundingRect())
pt.end()
