From dec3f403f0ee42e8c27ce5f75394f8406b02c22b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Dec 2020 11:17:18 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/catalog/catalog_csv_xml.py | 4 ++-- src/calibre/gui2/dialogs/authors_edit.py | 2 +- src/calibre/gui2/library/alternate_views.py | 2 +- src/calibre/gui2/library/views.py | 2 +- src/calibre/gui2/metadata/basic_widgets.py | 4 ++-- src/calibre/gui2/tag_browser/view.py | 2 +- src/calibre/gui2/tag_mapper.py | 2 +- src/calibre/gui2/toc/main.py | 2 +- src/calibre/gui2/tweak_book/file_list.py | 4 ++-- src/calibre/gui2/tweak_book/preferences.py | 2 +- src/calibre/gui2/tweak_book/reports.py | 2 +- src/calibre/gui2/tweak_book/search.py | 2 +- src/calibre/gui2/viewer/lookup.py | 4 ++-- src/calibre/gui2/viewer/toolbars.py | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/calibre/gui2/catalog/catalog_csv_xml.py b/src/calibre/gui2/catalog/catalog_csv_xml.py index 2b9e1cfdbb..32cff8e520 100644 --- a/src/calibre/gui2/catalog/catalog_csv_xml.py +++ b/src/calibre/gui2/catalog/catalog_csv_xml.py @@ -6,7 +6,7 @@ __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' __docformat__ = 'restructuredtext en' -from PyQt5.Qt import QWidget, QListWidgetItem, Qt, QVBoxLayout, QLabel, QListWidget +from PyQt5.Qt import QWidget, QListWidgetItem, Qt, QVBoxLayout, QLabel, QListWidget, QAbstractItemView from calibre.constants import ismacos from calibre.gui2 import gprefs @@ -52,7 +52,7 @@ class PluginWidget(QWidget): self.la2 = la = QLabel(_('Drag and drop to re-arrange fields')) l.addWidget(la) self.db_fields.setDragEnabled(True) - self.db_fields.setDragDropMode(QListWidget.InternalMove) + self.db_fields.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) self.db_fields.setDefaultDropAction(Qt.DropAction.CopyAction if ismacos else Qt.DropAction.MoveAction) self.db_fields.setAlternatingRowColors(True) self.db_fields.setObjectName("db_fields") diff --git a/src/calibre/gui2/dialogs/authors_edit.py b/src/calibre/gui2/dialogs/authors_edit.py index c554986a7f..56acced073 100644 --- a/src/calibre/gui2/dialogs/authors_edit.py +++ b/src/calibre/gui2/dialogs/authors_edit.py @@ -53,7 +53,7 @@ class List(QListWidget): self.setDragEnabled(True) self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection) self.setDropIndicatorShown(True) - self.setDragDropMode(self.InternalMove) + self.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) self.setAlternatingRowColors(True) self.d = ItemDelegate(all_authors, self) self.d.edited.connect(self.edited, type=Qt.ConnectionType.QueuedConnection) diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py index e85334d733..e39183c218 100644 --- a/src/calibre/gui2/library/alternate_views.py +++ b/src/calibre/gui2/library/alternate_views.py @@ -271,7 +271,7 @@ def setup_dnd_interface(cls_or_self): self.drag_start_pos = None self.setDragEnabled(True) self.setDragDropOverwriteMode(False) - self.setDragDropMode(self.DragDrop) + self.setDragDropMode(QAbstractItemView.DragDropMode.DragDrop) # }}} # Manage slave views {{{ diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index 8e9ae1aa20..af6e80078e 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -1372,7 +1372,7 @@ class DeviceBooksView(BooksView): # {{{ self.half_rating_delegate = None for i in range(10): self.setItemDelegateForColumn(i, TextDelegate(self)) - self.setDragDropMode(self.NoDragDrop) + self.setDragDropMode(QAbstractItemView.DragDropMode.NoDragDrop) self.setAcceptDrops(False) self.set_row_header_visibility() diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py index 2bb6186bc6..47a41659c6 100644 --- a/src/calibre/gui2/metadata/basic_widgets.py +++ b/src/calibre/gui2/metadata/basic_widgets.py @@ -13,7 +13,7 @@ import textwrap import weakref from datetime import date, datetime from PyQt5.Qt import ( - QAction, QApplication, QDateTime, QDialog, QDialogButtonBox, QDoubleSpinBox, + QAction, QApplication, QDateTime, QDialog, QDialogButtonBox, QDoubleSpinBox, QAbstractItemView, QGridLayout, QIcon, QKeySequence, QLabel, QLineEdit, QListWidgetItem, QMenu, QMessageBox, QPixmap, QPlainTextEdit, QSize, QSizePolicy, Qt, QToolButton, QComboBox, QUndoCommand, QUndoStack, QUrl, QVBoxLayout, QWidget, pyqtSignal @@ -887,7 +887,7 @@ class FormatsManager(QWidget): self.formats.edit_fmt.connect(self.edit_format) self.formats.delete_format.connect(self.remove_format) self.formats.itemDoubleClicked.connect(self.show_format) - self.formats.setDragDropMode(self.formats.DropOnly) + self.formats.setDragDropMode(QAbstractItemView.DragDropMode.DropOnly) self.formats.setIconSize(QSize(32, 32)) self.formats.setMaximumWidth(200) diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py index b613affa69..0c8e3a03c7 100644 --- a/src/calibre/gui2/tag_browser/view.py +++ b/src/calibre/gui2/tag_browser/view.py @@ -197,7 +197,7 @@ class TagsView(QTreeView): # {{{ self.made_connections = False self.setAcceptDrops(True) self.setDragEnabled(True) - self.setDragDropMode(self.DragDrop) + self.setDragDropMode(QAbstractItemView.DragDropMode.DragDrop) self.setDropIndicatorShown(True) self.setAutoExpandDelay(500) self.pane_is_visible = False diff --git a/src/calibre/gui2/tag_mapper.py b/src/calibre/gui2/tag_mapper.py index 8eacc1e6ea..0f8144e5f0 100644 --- a/src/calibre/gui2/tag_mapper.py +++ b/src/calibre/gui2/tag_mapper.py @@ -302,7 +302,7 @@ class Rules(QWidget): r.setDragEnabled(True) r.viewport().setAcceptDrops(True) r.setDropIndicatorShown(True) - r.setDragDropMode(r.InternalMove) + r.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) r.setDefaultDropAction(Qt.DropAction.MoveAction) self.l2 = l = QVBoxLayout() h.addLayout(l) diff --git a/src/calibre/gui2/toc/main.py b/src/calibre/gui2/toc/main.py index a1ea5a2ba3..3f9dc1e9c6 100644 --- a/src/calibre/gui2/toc/main.py +++ b/src/calibre/gui2/toc/main.py @@ -389,7 +389,7 @@ class TreeWidget(QTreeWidget): # {{{ self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection) self.viewport().setAcceptDrops(True) self.setDropIndicatorShown(True) - self.setDragDropMode(self.InternalMove) + self.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) self.setAutoScroll(True) self.setAutoScrollMargin(ICON_SIZE*2) self.setDefaultDropAction(Qt.DropAction.MoveAction) diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py index 61096a638c..cff7f2cf30 100644 --- a/src/calibre/gui2/tweak_book/file_list.py +++ b/src/calibre/gui2/tweak_book/file_list.py @@ -255,7 +255,7 @@ class FileList(QTreeWidget, OpenWithHandler): self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection) self.viewport().setAcceptDrops(True) self.setDropIndicatorShown(True) - self.setDragDropMode(self.InternalMove) + self.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) self.setAutoScroll(True) self.setAutoScrollMargin(TOP_ICON_SIZE*2) self.setDefaultDropAction(Qt.DropAction.MoveAction) @@ -928,7 +928,7 @@ class FileList(QTreeWidget, OpenWithHandler): l.addWidget(s) s.setDragEnabled(True) s.setDropIndicatorShown(True) - s.setDragDropMode(self.InternalMove) + s.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) s.setAutoScroll(True) s.setDefaultDropAction(Qt.DropAction.MoveAction) for name in sheets: diff --git a/src/calibre/gui2/tweak_book/preferences.py b/src/calibre/gui2/tweak_book/preferences.py index 7c778cbead..39e0d2a128 100644 --- a/src/calibre/gui2/tweak_book/preferences.py +++ b/src/calibre/gui2/tweak_book/preferences.py @@ -95,7 +95,7 @@ class BasicSettings(QWidget): # {{{ widget = QListWidget(self) widget.addItems(prefs.defaults[name]) widget.setDragEnabled(True) - widget.setDragDropMode(widget.InternalMove) + widget.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) widget.viewport().setAcceptDrops(True) widget.setDropIndicatorShown(True) widget.indexesMoved.connect(self.emit_changed) diff --git a/src/calibre/gui2/tweak_book/reports.py b/src/calibre/gui2/tweak_book/reports.py index 5f87a6c8fe..cd41d4925b 100644 --- a/src/calibre/gui2/tweak_book/reports.py +++ b/src/calibre/gui2/tweak_book/reports.py @@ -219,7 +219,7 @@ class FilesView(QTableView): self.sortByColumn(sort_column, sort_order) h.setSectionsMovable(True), h.setSectionsClickable(True) h.setDragEnabled(True), h.setAcceptDrops(True) - h.setDragDropMode(self.InternalMove) + h.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) # }}} diff --git a/src/calibre/gui2/tweak_book/search.py b/src/calibre/gui2/tweak_book/search.py index 3ffdb58b54..0ad7a6aff2 100644 --- a/src/calibre/gui2/tweak_book/search.py +++ b/src/calibre/gui2/tweak_book/search.py @@ -916,7 +916,7 @@ class SavedSearches(QWidget): self.delegate = SearchDelegate(searches) searches.setItemDelegate(self.delegate) searches.setAlternatingRowColors(True) - searches.setDragEnabled(True), searches.setAcceptDrops(True), searches.setDragDropMode(searches.InternalMove) + searches.setDragEnabled(True), searches.setAcceptDrops(True), searches.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) searches.setDropIndicatorShown(True) h.addLayout(stack, stretch=10) self.v = v = QVBoxLayout() diff --git a/src/calibre/gui2/viewer/lookup.py b/src/calibre/gui2/viewer/lookup.py index 27a0b311fc..85bde48206 100644 --- a/src/calibre/gui2/viewer/lookup.py +++ b/src/calibre/gui2/viewer/lookup.py @@ -7,7 +7,7 @@ import os import sys import textwrap from PyQt5.Qt import ( - QApplication, QCheckBox, QComboBox, QDialog, QDialogButtonBox, QFormLayout, + QApplication, QCheckBox, QComboBox, QDialog, QDialogButtonBox, QFormLayout, QAbstractItemView, QHBoxLayout, QIcon, QLabel, QLineEdit, QListWidget, QListWidgetItem, QPushButton, QSize, Qt, QTimer, QUrl, QVBoxLayout, QWidget, pyqtSignal ) @@ -127,7 +127,7 @@ class SourcesEditor(Dialog): e.itemDoubleClicked.connect(self.edit_source) e.viewport().setAcceptDrops(True) e.setDropIndicatorShown(True) - e.setDragDropMode(e.InternalMove) + e.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) e.setDefaultDropAction(Qt.DropAction.MoveAction) l.addWidget(e) l.addWidget(self.bb) diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py index 9c98323377..df0d5bcea7 100644 --- a/src/calibre/gui2/viewer/toolbars.py +++ b/src/calibre/gui2/viewer/toolbars.py @@ -323,7 +323,7 @@ class ActionsList(QListWidget): self.setDragEnabled(True) self.viewport().setAcceptDrops(True) self.setDropIndicatorShown(True) - self.setDragDropMode(self.InternalMove) + self.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove) self.setDefaultDropAction(Qt.DropAction.CopyAction if ismacos else Qt.DropAction.MoveAction) self.setMinimumHeight(400) self.is_source = is_source