--- a/eric6/E5Gui/E5Led.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/E5Gui/E5Led.py Tue Mar 02 17:17:09 2021 +0100 @@ -85,15 +85,16 @@ gradient.setColorAt(0.6, color) if self.__framedLed: gradient.setColorAt(0.9, color.darker()) - gradient.setColorAt(1.0, self.palette().color(QPalette.Dark)) + gradient.setColorAt( + 1.0, self.palette().color(QPalette.ColorRole.Dark)) else: gradient.setColorAt(1.0, color.darker()) # now do the drawing paint = QPainter(self) - paint.setRenderHint(QPainter.Antialiasing, True) + paint.setRenderHint(QPainter.RenderHint.Antialiasing, True) paint.setBrush(QBrush(gradient)) - paint.setPen(Qt.NoPen) + paint.setPen(Qt.PenStyle.NoPen) paint.drawEllipse(1, 1, width, width) paint.end() @@ -109,14 +110,14 @@ # now do the drawing painter = QPainter(self) - painter.setRenderHint(QPainter.Antialiasing, True) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, True) color = self.__led_on and self.__led_color or self.__offcolor painter.setPen(color.lighter(200)) painter.drawLine(left, 0, left, height - 1) painter.drawLine(left + 1, 0, right - 1, 0) if self.__framedLed: - painter.setPen(self.palette().color(QPalette.Dark)) + painter.setPen(self.palette().color(QPalette.ColorRole.Dark)) else: painter.setPen(color.darker()) painter.drawLine(left + 1, height - 1, right - 1, height - 1) @@ -295,7 +296,7 @@ """ super(E5ClickableLed, self).__init__(parent, color, shape, rectRatio) - self.setCursor(Qt.PointingHandCursor) + self.setCursor(Qt.CursorShape.PointingHandCursor) def mouseReleaseEvent(self, evt): """ @@ -303,13 +304,16 @@ @param evt mouse event (QMouseEvent) """ - if evt.button() == Qt.LeftButton and self.rect().contains(evt.pos()): - if evt.modifiers() == Qt.ControlModifier: + if ( + evt.button() == Qt.MouseButton.LeftButton and + self.rect().contains(evt.pos()) + ): + if evt.modifiers() == Qt.KeyboardModifier.ControlModifier: self.middleClicked.emit(evt.globalPos()) else: self.clicked.emit(evt.globalPos()) elif ( - evt.button() == Qt.MidButton and + evt.button() == Qt.MouseButton.MidButton and self.rect().contains(evt.pos()) ): self.middleClicked.emit(evt.globalPos())