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

Proper fix for finding Qt base class in dnd mouse handlers

Browse Source 
The change for py3 compat broke the handler for classes not directly
descended from a Qt item view class.
This commit is contained in:
Kovid Goyal 2019-04-02 13:31:55 +05:30
parent 6272e4db9d
commit bcece5de0b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/library/alternate_views.py
View File

@ -17,7 +17,7 @@ from PyQt5.Qt import (
QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QEvent, QMimeData, QUrl, QDrag, QPoint, QPainter, QRect, pyqtProperty, QEvent,
QPropertyAnimation, QEasingCurve, pyqtSlot, QHelpEvent, QAbstractItemView, QPropertyAnimation, QEasingCurve, pyqtSlot, QHelpEvent, QAbstractItemView,
QStyleOptionViewItem, QToolTip, QByteArray, QBuffer, QBrush, qRed, qGreen, QStyleOptionViewItem, QToolTip, QByteArray, QBuffer, QBrush, qRed, qGreen,
qBlue, QItemSelectionModel, QIcon, QFont) qBlue, QItemSelectionModel, QIcon, QFont, QTableView, QTreeView)
from calibre import fit_image, prints, prepare_string_for_xml, human_readable from calibre import fit_image, prints, prepare_string_for_xml, human_readable
from calibre.constants import DEBUG, config_dir, islinux from calibre.constants import DEBUG, config_dir, islinux
@ -85,6 +85,13 @@ def image_to_data(image): # {{{
# Drag 'n Drop {{{ # Drag 'n Drop {{{
def qt_item_view_base_class(self):
for q in (QTableView, QListView, QTreeView):
if isinstance(self, q):
return q
return QAbstractItemView
def dragMoveEvent(self, event): def dragMoveEvent(self, event):
event.acceptProposedAction() event.acceptProposedAction()
@ -102,7 +109,7 @@ def mousePressEvent(self, event):
self.drag_start_pos = ep self.drag_start_pos = ep
if hasattr(self, 'handle_mouse_press_event'): if hasattr(self, 'handle_mouse_press_event'):
return self.handle_mouse_press_event(event) return self.handle_mouse_press_event(event)
return super(self.__class__, self).mousePressEvent(event) return qt_item_view_base_class(self).mousePressEvent(self, event)
def drag_icon(self, cover, multiple): def drag_icon(self, cover, multiple):
@ -182,7 +189,7 @@ def mouseMoveEvent(self, event):
if not self.drag_allowed: if not self.drag_allowed:
return return
if self.drag_start_pos is None: if self.drag_start_pos is None:
return super(self.__class__, self).mouseMoveEvent(event) return qt_item_view_base_class(self).mouseMoveEvent(self, event)
if self.event_has_mods(): if self.event_has_mods():
self.drag_start_pos = None self.drag_start_pos = None