diff --git a/src/libprs500/gui2/library.py b/src/libprs500/gui2/library.py index 3a3f81358d..5b26c4c593 100644 --- a/src/libprs500/gui2/library.py +++ b/src/libprs500/gui2/library.py @@ -440,9 +440,11 @@ class BooksView(TableView): def dragEnterEvent(self, event): - if int(event.possibleActions() & Qt.CopyAction) != 1: + if int(event.possibleActions() & Qt.CopyAction) + \ + int(event.possibleActions() & Qt.MoveAction) == 0: return paths = self.paths_from_event(event) + if paths: event.acceptProposedAction() diff --git a/src/libprs500/gui2/main.py b/src/libprs500/gui2/main.py index 797640ff07..38d2b600f4 100644 --- a/src/libprs500/gui2/main.py +++ b/src/libprs500/gui2/main.py @@ -179,6 +179,8 @@ class Main(MainWindow, Ui_MainWindow): ####################### Library view ######################## self.library_view.set_database(self.database_path) + QObject.connect(self.library_view, SIGNAL('files_dropped(PyQt_PyObject)'), + self.files_dropped) for func, target in [ ('connect_to_search_box', self.search), ('connect_to_book_display', self.status_bar.book_info.show_data), @@ -335,7 +337,9 @@ class Main(MainWindow, Ui_MainWindow): ''' self.add_recursive(False) - + def files_dropped(self, paths): + to_device = self.stack.currentIndex() != 0 + self._add_books(paths, to_device) def add_books(self, checked):