diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 7c7204509f..7b54f7c7b6 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 int(ans) + return int(ans) # https://bugreports.qt.io/browse/PYSIDE-1974 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 int(ans) + return int(ans) # https://bugreports.qt.io/browse/PYSIDE-1974 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 e2f499c828..8cf971d327 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 int(Qt.AlignmentFlag.AlignHCenter) + return int(Qt.AlignmentFlag.AlignHCenter) # https://bugreports.qt.io/browse/PYSIDE-1974 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 79b1f4ba97..a6ee741f84 100644 --- a/src/calibre/gui2/tweak_book/manage_fonts.py +++ b/src/calibre/gui2/tweak_book/manage_fonts.py @@ -136,7 +136,7 @@ class AllFonts(QAbstractTableModel): if role == Qt.ItemDataRole.TextAlignmentRole: col = index.column() if col == 0: - return int(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter) + return int(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter) # https://bugreports.qt.io/browse/PYSIDE-1974 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 b99674b042..1f85149fab 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 int(self.alignments[section]) + return int(self.alignments[section]) # https://bugreports.qt.io/browse/PYSIDE-1974 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 int(Qt.AlignVCenter | self.alignments[index.column()]) + return int(Qt.AlignVCenter | self.alignments[index.column()]) # https://bugreports.qt.io/browse/PYSIDE-1974 class FilesWidget(QWidget): @@ -468,9 +468,9 @@ class ImagesModel(FileCollection): return self.files[index.row()] except IndexError: pass - elif role == Qt.TextAlignmentRole: + elif role == Qt.ItemDataRole.TextAlignmentRole: with suppress(IndexError): - return int(self.alignments[index.column()]) + return int(self.alignments[index.column()]) # https://bugreports.qt.io/browse/PYSIDE-1974 class ImagesWidget(QWidget): @@ -737,9 +737,9 @@ class WordsModel(FileCollection): return self.files[index.row()] except IndexError: pass - elif role == Qt.TextAlignmentRole: + elif role == Qt.ItemDataRole.TextAlignmentRole: with suppress(IndexError): - return int(self.alignments[index.column()]) + return int(self.alignments[index.column()]) # https://bugreports.qt.io/browse/PYSIDE-1974 def location(self, index): return None @@ -829,9 +829,9 @@ class CharsModel(FileCollection): return self.files[index.row()] except IndexError: pass - elif role == Qt.TextAlignmentRole: + elif role == Qt.ItemDataRole.TextAlignmentRole: with suppress(IndexError): - return int(self.alignments[index.column()]) + return int(self.alignments[index.column()]) # https://bugreports.qt.io/browse/PYSIDE-1974 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 8983fde60f..93db952e67 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 int(Qt.AlignmentFlag.AlignVCenter | self.alignments[section]) + return int(Qt.AlignmentFlag.AlignVCenter | self.alignments[section]) # https://bugreports.qt.io/browse/PYSIDE-1974 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 int(Qt.AlignmentFlag.AlignVCenter | self.alignments[index.column()]) + return int(Qt.AlignmentFlag.AlignVCenter | self.alignments[index.column()]) # https://bugreports.qt.io/browse/PYSIDE-1974 def sort(self, column, order=Qt.SortOrder.AscendingOrder): reverse = order != Qt.SortOrder.AscendingOrder