mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-03-02 00:24:40 +01:00
More fix for #7131 - disable drag & drop
This commit is contained in:
parent
4e8115a753
commit
00fd77ffe8
2 changed files with 14 additions and 4 deletions
|
|
@ -793,11 +793,14 @@ def metadata_downloaded(self, job):
|
|||
self.set_books_in_library(job.result, reset=True)
|
||||
mainlist, cardalist, cardblist = job.result
|
||||
self.memory_view.set_database(mainlist)
|
||||
self.memory_view.set_editable(self.device_manager.device.CAN_SET_METADATA)
|
||||
self.memory_view.set_editable(self.device_manager.device.CAN_SET_METADATA,
|
||||
self.device_manager.device.SUPPORTS_BACKLOADING)
|
||||
self.card_a_view.set_database(cardalist)
|
||||
self.card_a_view.set_editable(self.device_manager.device.CAN_SET_METADATA)
|
||||
self.card_a_view.set_editable(self.device_manager.device.CAN_SET_METADATA,
|
||||
self.device_manager.device.SUPPORTS_BACKLOADING)
|
||||
self.card_b_view.set_database(cardblist)
|
||||
self.card_b_view.set_editable(self.device_manager.device.CAN_SET_METADATA)
|
||||
self.card_b_view.set_editable(self.device_manager.device.CAN_SET_METADATA,
|
||||
self.device_manager.device.SUPPORTS_BACKLOADING)
|
||||
self.sync_news()
|
||||
self.sync_catalogs()
|
||||
self.refresh_ondevice()
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ class BooksView(QTableView): # {{{
|
|||
def __init__(self, parent, modelcls=BooksModel):
|
||||
QTableView.__init__(self, parent)
|
||||
|
||||
self.drag_allowed = True
|
||||
self.setDragEnabled(True)
|
||||
self.setDragDropOverwriteMode(False)
|
||||
self.setDragDropMode(self.DragDrop)
|
||||
|
|
@ -505,6 +506,8 @@ def mousePressEvent(self, event):
|
|||
return QTableView.mousePressEvent(self, event)
|
||||
|
||||
def mouseMoveEvent(self, event):
|
||||
if not self.drag_allowed:
|
||||
return
|
||||
if self.drag_start_pos is None:
|
||||
return QTableView.mouseMoveEvent(self, event)
|
||||
|
||||
|
|
@ -613,7 +616,7 @@ def select_rows(self, identifiers, using_ids=True, change_current=True,
|
|||
def close(self):
|
||||
self._model.close()
|
||||
|
||||
def set_editable(self, editable):
|
||||
def set_editable(self, editable, supports_backloading):
|
||||
self._model.set_editable(editable)
|
||||
|
||||
def connect_to_search_box(self, sb, search_done):
|
||||
|
|
@ -700,5 +703,9 @@ def dropEvent(self, *args):
|
|||
error_dialog(self, _('Not allowed'),
|
||||
_('Dropping onto a device is not supported. First add the book to the calibre library.')).exec_()
|
||||
|
||||
def set_editable(self, editable, supports_backloading):
|
||||
self._model.set_editable(editable)
|
||||
self.drag_allowed = supports_backloading
|
||||
|
||||
# }}}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue