Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

More pyqt6 enum goodness

Browse Source
This commit is contained in:
Kovid Goyal 2022-06-19 09:26:53 +05:30
parent 2fbe290470
commit 2843ec81e1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/library/models.py
View File

@ -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):

2
src/calibre/gui2/store/config/chooser/models.py
View File

@ -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:

2
src/calibre/gui2/tweak_book/manage_fonts.py
View File

@ -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:

10
src/calibre/gui2/tweak_book/reports.py
View File

@ -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

4
src/calibre/gui2/tweak_book/spell.py
View File

@ -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