eric: comparison eric6/IconEditor/IconEditorGrid.py

-:e01ae92db699
+:31965986ecd1
 @param parent reference to the parent widget (QWidget)
 """
 super(IconEditorGrid, self).__init__(parent)
-self.setAttribute(Qt.WA_StaticContents)
+self.setAttribute(Qt.WidgetAttribute.WA_StaticContents)
-self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
+self.setSizePolicy(QSizePolicy.Policy.Minimum,
+QSizePolicy.Policy.Minimum)
-self.__curColor = Qt.black
+self.__curColor = Qt.GlobalColor.black
 self.__zoom = 12
 self.__curTool = self.Pencil
 self.__startPos = QPoint()
 self.__endPos = QPoint()
 self.__dirty = False
 self.__pasteRect = QRect()
 self.__undoStack = QUndoStack(self)
 self.__currentUndoCmd = None
-self.__image = QImage(32, 32, QImage.Format_ARGB32)
+self.__image = QImage(32, 32, QImage.Format.Format_ARGB32)
 self.__image.fill(qRgba(0, 0, 0, 0))
 self.__markImage = QImage(self.__image)
 self.__markImage.fill(self.NoMarkColor.rgba())
-self.__compositingMode = QPainter.CompositionMode_SourceOver
+self.__compositingMode = (
+QPainter.CompositionMode.CompositionMode_SourceOver
+)
 self.__lastPos = (-1, -1)
 self.__gridEnabled = True
 self.__selectionAvailable = False
 """
 Private method to initialize the various cursors.
 """
 cursorsPath = os.path.join(os.path.dirname(__file__), "cursors")
-self.__normalCursor = QCursor(Qt.ArrowCursor)
+self.__normalCursor = QCursor(Qt.CursorShape.ArrowCursor)
 pix = QPixmap(os.path.join(cursorsPath, "colorpicker-cursor.xpm"))
 mask = pix.createHeuristicMask()
 pix.setMask(mask)
 self.__colorPickerCursor = QCursor(pix, 1, 21)
 @param newImage reference to the new image (QImage)
 @param undoRedo flag indicating an undo or redo operation (boolean)
 @param clearUndo flag indicating to clear the undo stack (boolean)
 """
 if newImage != self.__image:
-self.__image = newImage.convertToFormat(QImage.Format_ARGB32)
+self.__image = newImage.convertToFormat(
+QImage.Format.Format_ARGB32)
 self.update()
 self.updateGeometry()
 self.resize(self.sizeHint())
 self.__markImage = QImage(self.__image)
 0, self.__zoom * j,
 self.__zoom * self.__image.width(), self.__zoom * j)
 j += 1
 col = QColor("#aaa")
-painter.setPen(Qt.DashLine)
+painter.setPen(Qt.PenStyle.DashLine)
 for i in range(0, self.__image.width()):
 for j in range(0, self.__image.height()):
 rect = self.__pixelRect(i, j)
 if evt.region().intersects(rect):
 color = QColor.fromRgba(self.__image.pixel(i, j))
-painter.fillRect(rect, QBrush(Qt.white))
+painter.fillRect(rect, QBrush(Qt.GlobalColor.white))
 painter.fillRect(QRect(rect.topLeft(), rect.center()), col)
 painter.fillRect(QRect(rect.center(), rect.bottomRight()),
 col)
 painter.fillRect(rect, QBrush(color))
 """
 Protected method to handle mouse button press events.
 @param evt reference to the mouse event object (QMouseEvent)
 """
-if evt.button() == Qt.LeftButton:
+if evt.button() == Qt.MouseButton.LeftButton:
 if self.__isPasting:
 self.__isPasting = False
 self.editPaste(True)
 self.__markImage.fill(self.NoMarkColor.rgba())
 self.update(self.__pasteRect)
 @param evt reference to the mouse event object (QMouseEvent)
 """
 self.positionChanged.emit(*self.__imageCoordinates(evt.pos()))
-if self.__isPasting and not (evt.buttons() & Qt.LeftButton):
+if (
+self.__isPasting and
+not (evt.buttons() & Qt.MouseButton.LeftButton)
+):
 self.__drawPasteRect(evt.pos())
 return
-if evt.buttons() & Qt.LeftButton:
+if evt.buttons() & Qt.MouseButton.LeftButton:
 if self.__curTool == self.Pencil:
 self.__setImagePixel(evt.pos(), True)
 self.setDirty(True)
 elif self.__curTool == self.Rubber:
 self.__setImagePixel(evt.pos(), False)
 """
 Protected method to handle mouse button release events.
 @param evt reference to the mouse event object (QMouseEvent)
 """
-if evt.button() == Qt.LeftButton:
+if evt.button() == Qt.MouseButton.LeftButton:
 if self.__curTool in [self.Pencil, self.Rubber]:
 if self.__currentUndoCmd:
 self.__currentUndoCmd.setAfterImage(self.__image)
 self.__currentUndoCmd = None
 valid image (boolean)
 """
 img = QApplication.clipboard().image()
 ok = not img.isNull()
 if ok:
-img = img.convertToFormat(QImage.Format_ARGB32)
+img = img.convertToFormat(QImage.Format.Format_ARGB32)
 return img, ok
 def __getSelectionImage(self, cut):
 """
 """
 if cut:
 cmd = IconEditCommand(self, self.tr("Cut Selection"),
 self.__image)
-img = QImage(self.__selRect.size(), QImage.Format_ARGB32)
+img = QImage(self.__selRect.size(), QImage.Format.Format_ARGB32)
 img.fill(qRgba(0, 0, 0, 0))
 for i in range(0, self.__selRect.width()):
 for j in range(0, self.__selRect.height()):
 if self.__image.rect().contains(self.__selRect.x() + i,
 self.__selRect.y() + j):
 Public slot to resize the image.
 """
 from .IconSizeDialog import IconSizeDialog
 dlg = IconSizeDialog(self.__image.width(), self.__image.height())
 res = dlg.exec()
-if res == QDialog.Accepted:
+if res == QDialog.DialogCode.Accepted:
 newWidth, newHeight = dlg.getData()
 if (
 newWidth != self.__image.width() or
 newHeight != self.__image.height()
 ):
 cmd = IconEditCommand(self, self.tr("Resize Image"),
 self.__image)
 img = self.__image.scaled(
-newWidth, newHeight, Qt.IgnoreAspectRatio,
+newWidth, newHeight, Qt.AspectRatioMode.IgnoreAspectRatio,
-Qt.SmoothTransformation)
+Qt.TransformationMode.SmoothTransformation)
 self.setIconImage(img)
 self.setDirty(True)
 self.__undoStack.push(cmd)
 cmd.setAfterImage(self.__image)
 Public slot to generate a new, empty image.
 """
 from .IconSizeDialog import IconSizeDialog
 dlg = IconSizeDialog(self.__image.width(), self.__image.height())
 res = dlg.exec()
-if res == QDialog.Accepted:
+if res == QDialog.DialogCode.Accepted:
 width, height = dlg.getData()
-img = QImage(width, height, QImage.Format_ARGB32)
+img = QImage(width, height, QImage.Format.Format_ARGB32)
 img.fill(qRgba(0, 0, 0, 0))
 self.setIconImage(img)
 def grayScale(self):
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/IconEditor/IconEditorGrid.py

eric6/IconEditor/IconEditorGrid.py