From 5cd03bc72fff5dee937832903ec5cc269b019960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 11 Jan 2015 10:54:10 +0100 Subject: [PATCH] disabled drag&drop move action for importing new comics --- YACReaderLibrary/comics_view.cpp | 4 ++-- YACReaderLibrary/empty_folder_widget.cpp | 4 ++-- YACReaderLibrary/yacreader_folders_view.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/YACReaderLibrary/comics_view.cpp b/YACReaderLibrary/comics_view.cpp index 0c48a724..47d181cd 100644 --- a/YACReaderLibrary/comics_view.cpp +++ b/YACReaderLibrary/comics_view.cpp @@ -19,7 +19,7 @@ void ComicsView::dragEnterEvent(QDragEnterEvent *event) { QList urlList; - if (event->mimeData()->hasUrls()) + if (event->mimeData()->hasUrls() && event->dropAction() == Qt::CopyAction) { urlList = event->mimeData()->urls(); QString currentPath; @@ -40,7 +40,7 @@ void ComicsView::dropEvent(QDropEvent *event) { QLOG_DEBUG() << "drop" << event->dropAction(); - bool validAction = event->dropAction() == Qt::CopyAction || event->dropAction() & Qt::MoveAction; + bool validAction = event->dropAction() == Qt::CopyAction;// || event->dropAction() & Qt::MoveAction; TODO move if(validAction) { diff --git a/YACReaderLibrary/empty_folder_widget.cpp b/YACReaderLibrary/empty_folder_widget.cpp index 7ffdbdd1..e9760ab6 100644 --- a/YACReaderLibrary/empty_folder_widget.cpp +++ b/YACReaderLibrary/empty_folder_widget.cpp @@ -110,7 +110,7 @@ void EmptyFolderWidget::dragEnterEvent(QDragEnterEvent *event) { QList urlList; - if (event->mimeData()->hasUrls()) + if (event->mimeData()->hasUrls() && event->dropAction() == Qt::CopyAction) { urlList = event->mimeData()->urls(); QString currentPath; @@ -131,7 +131,7 @@ void EmptyFolderWidget::dropEvent(QDropEvent *event) { QLOG_DEBUG() << "drop in emptyfolder" << event->dropAction(); - bool validAction = event->dropAction() == Qt::CopyAction || event->dropAction() & Qt::MoveAction; + bool validAction = event->dropAction() == Qt::CopyAction; // || event->dropAction() & Qt::MoveAction; TODO move if(validAction) { diff --git a/YACReaderLibrary/yacreader_folders_view.cpp b/YACReaderLibrary/yacreader_folders_view.cpp index 55353d80..0f774bc5 100644 --- a/YACReaderLibrary/yacreader_folders_view.cpp +++ b/YACReaderLibrary/yacreader_folders_view.cpp @@ -21,7 +21,7 @@ void YACReaderFoldersView::dragEnterEvent(QDragEnterEvent *event) QList urlList; - if (event->mimeData()->hasUrls()) + if (event->mimeData()->hasUrls() && event->dropAction() == Qt::CopyAction) { urlList = event->mimeData()->urls(); QString currentPath; @@ -55,7 +55,7 @@ void YACReaderFoldersView::dropEvent(QDropEvent *event) QLOG_DEBUG() << "drop on tree" << event->dropAction(); - bool validAction = event->dropAction() == Qt::CopyAction || event->dropAction() & Qt::MoveAction; + bool validAction = event->dropAction() == Qt::CopyAction; // || event->dropAction() & Qt::MoveAction; TODO move if(validAction) {