razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Force drop file MoveAction to CopyAction

Browse source
This commit is contained in:
manongjohn 2019-11-18 23:24:43 -05:00
parent c2d5af1b56
commit 0036c5de66
6 changed files with 79 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
toonz/sources/toonz/colormodelviewer.cpp
View file

@ -123,7 +123,10 @@ void ColorModelViewer::dragEnterEvent(QDragEnterEvent *event) {
std::string type = fp.getType();
if (type == "scr" || type == "tpl") return;
}
event->acceptProposedAction();
// Force CopyAction
event->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
event->accept();
}
//-----------------------------------------------------------------------------
@ -138,7 +141,10 @@ void ColorModelViewer::dropEvent(QDropEvent *event) {
loadImage(fp);
setLevel(fp);
}
event->acceptProposedAction();
// Force CopyAction
event->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
event->accept();
}
}

23
toonz/sources/toonz/dvitemview.cpp
View file

@ -40,6 +40,7 @@
#include <QFileDialog>
#include <QTextStream>
#include <qdrawutil.h>
#include <QMimeData>
#include <stdint.h> // for uint64_t
@ -1515,15 +1516,29 @@ void DvItemViewer::resetVerticalScrollBar() {
//-----------------------------------------------------------------------------
void DvItemViewer::dragEnterEvent(QDragEnterEvent *event) {
if (m_model && m_model->acceptDrop(event->mimeData()))
event->acceptProposedAction();
const QMimeData *mimeData = event->mimeData();
if (m_model && m_model->acceptDrop(mimeData)) {
if (acceptResourceOrFolderDrop(mimeData->urls())) {
// Force CopyAction
event->setDropAction(Qt::CopyAction);
event->accept();
} else
event->acceptProposedAction();
}
}
//-----------------------------------------------------------------------------
void DvItemViewer::dropEvent(QDropEvent *event) {
if (m_model && m_model->drop(event->mimeData()))
event->acceptProposedAction();
const QMimeData *mimeData = event->mimeData();
if (m_model && m_model->drop(mimeData)) {
if (acceptResourceOrFolderDrop(mimeData->urls())) {
// Force CopyAction
event->setDropAction(Qt::CopyAction);
event->accept();
} else
event->acceptProposedAction();
}
}
//-----------------------------------------------------------------------------

20
toonz/sources/toonz/flipbook.cpp
View file

@ -1760,7 +1760,8 @@ void ImageViewer::showHistogram() {
void FlipBook::dragEnterEvent(QDragEnterEvent *e) {
const QMimeData *mimeData = e->mimeData();
if (!acceptResourceDrop(mimeData->urls()) &&
bool isResourceDrop = acceptResourceDrop(mimeData->urls());
if (!isResourceDrop &&
!mimeData->hasFormat("application/vnd.toonz.drawings") &&
!mimeData->hasFormat(CastItems::getMimeFormat()))
return;
@ -1784,18 +1785,31 @@ void FlipBook::dragEnterEvent(QDragEnterEvent *e) {
}
}
e->acceptProposedAction();
if (isResourceDrop) {
// Force CopyAction
e->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
e->accept();
} else
e->acceptProposedAction();
}
//-----------------------------------------------------------------------------
void FlipBook::dropEvent(QDropEvent *e) {
const QMimeData *mimeData = e->mimeData();
bool isResourceDrop = acceptResourceDrop(mimeData->urls());
if (mimeData->hasUrls()) {
for (const QUrl &url : mimeData->urls()) {
TFilePath fp(url.toLocalFile().toStdWString());
if (TFileType::getInfo(fp) != TFileType::UNKNOW_FILE) setLevel(fp);
e->acceptProposedAction();
if (isResourceDrop) {
// Force CopyAction
e->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
e->accept();
} else
e->acceptProposedAction();
return;
}
} else if (mimeData->hasFormat(

8
toonz/sources/toonz/sceneviewerevents.cpp
View file

@ -1578,6 +1578,14 @@ void SceneViewer::dropEvent(QDropEvent *e) {
}
IoCmd::loadResources(args);
if (acceptResourceOrFolderDrop(mimeData->urls())) {
// Force Copy Action
e->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
e->accept();
return;
}
}
e->acceptProposedAction();
}

23
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -3090,12 +3090,17 @@ void CellArea::contextMenuEvent(QContextMenuEvent *event) {
//-----------------------------------------------------------------------------
void CellArea::dragEnterEvent(QDragEnterEvent *e) {
if (acceptResourceOrFolderDrop(e->mimeData()->urls()) ||
bool isResourceOrFolderDrop =
acceptResourceOrFolderDrop(e->mimeData()->urls());
if (isResourceOrFolderDrop ||
e->mimeData()->hasFormat(CastItems::getMimeFormat()) ||
e->mimeData()->hasFormat("application/vnd.toonz.drawings")) {
setDragTool(XsheetGUI::DragTool::makeDragAndDropDataTool(m_viewer));
// For file dragging force CopyAction
if (isResourceOrFolderDrop) e->setDropAction(Qt::CopyAction);
m_viewer->dragToolClick(e);
e->acceptProposedAction();
// For files, don't accept original proposed action in case it's a move
isResourceOrFolderDrop ? e->accept() : e->acceptProposedAction();
}
}
@ -3110,8 +3115,13 @@ void CellArea::dragLeaveEvent(QDragLeaveEvent *e) {
void CellArea::dragMoveEvent(QDragMoveEvent *e) {
if (!getDragTool()) return;
bool isResourceOrFolderDrop =
acceptResourceOrFolderDrop(e->mimeData()->urls());
// For file dragging force CopyAction
if (isResourceOrFolderDrop) e->setDropAction(Qt::CopyAction);
m_viewer->dragToolDrag(e);
e->acceptProposedAction();
// For files, don't accept original proposed action in case it's a move
isResourceOrFolderDrop ? e->accept() : e->acceptProposedAction();
}
//-----------------------------------------------------------------------------
@ -3122,8 +3132,13 @@ void CellArea::dropEvent(QDropEvent *e) {
if (e->source() == this) {
e->setDropAction(Qt::MoveAction);
e->accept();
} else if (acceptResourceOrFolderDrop(e->mimeData()->urls())) {
// For file dragging force CopyAction
e->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
e->accept();
} else
e->acceptProposedAction();
e->acceptProposedAction();
}
//-----------------------------------------------------------------------------

10
toonz/sources/toonzqt/paletteviewer.cpp
View file

@ -703,7 +703,10 @@ void PaletteViewer::dragEnterEvent(QDragEnterEvent *event) {
if (!path.getType().empty() && path.getType() != "tpl") return;
}
event->acceptProposedAction();
// Force CopyAction
event->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
event->accept();
}
//-----------------------------------------------------------------------------
@ -754,7 +757,10 @@ void PaletteViewer::dropEvent(QDropEvent *event) {
}
}
}
event->acceptProposedAction();
// Force CopyAction
event->setDropAction(Qt::CopyAction);
// For files, don't accept original proposed action in case it's a move
event->accept();
return;
}