Annotate bug workarounds

This commit is contained in:
Kovid Goyal 2022-06-22 15:03:38 +05:30
parent ff34c69f3a
commit e415463168
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 14 additions and 14 deletions

View File

@ -1067,7 +1067,7 @@ class BooksModel(QAbstractTableModel): # {{{
cname = self.column_map[index.column()] cname = self.column_map[index.column()]
ans = Qt.AlignmentFlag.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname, ans = Qt.AlignmentFlag.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname,
'left')] 'left')]
return int(ans) return int(ans) # https://bugreports.qt.io/browse/PYSIDE-1974
elif role == Qt.ItemDataRole.FontRole and self.styled_columns: elif role == Qt.ItemDataRole.FontRole and self.styled_columns:
cname = self.column_map[index.column()] cname = self.column_map[index.column()]
return self.styled_columns.get(cname) return self.styled_columns.get(cname)
@ -1787,7 +1787,7 @@ class DeviceBooksModel(BooksModel): # {{{
cname = self.column_map[index.column()] cname = self.column_map[index.column()]
ans = Qt.AlignmentFlag.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname, ans = Qt.AlignmentFlag.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname,
'left')] 'left')]
return int(ans) return int(ans) # https://bugreports.qt.io/browse/PYSIDE-1974
return None return None
def headerData(self, section, orientation, role): def headerData(self, section, orientation, role):

View File

@ -142,7 +142,7 @@ class Matches(QAbstractItemModel):
return Qt.CheckState.Checked return Qt.CheckState.Checked
elif role == Qt.ItemDataRole.TextAlignmentRole: elif role == Qt.ItemDataRole.TextAlignmentRole:
if col in self.CENTERED_COLUMNS: 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 return Qt.AlignmentFlag.AlignLeft
elif role == Qt.ItemDataRole.ToolTipRole: elif role == Qt.ItemDataRole.ToolTipRole:
if col == 0: if col == 0:

View File

@ -136,7 +136,7 @@ class AllFonts(QAbstractTableModel):
if role == Qt.ItemDataRole.TextAlignmentRole: if role == Qt.ItemDataRole.TextAlignmentRole:
col = index.column() col = index.column()
if col == 0: 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): if role in (Qt.ItemDataRole.UserRole, Qt.ItemDataRole.UserRole + 1):
row = index.row() row = index.row()
try: try:

View File

@ -115,7 +115,7 @@ class FileCollection(QAbstractTableModel):
return self.COLUMN_HEADERS[section] return self.COLUMN_HEADERS[section]
elif role == Qt.ItemDataRole.TextAlignmentRole: elif role == Qt.ItemDataRole.TextAlignmentRole:
with suppress(IndexError): 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) return QAbstractTableModel.headerData(self, section, orientation, role)
def location(self, index): def location(self, index):
@ -280,7 +280,7 @@ class FilesModel(FileCollection):
if col == 3: if col == 3:
return self.CATEGORY_NAMES.get(entry.category) return self.CATEGORY_NAMES.get(entry.category)
elif role == Qt.ItemDataRole.TextAlignmentRole: 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): class FilesWidget(QWidget):
@ -468,9 +468,9 @@ class ImagesModel(FileCollection):
return self.files[index.row()] return self.files[index.row()]
except IndexError: except IndexError:
pass pass
elif role == Qt.TextAlignmentRole: elif role == Qt.ItemDataRole.TextAlignmentRole:
with suppress(IndexError): 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): class ImagesWidget(QWidget):
@ -737,9 +737,9 @@ class WordsModel(FileCollection):
return self.files[index.row()] return self.files[index.row()]
except IndexError: except IndexError:
pass pass
elif role == Qt.TextAlignmentRole: elif role == Qt.ItemDataRole.TextAlignmentRole:
with suppress(IndexError): 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): def location(self, index):
return None return None
@ -829,9 +829,9 @@ class CharsModel(FileCollection):
return self.files[index.row()] return self.files[index.row()]
except IndexError: except IndexError:
pass pass
elif role == Qt.TextAlignmentRole: elif role == Qt.ItemDataRole.TextAlignmentRole:
with suppress(IndexError): 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): def location(self, index):
return None return None

View File

@ -646,7 +646,7 @@ class WordsModel(QAbstractTableModel):
elif role == Qt.ItemDataRole.InitialSortOrderRole: elif role == Qt.ItemDataRole.InitialSortOrderRole:
return Qt.SortOrder.DescendingOrder if section == 1 else Qt.SortOrder.AscendingOrder return Qt.SortOrder.DescendingOrder if section == 1 else Qt.SortOrder.AscendingOrder
elif role == Qt.ItemDataRole.TextAlignmentRole: 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): def misspelled_text(self, w):
if self.spell_map[w]: if self.spell_map[w]:
@ -673,7 +673,7 @@ class WordsModel(QAbstractTableModel):
if col == 3: if col == 3:
return self.misspelled_text((word, locale)) return self.misspelled_text((word, locale))
if role == Qt.ItemDataRole.TextAlignmentRole: 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): def sort(self, column, order=Qt.SortOrder.AscendingOrder):
reverse = order != Qt.SortOrder.AscendingOrder reverse = order != Qt.SortOrder.AscendingOrder