From 79fba89f323373184a36ddc0eef73230c750bc0e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 9 Dec 2020 08:40:21 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/icon_theme.py | 2 +- src/calibre/gui2/library/alternate_views.py | 4 ++-- src/calibre/gui2/metadata/config.py | 2 +- src/calibre/gui2/metadata/pdf_covers.py | 4 ++-- src/calibre/gui2/metadata/single_download.py | 4 ++-- src/calibre/gui2/preferences/texture_chooser.py | 2 +- src/calibre/gui2/preferences/tweaks.py | 4 ++-- src/calibre/gui2/tweak_book/char_select.py | 2 +- src/calibre/gui2/tweak_book/editor/insert_resource.py | 4 ++-- src/calibre/gui2/tweak_book/editor/snippets.py | 2 +- src/calibre/gui2/tweak_book/preferences.py | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/calibre/gui2/icon_theme.py b/src/calibre/gui2/icon_theme.py index 2d70f03ac4..2cf3dff55f 100644 --- a/src/calibre/gui2/icon_theme.py +++ b/src/calibre/gui2/icon_theme.py @@ -645,7 +645,7 @@ class ChooseTheme(Dialog): sb.currentIndexChanged[int].connect(self.re_sort) sb.currentIndexChanged[int].connect(lambda : gprefs.set('choose_icon_theme_sort_by', sb.currentIndex())) self.theme_list = tl = QListWidget(self) - tl.setVerticalScrollMode(tl.ScrollPerPixel) + tl.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel) self.delegate = Delegate(tl) tl.setItemDelegate(self.delegate) tl.itemDoubleClicked.connect(self.accept) diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py index 08a2bd703c..62d62442ad 100644 --- a/src/calibre/gui2/library/alternate_views.py +++ b/src/calibre/gui2/library/alternate_views.py @@ -703,9 +703,9 @@ class GridView(QListView): # We cannot set layout mode to batched, because that breaks # restore_vpos() # self.setLayoutMode(self.Batched) - self.setResizeMode(self.Adjust) + self.setResizeMode(QListView.ResizeMode.Adjust) self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection) - self.setVerticalScrollMode(self.ScrollPerPixel) + self.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel) self.delegate = CoverDelegate(self) self.delegate.animation.valueChanged.connect(self.animation_value_changed) self.delegate.animation.finished.connect(self.animation_done) diff --git a/src/calibre/gui2/metadata/config.py b/src/calibre/gui2/metadata/config.py index be3ba8e9ee..2953696a86 100644 --- a/src/calibre/gui2/metadata/config.py +++ b/src/calibre/gui2/metadata/config.py @@ -82,7 +82,7 @@ class ConfigWidget(QWidget): g.addWidget(v) v.setFlow(QListView.Flow.LeftToRight) v.setWrapping(True) - v.setResizeMode(v.Adjust) + v.setResizeMode(QListView.ResizeMode.Adjust) self.fields_model = FieldsModel(self.plugin) self.fields_model.initialize() v.setModel(self.fields_model) diff --git a/src/calibre/gui2/metadata/pdf_covers.py b/src/calibre/gui2/metadata/pdf_covers.py index cf87882494..f5055a5a2f 100644 --- a/src/calibre/gui2/metadata/pdf_covers.py +++ b/src/calibre/gui2/metadata/pdf_covers.py @@ -60,9 +60,9 @@ class PDFCovers(QDialog): c.setItemDelegate(self.item_delegate) c.setIconSize(QSize(120, 160)) c.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) - c.setViewMode(c.IconMode) + c.setViewMode(QListView.ViewMode.IconMode) c.setUniformItemSizes(True) - c.setResizeMode(c.Adjust) + c.setResizeMode(QListView.ResizeMode.Adjust) c.itemDoubleClicked.connect(self.accept, type=Qt.ConnectionType.QueuedConnection) self.bb = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok|QDialogButtonBox.StandardButton.Cancel) diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index 61bb85dcf6..f83b3bfa36 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -771,11 +771,11 @@ class CoversView(QListView): # {{{ self.setFlow(QListView.Flow.LeftToRight) self.setWrapping(True) - self.setResizeMode(self.Adjust) + self.setResizeMode(QListView.ResizeMode.Adjust) self.setGridSize(QSize(190, 260)) self.setIconSize(QSize(*CoverDelegate.ICON_SIZE)) self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) - self.setViewMode(self.IconMode) + self.setViewMode(QListView.ViewMode.IconMode) self.delegate = CoverDelegate(self) self.setItemDelegate(self.delegate) diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py index 34391c5148..32ec471981 100644 --- a/src/calibre/gui2/preferences/texture_chooser.py +++ b/src/calibre/gui2/preferences/texture_chooser.py @@ -46,7 +46,7 @@ class TextureChooser(QDialog): self.images = il = QListWidget(self) il.itemDoubleClicked.connect(self.accept, type=Qt.ConnectionType.QueuedConnection) il.setIconSize(QSize(256, 256)) - il.setViewMode(il.IconMode) + il.setViewMode(QListView.ViewMode.IconMode) il.setFlow(QListView.Flow.LeftToRight) il.setSpacing(20) il.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py index 407f2635ac..8cf191df43 100644 --- a/src/calibre/gui2/preferences/tweaks.py +++ b/src/calibre/gui2/preferences/tweaks.py @@ -11,7 +11,7 @@ from operator import attrgetter from PyQt5.Qt import ( QAbstractListModel, QApplication, QDialog, QDialogButtonBox, QFont, QGridLayout, QGroupBox, QIcon, QLabel, QListView, QMenu, QModelIndex, QPlainTextEdit, - QPushButton, QSizePolicy, QSplitter, QStyle, QStyledItemDelegate, + QPushButton, QSizePolicy, QSplitter, QStyle, QStyledItemDelegate, QAbstractItemView, QStyleOptionViewItem, Qt, QVBoxLayout, QWidget, pyqtSignal ) @@ -370,7 +370,7 @@ class TweaksView(QListView): self.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) self.setAlternatingRowColors(True) self.setSpacing(5) - self.setVerticalScrollMode(self.ScrollPerPixel) + self.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel) self.setMinimumWidth(300) def currentChanged(self, cur, prev): diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py index 73395b84c7..813f65e8b0 100644 --- a/src/calibre/gui2/tweak_book/char_select.py +++ b/src/calibre/gui2/tweak_book/char_select.py @@ -589,7 +589,7 @@ class CharView(QListView): self._model = CharModel(self) self.setModel(self._model) self.delegate = CharDelegate(self) - self.setResizeMode(self.Adjust) + self.setResizeMode(QListView.ResizeMode.Adjust) self.setItemDelegate(self.delegate) self.setFlow(QListView.Flow.LeftToRight) self.setWrapping(True) diff --git a/src/calibre/gui2/tweak_book/editor/insert_resource.py b/src/calibre/gui2/tweak_book/editor/insert_resource.py index e241f0b8db..d5b8b4ae2a 100644 --- a/src/calibre/gui2/tweak_book/editor/insert_resource.py +++ b/src/calibre/gui2/tweak_book/editor/insert_resource.py @@ -214,10 +214,10 @@ class InsertImage(Dialog): la.setVisible(False) self.view = v = QListView(self) - v.setViewMode(v.IconMode) + v.setViewMode(QListView.ViewMode.IconMode) v.setFlow(QListView.Flow.LeftToRight) v.setSpacing(4) - v.setResizeMode(v.Adjust) + v.setResizeMode(QListView.ResizeMode.Adjust) v.setUniformItemSizes(True) set_no_activate_on_click(v) v.activated.connect(self.activated) diff --git a/src/calibre/gui2/tweak_book/editor/snippets.py b/src/calibre/gui2/tweak_book/editor/snippets.py index a8c52587b7..3a9105984c 100644 --- a/src/calibre/gui2/tweak_book/editor/snippets.py +++ b/src/calibre/gui2/tweak_book/editor/snippets.py @@ -487,7 +487,7 @@ class EditSnippet(QWidget): self.types = t = QListWidget(self) t.setFlow(QListView.Flow.LeftToRight) - t.setWrapping(True), t.setResizeMode(t.Adjust), t.setSpacing(5) + t.setWrapping(True), t.setResizeMode(QListView.ResizeMode.Adjust), t.setSpacing(5) fm = t.fontMetrics() t.setMaximumHeight(2*(fm.ascent() + fm.descent()) + 25) add_row(_('&File types:'), t) diff --git a/src/calibre/gui2/tweak_book/preferences.py b/src/calibre/gui2/tweak_book/preferences.py index 8e8c33f98a..672d3a015d 100644 --- a/src/calibre/gui2/tweak_book/preferences.py +++ b/src/calibre/gui2/tweak_book/preferences.py @@ -732,7 +732,7 @@ class Preferences(QDialog): self.categories_list = cl = QListWidget(self) cl.currentRowChanged.connect(self.stacks.setCurrentIndex) cl.clearPropertyFlags() - cl.setViewMode(cl.IconMode) + cl.setViewMode(QListView.ViewMode.IconMode) cl.setFlow(QListView.Flow.TopToBottom) cl.setMovement(cl.Static) cl.setWrapping(False)