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

Adjust to Ark's drag'n'drop D-Bus interface changes.

Browse source 
Ark's drag'n'drop D-Bus interface needs to be changed: so far, the object
path was always /DndExtract, but this does not work if Ark is being used as
an embedded KPart (in Konqueror or Rekonq, for example), as all tabs will
end up calling QDBusConnection::registerObject() with the same path. Only
the first call will work, and the result is that dragging and dropping from
any tab previewing an archive with Ark will extract from the first archive
being previewed.

To fix that, applications that accept the application/x-kde-dndextract
mimetype should now be adjusted to check the
application/x-kde-ark-dndextract-service and
application/x-kde-ark-dndextract-path ones instead; the former contains the
same service information that used to be passed, while the latter tells
which object path should be talked to.

This is the folderview part of the change, modeled after the changes made to
Dolphin.

CCBUG: 304860
This commit is contained in:
Raphael Kubo da Costa 2012-08-24 22:44:25 -03:00
parent 88e2492257
commit 396c2c3fcf
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plasma/applets/folderview/iconview.cpp
View file

@ -568,9 +568,9 @@ QPoint inline IconView::nextGridPosition(const QPoint &lastPos, const QSize &gri
QRect r = contentRect.adjusted(margin, margin, -margin, -margin);
if (m_flow == LeftToRight || m_flow == RightToLeft) {
if (layoutDirection() == Qt::LeftToRight) {
r.adjust(0, 0, -m_scrollBar->geometry().width(), 0);
r.adjust(0, 0, -m_scrollBar->geometry().width(), 0);
} else {
r.adjust(m_scrollBar->geometry().width(), 0, 0, 0);
r.adjust(m_scrollBar->geometry().width(), 0, 0, 0);
}
}
@ -600,8 +600,8 @@ QPoint inline IconView::nextGridPosition(const QPoint &lastPos, const QSize &gri
}
break;
case TopToBottom:
case TopToBottomRightToLeft:
case TopToBottom:
case TopToBottomRightToLeft:
pos.ry() += grid.height() + spacing;
if (pos.y() + grid.height() >= r.bottom()) {
if (m_flow == TopToBottom) {
@ -759,7 +759,7 @@ void IconView::layoutItems()
updateScrollBar();
}
// Returns the contents rect with the width and height snapped to the grid
// Returns the contents rect with the width and height snapped to the grid
// and aligned according to the direction of the flow.
QRect IconView::adjustedContentsRect(int *rowCount, int *colCount) const
{
@ -1770,7 +1770,7 @@ void IconView::keyPressEvent(QKeyEvent *event)
int newItem = 0;
int hMultiplier = 1;
int vMultiplier = 1;
switch (m_flow) //Perform flow related calculations
{
case RightToLeft:
@ -2093,7 +2093,8 @@ void IconView::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
void IconView::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
{
const bool accepted = KUrl::List::canDecode(event->mimeData()) ||
event->mimeData()->hasFormat(QLatin1String("application/x-kde-dndextract"));
(event->mimeData()->hasFormat(QLatin1String("application/x-kde-ark-dndextract-service")) &&
event->mimeData()->hasFormat(QLatin1String("application/x-kde-ark-dndextract-path")));
event->setAccepted(accepted);
m_hoverDrag = accepted;
}
@ -2266,12 +2267,14 @@ void IconView::dropEvent(QGraphicsSceneDragDropEvent *event)
ev.setDropAction(event->dropAction());
//kDebug() << "dropping to" << m_url << "with" << view() << event->modifiers();
if (mimeData->hasFormat(QLatin1String("application/x-kde-dndextract"))) {
const QString remoteDBusClient = mimeData->data(QLatin1String("application/x-kde-dndextract"));
if (mimeData->hasFormat(QLatin1String("application/x-kde-ark-dndextract-service")) &&
mimeData->hasFormat(QLatin1String("application/x-kde-ark-dndextract-service"))) {
const QString remoteDBusClient = mimeData->data(QLatin1String("application/x-kde-ark-dndextract-service"));
const QString remoteDBusPath = mimeData->data(QLatin1String("application/x-kde-ark-dndextract-path"));
QDBusMessage message =
QDBusMessage::createMethodCall(remoteDBusClient, QLatin1String("/DndExtract"),
QLatin1String("org.kde.DndExtract"),
QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
QLatin1String("org.kde.ark.DndExtract"),
QLatin1String("extractSelectedFilesTo"));
message.setArguments(QVariantList() << m_dirModel->dirLister()->url().pathOrUrl());
@ -2392,7 +2395,7 @@ void IconView::changeEvent(QEvent *event)
QMutableHashIterator<QString, QPoint> i(m_savedPositions);
while (i.hasNext()) {
i.next();
i.setValue(i.value() + delta);
i.setValue(i.value() + delta);
}
m_validRows = 0;
m_delayedLayoutTimer.start(10, this);
@ -2457,7 +2460,7 @@ void IconView::changeEvent(QEvent *event)
m_regionCache.clear();
markAreaDirty(mapToViewport(rect()).toAlignedRect());
updateScrollBar();
}
}
}
m_margins[Plasma::LeftMargin] = left;
@ -2694,7 +2697,7 @@ void IconView::openPopup(const QModelIndex &index)
delete m_popupView;
if (QApplication::activePopupWidget() || QApplication::activeModalWidget()) {
// Don't open a popup view when a menu or similar widget is being shown
// Don't open a popup view when a menu or similar widget is being shown
return;
}
@ -2767,7 +2770,7 @@ void IconView::timerEvent(QTimerEvent *event)
r.adjust(int(m_scrollBar->geometry().width()), 0, 0, 0);
}
}
for (int i = 0; i < m_validRows; i++) {
if ((horizontalFlow && m_items[i].rect.right() > r.right()) ||
(!horizontalFlow && m_items[i].rect.bottom() > r.height()))