From 2843ec81e17b98b06a9abbda071f1c4c4b7fe8f9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 19 Jun 2022 09:26:53 +0530 Subject: [PATCH] More pyqt6 enum goodness --- src/calibre/gui2/library/models.py | 4 ++-- src/calibre/gui2/store/config/chooser/models.py | 2 +- src/calibre/gui2/tweak_book/manage_fonts.py | 2 +- src/calibre/gui2/tweak_book/reports.py | 10 +++++----- src/calibre/gui2/tweak_book/spell.py | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 1b1e8af84f..a9f5b289c9 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -1067,7 +1067,7 @@ class BooksModel(QAbstractTableModel): # {{{ cname = self.column_map[index.column()] ans = Qt.AlignmentFlag.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname, 'left')] - return (ans) + return ans.value elif role == Qt.ItemDataRole.FontRole and self.styled_columns: cname = self.column_map[index.column()] return self.styled_columns.get(cname) @@ -1787,7 +1787,7 @@ class DeviceBooksModel(BooksModel): # {{{ cname = self.column_map[index.column()] ans = Qt.AlignmentFlag.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname, 'left')] - return (ans) + return ans.value return None def headerData(self, section, orientation, role): diff --git a/src/calibre/gui2/store/config/chooser/models.py b/src/calibre/gui2/store/config/chooser/models.py index 7384764805..66996106c5 100644 --- a/src/calibre/gui2/store/config/chooser/models.py +++ b/src/calibre/gui2/store/config/chooser/models.py @@ -142,7 +142,7 @@ class Matches(QAbstractItemModel): return Qt.CheckState.Checked elif role == Qt.ItemDataRole.TextAlignmentRole: if col in self.CENTERED_COLUMNS: - return Qt.AlignmentFlag.AlignHCenter + return Qt.AlignmentFlag.AlignHCenter.value return Qt.AlignmentFlag.AlignLeft elif role == Qt.ItemDataRole.ToolTipRole: if col == 0: diff --git a/src/calibre/gui2/tweak_book/manage_fonts.py b/src/calibre/gui2/tweak_book/manage_fonts.py index 1dd279fbbb..9608c9daea 100644 --- a/src/calibre/gui2/tweak_book/manage_fonts.py +++ b/src/calibre/gui2/tweak_book/manage_fonts.py @@ -135,7 +135,7 @@ class AllFonts(QAbstractTableModel): if role == Qt.ItemDataRole.TextAlignmentRole: col = index.column() if col == 0: - return Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter + return (Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter).value if role in (Qt.ItemDataRole.UserRole, Qt.ItemDataRole.UserRole + 1): row = index.row() try: diff --git a/src/calibre/gui2/tweak_book/reports.py b/src/calibre/gui2/tweak_book/reports.py index 52c6166132..553874bb4c 100644 --- a/src/calibre/gui2/tweak_book/reports.py +++ b/src/calibre/gui2/tweak_book/reports.py @@ -115,7 +115,7 @@ class FileCollection(QAbstractTableModel): return self.COLUMN_HEADERS[section] elif role == Qt.ItemDataRole.TextAlignmentRole: with suppress(IndexError): - return self.alignments[section] + return self.alignments[section].value return QAbstractTableModel.headerData(self, section, orientation, role) def location(self, index): @@ -280,7 +280,7 @@ class FilesModel(FileCollection): if col == 3: return self.CATEGORY_NAMES.get(entry.category) elif role == Qt.ItemDataRole.TextAlignmentRole: - return Qt.AlignVCenter | self.alignments[index.column()] + return (Qt.AlignVCenter | self.alignments[index.column()]).value class FilesWidget(QWidget): @@ -470,7 +470,7 @@ class ImagesModel(FileCollection): pass elif role == Qt.TextAlignmentRole: with suppress(IndexError): - return self.alignments[index.column()] + return self.alignments[index.column()].value class ImagesWidget(QWidget): @@ -739,7 +739,7 @@ class WordsModel(FileCollection): pass elif role == Qt.TextAlignmentRole: with suppress(IndexError): - return self.alignments[index.column()] + return self.alignments[index.column()].value def location(self, index): return None @@ -831,7 +831,7 @@ class CharsModel(FileCollection): pass elif role == Qt.TextAlignmentRole: with suppress(IndexError): - return self.alignments[index.column()] + return self.alignments[index.column()].value def location(self, index): return None diff --git a/src/calibre/gui2/tweak_book/spell.py b/src/calibre/gui2/tweak_book/spell.py index 501d005c87..7fc275ab7b 100644 --- a/src/calibre/gui2/tweak_book/spell.py +++ b/src/calibre/gui2/tweak_book/spell.py @@ -646,7 +646,7 @@ class WordsModel(QAbstractTableModel): elif role == Qt.ItemDataRole.InitialSortOrderRole: return Qt.SortOrder.DescendingOrder if section == 1 else Qt.SortOrder.AscendingOrder elif role == Qt.ItemDataRole.TextAlignmentRole: - return Qt.AlignVCenter | self.alignments[section] + return (Qt.AlignmentFlag.AlignVCenter | self.alignments[section]).value def misspelled_text(self, w): if self.spell_map[w]: @@ -673,7 +673,7 @@ class WordsModel(QAbstractTableModel): if col == 3: return self.misspelled_text((word, locale)) if role == Qt.ItemDataRole.TextAlignmentRole: - return Qt.AlignmentFlag.AlignVCenter | self.alignments[index.column()] + return (Qt.AlignmentFlag.AlignVCenter | self.alignments[index.column()]).value def sort(self, column, order=Qt.SortOrder.AscendingOrder): reverse = order != Qt.SortOrder.AscendingOrder