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 stupid PyQt enums

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-20 12:40:28 +05:30
parent 45b534d6d7
commit 867dafa244
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/book_details.py
View File

@ -9,7 +9,7 @@ from collections import namedtuple
from functools import partial from functools import partial
from PyQt5.Qt import ( from PyQt5.Qt import (
QAction, QApplication, QColor, QEasingCurve, QIcon, QKeySequence, QLayout, QMenu, QAction, QApplication, QColor, QEasingCurve, QIcon, QKeySequence, QLayout, QMenu,
QMimeData, QPainter, QPen, QPixmap, QPropertyAnimation, QRect, QSize, QMimeData, QPainter, QPen, QPixmap, QPropertyAnimation, QRect, QSize, QClipboard,
QSizePolicy, Qt, QUrl, QWidget, pyqtProperty, pyqtSignal QSizePolicy, Qt, QUrl, QWidget, pyqtProperty, pyqtSignal
) )
@ -604,7 +604,7 @@ class CoverView(QWidget): # {{{
cb = QApplication.instance().clipboard() cb = QApplication.instance().clipboard()
pmap = cb.pixmap() pmap = cb.pixmap()
if pmap.isNull() and cb.supportsSelection(): if pmap.isNull() and cb.supportsSelection():
pmap = cb.pixmap(cb.Selection) pmap = cb.pixmap(QClipboard.Mode.Selection)
if not pmap.isNull(): if not pmap.isNull():
self.update_cover(pmap) self.update_cover(pmap)

4
src/calibre/gui2/tweak_book/editor/insert_resource.py
View File

@ -9,7 +9,7 @@ import os
import sys import sys
from functools import partial from functools import partial
from PyQt5.Qt import ( from PyQt5.Qt import (
QAbstractListModel, QApplication, QCheckBox, QFormLayout, QGridLayout, QAbstractListModel, QApplication, QCheckBox, QFormLayout, QGridLayout, QClipboard,
QHBoxLayout, QIcon, QInputDialog, QLabel, QLineEdit, QListView, QMenu, QPainter, QHBoxLayout, QIcon, QInputDialog, QLabel, QLineEdit, QListView, QMenu, QPainter,
QPixmap, QRect, QSize, QSizePolicy, QSortFilterProxyModel, QStyledItemDelegate, QPixmap, QRect, QSize, QSizePolicy, QSortFilterProxyModel, QStyledItemDelegate,
Qt, QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, pyqtSignal, QDialog, QDialogButtonBox Qt, QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, pyqtSignal, QDialog, QDialogButtonBox
@ -316,7 +316,7 @@ class InsertImage(Dialog):
c = QApplication.instance().clipboard() c = QApplication.instance().clipboard()
img = c.image() img = c.image()
if img.isNull(): if img.isNull():
img = c.image(c.Selection) img = c.image(QClipboard.Mode.Selection)
if img.isNull(): if img.isNull():
return error_dialog(self, _('No image'), _( return error_dialog(self, _('No image'), _(
'There is no image on the clipboard'), show=True) 'There is no image on the clipboard'), show=True)

4
src/calibre/gui2/widgets.py
View File

@ -12,7 +12,7 @@ from PyQt5.Qt import (QIcon, QFont, QLabel, QListWidget, QAction, QEvent,
QCursor, QColor, QWidget, QPixmap, QSplitterHandle, QToolButton, QCursor, QColor, QWidget, QPixmap, QSplitterHandle, QToolButton,
Qt, pyqtSignal, QRegExp, QSize, QSplitter, QPainter, QPageSize, QPrinter, Qt, pyqtSignal, QRegExp, QSize, QSplitter, QPainter, QPageSize, QPrinter,
QLineEdit, QComboBox, QPen, QGraphicsScene, QMenu, QStringListModel, QKeySequence, QLineEdit, QComboBox, QPen, QGraphicsScene, QMenu, QStringListModel, QKeySequence,
QCompleter, QTimer, QRect, QGraphicsView, QPagedPaintDevice, QPalette) QCompleter, QTimer, QRect, QGraphicsView, QPagedPaintDevice, QPalette, QClipboard)
from calibre.constants import iswindows, ismacos from calibre.constants import iswindows, ismacos
from calibre.gui2 import (error_dialog, pixmap_to_data, gprefs, from calibre.gui2 import (error_dialog, pixmap_to_data, gprefs,
@ -295,7 +295,7 @@ class ImageDropMixin(object): # {{{
cb = QApplication.instance().clipboard() cb = QApplication.instance().clipboard()
pmap = cb.pixmap() pmap = cb.pixmap()
if pmap.isNull() and cb.supportsSelection(): if pmap.isNull() and cb.supportsSelection():
pmap = cb.pixmap(cb.Selection) pmap = cb.pixmap(QClipboard.Mode.Selection)
if not pmap.isNull(): if not pmap.isNull():
self.set_pixmap(pmap) self.set_pixmap(pmap)
self.cover_changed.emit( self.cover_changed.emit(