From 23a324c643bf3f70871b6253edf0b661c7ba2201 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 8 Dec 2020 20:06:12 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/palette.py | 32 ++++++++++++++++---------------- src/calibre/utils/img.py | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/calibre/gui2/palette.py b/src/calibre/gui2/palette.py index c474bf11e5..1a41efdfb5 100644 --- a/src/calibre/gui2/palette.py +++ b/src/calibre/gui2/palette.py @@ -14,22 +14,22 @@ dark_text_color = QColor('#ddd') def dark_palette(): p = QPalette() disabled_color = QColor(127,127,127) - p.setColor(p.Window, dark_color) - p.setColor(p.WindowText, dark_text_color) - p.setColor(p.Base, QColor(18,18,18)) - p.setColor(p.AlternateBase, dark_color) - p.setColor(p.ToolTipBase, dark_color) - p.setColor(p.ToolTipText, dark_text_color) - p.setColor(p.Text, dark_text_color) - p.setColor(p.Disabled, p.Text, disabled_color) - p.setColor(p.Button, dark_color) - p.setColor(p.ButtonText, dark_text_color) - p.setColor(p.Disabled, p.ButtonText, disabled_color) - p.setColor(p.BrightText, Qt.GlobalColor.red) - p.setColor(p.Link, dark_link_color) + p.setColor(QPalette.ColorRole.Window, dark_color) + p.setColor(QPalette.ColorRole.WindowText, dark_text_color) + p.setColor(QPalette.ColorRole.Base, QColor(18,18,18)) + p.setColor(QPalette.ColorRole.AlternateBase, dark_color) + p.setColor(QPalette.ColorRole.ToolTipBase, dark_color) + p.setColor(QPalette.ColorRole.ToolTipText, dark_text_color) + p.setColor(QPalette.ColorRole.Text, dark_text_color) + p.setColor(QPalette.ColorGroup.Disabled, QPalette.ColorRole.Text, disabled_color) + p.setColor(QPalette.ColorRole.Button, dark_color) + p.setColor(QPalette.ColorRole.ButtonText, dark_text_color) + p.setColor(QPalette.ColorGroup.Disabled, QPalette.ColorRole.ButtonText, disabled_color) + p.setColor(QPalette.ColorRole.BrightText, Qt.GlobalColor.red) + p.setColor(QPalette.ColorRole.Link, dark_link_color) - p.setColor(p.Highlight, dark_link_color) - p.setColor(p.HighlightedText, Qt.GlobalColor.black) - p.setColor(p.Disabled, p.HighlightedText, disabled_color) + p.setColor(QPalette.ColorRole.Highlight, dark_link_color) + p.setColor(QPalette.ColorRole.HighlightedText, Qt.GlobalColor.black) + p.setColor(QPalette.ColorGroup.Disabled, QPalette.ColorRole.HighlightedText, disabled_color) return p diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py index 0638268666..7aeba4e857 100644 --- a/src/calibre/utils/img.py +++ b/src/calibre/utils/img.py @@ -11,9 +11,9 @@ import sys import tempfile from io import BytesIO # We use explicit module imports so tracebacks when importing are more useful -from PyQt5.QtCore import QBuffer, QByteArray, Qt +from PyQt5.QtCore import QBuffer, QByteArray, Qt, QIODevice from PyQt5.QtGui import ( - QColor, QImage, QImageReader, QImageWriter, QPixmap, QTransform, QIODevice + QColor, QImage, QImageReader, QImageWriter, QPixmap, QTransform ) from threading import Thread