kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix drag & drop issues with non-local URLs

Browse source 
BUG: 292821
BUG: 292355
FIXED-IN: 4.8.1
This commit is contained in:
Peter Penz 2012-01-30 12:07:08 +01:00
parent 0a33aad3d2
commit 1d7088b1ad
7 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphinmainwindow.cpp
View file

@ -1330,7 +1330,7 @@ void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)
const ViewTab& viewTab = m_viewTab[tab];
const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view()
: viewTab.secondaryView->view();
DragAndDropHelper::dropUrls(view->rootItem(), event);
DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event);
}
}

3
src/dolphinviewcontainer.cpp
View file

@ -538,8 +538,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
{
const KFileItem destItem(KFileItem::Unknown, KFileItem::Unknown, destination);
DragAndDropHelper::dropUrls(destItem, event);
DragAndDropHelper::dropUrls(KFileItem(), destination, event);
}
void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)

8
src/panels/folders/folderspanel.cpp
View file

@ -263,11 +263,7 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve
KFileItemModel* model = fileItemModel();
KFileItem destItem = model->fileItem(index);
if (destItem.isNull()) {
destItem = model->rootItem();
if (destItem.isNull()) {
kWarning() << "No destination item available for drop operation.";
return;
}
return;
}
QDropEvent dropEvent(event->pos().toPoint(),
@ -276,7 +272,7 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve
event->buttons(),
event->modifiers());
DragAndDropHelper::dropUrls(destItem, &dropEvent);
DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent);
}
}

3
src/panels/places/placespanel.cpp
View file

@ -48,8 +48,7 @@ void PlacesPanel::mousePressEvent(QMouseEvent* event)
void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
{
Q_UNUSED(parent);
const KFileItem destItem(KFileItem::Unknown, KFileItem::Unknown, dest);
DragAndDropHelper::dropUrls(destItem, event);
DragAndDropHelper::dropUrls(KFileItem(), dest, event);
}
void PlacesPanel::emitExtendedUrlChangedSignal(const KUrl& url)

17
src/views/dolphinview.cpp
View file

@ -809,13 +809,13 @@ void DolphinView::slotItemUnhovered(int index)
void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
{
KUrl destUrl;
KFileItem destItem = fileItemModel()->fileItem(index);
if (destItem.isNull()) {
destItem = fileItemModel()->rootItem();
if (destItem.isNull()) {
kWarning() << "No destination item available for drop operation.";
return;
}
destUrl = url();
} else {
destUrl = destItem.url();
}
QDropEvent dropEvent(event->pos().toPoint(),
@ -824,7 +824,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
event->buttons(),
event->modifiers());
const QString error = DragAndDropHelper::dropUrls(destItem, &dropEvent);
const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
if (!error.isEmpty()) {
emit errorMessage(error);
}
@ -959,12 +959,7 @@ bool DolphinView::hasSelection() const
KFileItem DolphinView::rootItem() const
{
KFileItem item = m_dirLister->rootItem();
if (item.isNull()) {
// The directory has not been loaded yet
item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url());
}
return item;
return m_dirLister->rootItem();
}
void DolphinView::observeCreatedItem(const KUrl& url)

15
src/views/draganddrophelper.cpp
View file

@ -28,13 +28,10 @@
#include <QtDBus>
#include <QDropEvent>
QString DragAndDropHelper::dropUrls(const KFileItem& destItem, QDropEvent* event)
QString DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destUrl, QDropEvent* event)
{
Q_ASSERT(!destItem.isNull());
const KUrl destination = destItem.url();
if (!destItem.isWritable()) {
return i18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>", destination.pathOrUrl());
if (!destItem.isNull() && !destItem.isWritable()) {
return i18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>", destUrl.pathOrUrl());
}
const QMimeData* mimeData = event->mimeData();
@ -42,17 +39,17 @@ QString DragAndDropHelper::dropUrls(const KFileItem& destItem, QDropEvent* event
const QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract",
"org.kde.DndExtract", "extractSelectedFilesTo");
message.setArguments(QVariantList() << destination.pathOrUrl());
message.setArguments(QVariantList() << destUrl.pathOrUrl());
QDBusConnection::sessionBus().call(message);
} else {
const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
foreach (const KUrl& url, urls) {
if (url == destination) {
if (url == destUrl) {
return i18nc("@info:status", "A folder cannot be dropped into itself");
}
}
KonqOperations::doDrop(destItem, destination, event, QApplication::activeWindow());
KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow());
}
return QString();

11
src/views/draganddrophelper.h
View file

@ -38,12 +38,19 @@ public:
* destination. A context menu with the options
* 'Move Here', 'Copy Here', 'Link Here' and
* 'Cancel' is offered to the user.
* @param destItem Item of the destination.
* @param destItem Item of the destination. Can be 0 (KFileItem::isNull()) if
* no file-item is available for the destination. In this case
* destUrl is used as fallback. For performance reasons it is
* recommended to pass a file-item if available.
* @param destUrl URL of the item destination. Is used only if destItem::isNull()
* is true.
* @param event Drop event.
* @return Error message if dropping is not possible. If an empty string
* is returned, the dropping has been successful.
*/
static QString dropUrls(const KFileItem& destItem, QDropEvent* event);
static QString dropUrls(const KFileItem& destItem,
const KUrl& destUrl,
QDropEvent* event);
};
#endif