From dc10461cbaf2fd3cefaecda4313ee0223a8740a6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 8 Dec 2020 19:26:51 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/comments_editor.py | 4 ++-- src/calibre/gui2/init.py | 2 +- src/calibre/gui2/layout.py | 4 ++-- src/calibre/gui2/library/alternate_views.py | 2 +- src/calibre/gui2/metadata/config.py | 2 +- src/calibre/gui2/metadata/single_download.py | 2 +- src/calibre/gui2/preferences/texture_chooser.py | 2 +- src/calibre/gui2/tag_browser/ui.py | 2 +- src/calibre/gui2/tweak_book/char_select.py | 2 +- src/calibre/gui2/tweak_book/diff/main.py | 2 +- src/calibre/gui2/tweak_book/editor/insert_resource.py | 2 +- src/calibre/gui2/tweak_book/editor/snippets.py | 2 +- src/calibre/gui2/viewer/toolbars.py | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py index 3b9e7563e1..61f5e8f7f2 100644 --- a/src/calibre/gui2/comments_editor.py +++ b/src/calibre/gui2/comments_editor.py @@ -17,7 +17,7 @@ from PyQt5.Qt import ( QHBoxLayout, QIcon, QKeySequence, QLabel, QLineEdit, QMenu, QPalette, QPlainTextEdit, QPushButton, QSize, QSyntaxHighlighter, Qt, QTabWidget, QTextBlockFormat, QTextCharFormat, QTextCursor, QTextEdit, QTextListFormat, - QToolBar, QUrl, QVBoxLayout, QWidget, pyqtSignal, pyqtSlot + QToolBar, QUrl, QVBoxLayout, QWidget, pyqtSignal, pyqtSlot, QToolButton ) from calibre import xml_replace_entities @@ -1126,7 +1126,7 @@ class Editor(QWidget): # {{{ self.toolbar2.addAction(self.editor.action_block_style) w = self.toolbar2.widgetForAction(self.editor.action_block_style) if hasattr(w, 'setPopupMode'): - w.setPopupMode(w.InstantPopup) + w.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) self.toolbar2.addAction(self.editor.action_insert_link) self.toolbar2.addAction(self.editor.action_insert_hr) # }}} diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index f689a1ca9a..b9929ba286 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -634,7 +634,7 @@ class LayoutMixin(object): # {{{ else: self.layout_button = b = QToolButton(self) b.setAutoRaise(True), b.setCursor(Qt.CursorShape.PointingHandCursor) - b.setPopupMode(b.InstantPopup) + b.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) b.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon) b.setText(_('Layout')), b.setIcon(QIcon(I('config.png'))) b.setMenu(LayoutMenu(self)) diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index 4563d8171f..4b5b166ef5 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -198,7 +198,7 @@ class SearchBar(QFrame): # {{{ x = parent.virtual_library = QToolButton(self) x.setCursor(Qt.CursorShape.PointingHandCursor) - x.setPopupMode(x.InstantPopup) + x.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) x.setText(_('Virtual library')) x.setAutoRaise(True) x.setIcon(QIcon(I('vl.png'))) @@ -304,7 +304,7 @@ class SearchBar(QFrame): # {{{ x.setText(_('Saved search')) x.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon) x.setCursor(Qt.CursorShape.PointingHandCursor) - x.setPopupMode(x.InstantPopup) + x.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) x.setAutoRaise(True) x.setIcon(QIcon(I("bookmarks.png"))) l.addWidget(x) diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py index 4b7ebbd0e9..27b67acf2a 100644 --- a/src/calibre/gui2/library/alternate_views.py +++ b/src/calibre/gui2/library/alternate_views.py @@ -699,7 +699,7 @@ class GridView(QListView): setup_dnd_interface(self) self.setUniformItemSizes(True) self.setWrapping(True) - self.setFlow(self.LeftToRight) + self.setFlow(Qt.LayoutDirection.LeftToRight) # We cannot set layout mode to batched, because that breaks # restore_vpos() # self.setLayoutMode(self.Batched) diff --git a/src/calibre/gui2/metadata/config.py b/src/calibre/gui2/metadata/config.py index f79a80ca6e..16b7528d05 100644 --- a/src/calibre/gui2/metadata/config.py +++ b/src/calibre/gui2/metadata/config.py @@ -80,7 +80,7 @@ class ConfigWidget(QWidget): g.setContentsMargins(0, 0, 0, 0) self.fields_view = v = FieldsList(self) g.addWidget(v) - v.setFlow(v.LeftToRight) + v.setFlow(Qt.LayoutDirection.LeftToRight) v.setWrapping(True) v.setResizeMode(v.Adjust) self.fields_model = FieldsModel(self.plugin) diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index d28ba40d09..56af7543ab 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -769,7 +769,7 @@ class CoversView(QListView): # {{{ self.m = CoversModel(current_cover, self) self.setModel(self.m) - self.setFlow(self.LeftToRight) + self.setFlow(Qt.LayoutDirection.LeftToRight) self.setWrapping(True) self.setResizeMode(self.Adjust) self.setGridSize(QSize(190, 260)) diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py index aea5da7f47..d24d0d8e50 100644 --- a/src/calibre/gui2/preferences/texture_chooser.py +++ b/src/calibre/gui2/preferences/texture_chooser.py @@ -47,7 +47,7 @@ class TextureChooser(QDialog): il.itemDoubleClicked.connect(self.accept, type=Qt.ConnectionType.QueuedConnection) il.setIconSize(QSize(256, 256)) il.setViewMode(il.IconMode) - il.setFlow(il.LeftToRight) + il.setFlow(Qt.LayoutDirection.LeftToRight) il.setSpacing(20) il.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) il.itemSelectionChanged.connect(self.update_remove_state) diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py index edf20ed101..b37bfb56ef 100644 --- a/src/calibre/gui2/tag_browser/ui.py +++ b/src/calibre/gui2/tag_browser/ui.py @@ -468,7 +468,7 @@ class TagBrowserBar(QWidget): # {{{ b.setAutoRaise(True) b.setText(_('Configure')), b.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon) b.setCursor(Qt.CursorShape.PointingHandCursor) - b.setPopupMode(b.InstantPopup) + b.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) b.setToolTip(textwrap.fill(_( 'Change how the Tag browser works, such as,' ' how it is sorted, what happens when you click' diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py index d0f8bb12b5..415deda217 100644 --- a/src/calibre/gui2/tweak_book/char_select.py +++ b/src/calibre/gui2/tweak_book/char_select.py @@ -591,7 +591,7 @@ class CharView(QListView): self.delegate = CharDelegate(self) self.setResizeMode(self.Adjust) self.setItemDelegate(self.delegate) - self.setFlow(self.LeftToRight) + self.setFlow(Qt.LayoutDirection.LeftToRight) self.setWrapping(True) self.setMouseTracking(True) self.setSpacing(2) diff --git a/src/calibre/gui2/tweak_book/diff/main.py b/src/calibre/gui2/tweak_book/diff/main.py index 144fc7ac50..28cbeb7dbc 100644 --- a/src/calibre/gui2/tweak_book/diff/main.py +++ b/src/calibre/gui2/tweak_book/diff/main.py @@ -280,7 +280,7 @@ class Diff(Dialog): b.setIcon(QIcon(I('config.png'))) b.setText(_('&Options')), b.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon) b.setToolTip(_('Change how the differences are displayed')) - b.setPopupMode(b.InstantPopup) + b.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) m = QMenu(b) b.setMenu(m) cm = self.cm = QMenu(_('Lines of context around each change')) diff --git a/src/calibre/gui2/tweak_book/editor/insert_resource.py b/src/calibre/gui2/tweak_book/editor/insert_resource.py index 6565278396..814a1a1972 100644 --- a/src/calibre/gui2/tweak_book/editor/insert_resource.py +++ b/src/calibre/gui2/tweak_book/editor/insert_resource.py @@ -215,7 +215,7 @@ class InsertImage(Dialog): self.view = v = QListView(self) v.setViewMode(v.IconMode) - v.setFlow(v.LeftToRight) + v.setFlow(Qt.LayoutDirection.LeftToRight) v.setSpacing(4) v.setResizeMode(v.Adjust) v.setUniformItemSizes(True) diff --git a/src/calibre/gui2/tweak_book/editor/snippets.py b/src/calibre/gui2/tweak_book/editor/snippets.py index 504d1a6bf7..69cb2a3fbe 100644 --- a/src/calibre/gui2/tweak_book/editor/snippets.py +++ b/src/calibre/gui2/tweak_book/editor/snippets.py @@ -486,7 +486,7 @@ class EditSnippet(QWidget): add_row(_('&Template:'), t) self.types = t = QListWidget(self) - t.setFlow(t.LeftToRight) + t.setFlow(Qt.LayoutDirection.LeftToRight) t.setWrapping(True), t.setResizeMode(t.Adjust), t.setSpacing(5) fm = t.fontMetrics() t.setMaximumHeight(2*(fm.ascent() + fm.descent()) + 25) diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py index 9f16e95a83..1a23ecf575 100644 --- a/src/calibre/gui2/viewer/toolbars.py +++ b/src/calibre/gui2/viewer/toolbars.py @@ -206,7 +206,7 @@ class ActionsToolBar(ToolBar): pass w = self.widgetForAction(self.color_scheme_action) if w: - w.setPopupMode(w.InstantPopup) + w.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) def update_mode_action(self): mode = get_session_pref('read_mode', default='paged', group=None)