Merge lp:~osomon/unity-2d/drag-from-dash into lp:unity-2d/3.0

[Olivier Tilloy]

[dash] Support dragging files and installed applications from the dash to the launcher, the desktop or file managers.

This branch introduces a new QML item, DragItemWithUrl, used in the dash to allow initiating drag events from the elements displayed in the places.

Installed applications and files can be dragged to the launcher, to the desktop or to any window that accepts drag events with "file://" URLs (e.g. file managers).

Available (non installed) applications cannot be dragged.

The careful reviewer will test that the functionality works as expected, that this doesn’t introduce regressions in the dash (in particular opening files/folders and launching applications) and in the launcher (drag’n’drop of desktop files from a file manager, drag’n’drop of files to the trash, drag’n’drop of URLs from the browser’s address bar).

[Florian Boucault (fboucault)]

WARNING: THIS IS NOT A COMPLETE REVIEW

I did a quick functional test and it's pretty neat, well done!
One thing I noticed, the icons are very aliased whereas if I drag&drop an app in /usr/share/applications from Nautilus for example it will look antialiased. Any idea?

[Olivier Tilloy (osomon)]

No, unfortunately I have no idea how to improve this. The code is quite simple so I’m probably missing something obvious. Any suggestions are welcome.

[lp:~osomon/unity-2d/drag-from-dash]

568. By Olivier Tilloy on 2011-05-24

Nice antialiased icons during drag’n’drop if compositing is enabled.

569. By Olivier Tilloy on 2011-05-24

Cheap solution to avoid aliasing when compositiong is disabled: draw a solid white background.

[Olivier Tilloy (osomon)]

The last two revisions fix the aliasing problem. There are two possible cases:

 - if compositing is enabled, the icon is nicely antialiased, as one would expect
 - if compositing is disabled, the icon is drawn on a solid white background (with rounded corners to make it easier on the eye), so that aliasing is not visible

Comments on the fallback when compositing is disabled are welcome, we can probably implement something different if needed.

[Florian Boucault (fboucault)]

Functionally beautiful now!

review: Approve (functional)

[Florian Boucault (fboucault)]

Overall the code is nice and simple.
A few comments:

- a Component should be passed as DragItemWithUrl's delegate as to not create Image instances unless necessary. Instead of:

  DragItemWithUrl {
    delegate: Image {...}
  }

Use:

  DragItemWithUrl {
    delegate: imageComponentId
  }

  Component {
    id: imageComponentId
    Image {...}
  }

- DeclarativeDragItem::drop signal name should have a better name, for example 'dragInitiated'

- The workaround that has been added to AbstractButton could use a link to qt bug report 13007 that if I am right should remove the need for it in the future (http://bugreports.qt.nokia.com/browse/QTBUG-13007)

review: Needs Fixing (code)

[lp:~osomon/unity-2d/drag-from-dash]

570. By Olivier Tilloy on 2011-05-30

Made the delegate a Component so that it’s instantiated on demand only when needed.

571. By Olivier Tilloy on 2011-05-30

Add a comment and link to QTBUG-13007.

[Olivier Tilloy (osomon)]

> - a Component should be passed as DragItemWithUrl's delegate as to not create
> Image instances unless necessary. Instead of:

Thanks for pointing this out. I had originally tried to write it this way, but I had failed to do so. I tackled the problem again, this time successfully. This is revision 570.

> - DeclarativeDragItem::drop signal name should have a better name, for example
> 'dragInitiated'

Nope, it’s called 'drop' because it’s actually emitted upon dropping the dragged item, not when the drag action is initiated.

> - The workaround that has been added to AbstractButton could use a link to qt
> bug report 13007 that if I am right should remove the need for it in the
> future (http://bugreports.qt.nokia.com/browse/QTBUG-13007)

You’re right. Added at revision 571.

=== modified file 'launcher/UnityApplications/place.cpp'
--- launcher/UnityApplications/place.cpp	2011-05-03 15:38:35 +0000
+++ launcher/UnityApplications/place.cpp	2011-05-30 16:06:44 +0000
@@ -429,8 +429,8 @@
         /* Cannot set the desktop file to url.host(), because the QUrl constructor
            converts the host name to lower case to conform to the Nameprep
            RFC (see http://doc.qt.nokia.com/qurl.html#FormattingOption-enum).
-           Ref: http://bugs.launchpad.net/unity-2d/+bug/723604 */
-        QString desktopFile = uri.right(uri.size() - uri.indexOf("://") - 3);
+           Ref: https://bugs.launchpad.net/unity-place-applications/+bug/784478 */
+        QString desktopFile = uri.mid(uri.indexOf("://") + 3);
         application.setDesktopFile(desktopFile);
         application.activate();
         return;
 
=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-05-19 14:12:41 +0000
+++ launcher/app/launcherview.cpp	2011-05-30 16:06:44 +0000
@@ -271,8 +271,7 @@
     foreach (QUrl url, getEventUrls(event)) {
         if (url.scheme() == "file" && url.path().endsWith(".desktop")) {
             emit desktopFileDropped(url.path());
-        }
-        else if (url.scheme().startsWith("http")) {
+        } else if (url.scheme().startsWith("http")) {
             emit webpageUrlDropped(url);
         }
     }
 
=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-02-17 12:04:10 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-05-30 16:06:44 +0000
@@ -15,6 +15,8 @@
     cacheeffect.cpp
     workspacesinfo.cpp
     signalwaiter.cpp
+    dragitem.cpp
+    dragitemwithurl.cpp
     dropitem.cpp
     )
 
@@ -27,6 +29,8 @@
     cacheeffect.h
     workspacesinfo.h
     signalwaiter.h
+    dragitem.h
+    dragitemwithurl.h
     dropitem.h
     )
 
 
=== added file 'libunity-2d-private/Unity2d/dragitem.cpp'
--- libunity-2d-private/Unity2d/dragitem.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/dragitem.cpp	2011-05-30 16:06:44 +0000
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dragitem.h"
+
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QGraphicsSceneMouseEvent>
+#include <QApplication>
+#include <QDrag>
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QMimeData>
+#include <QX11Info>
+
+DeclarativeDragItem::DeclarativeDragItem(QDeclarativeItem* parent)
+    : QDeclarativeItem(parent)
+    , m_delegate(NULL)
+    , m_supportedActions(Qt::LinkAction)
+    , m_defaultAction(Qt::LinkAction)
+{
+    setAcceptedMouseButtons(Qt::LeftButton);
+}
+
+DeclarativeDragItem::~DeclarativeDragItem()
+{
+}
+
+QDeclarativeComponent*
+DeclarativeDragItem::delegate() const
+{
+    return m_delegate;
+}
+
+void
+DeclarativeDragItem::setDelegate(QDeclarativeComponent* delegate)
+{
+    if (delegate != m_delegate) {
+        m_delegate = delegate;
+        Q_EMIT delegateChanged();
+    }
+}
+
+void
+DeclarativeDragItem::resetDelegate()
+{
+    setDelegate(NULL);
+}
+
+Qt::DropActions
+DeclarativeDragItem::supportedActions() const
+{
+    return m_supportedActions;
+}
+
+void
+DeclarativeDragItem::setSupportedActions(Qt::DropActions actions)
+{
+    if (actions != m_supportedActions) {
+        m_supportedActions = actions;
+        Q_EMIT supportedActionsChanged();
+    }
+}
+
+Qt::DropAction
+DeclarativeDragItem::defaultAction() const
+{
+    return m_defaultAction;
+}
+
+void
+DeclarativeDragItem::setDefaultAction(Qt::DropAction action)
+{
+    if (action != m_defaultAction) {
+        m_defaultAction = action;
+        Q_EMIT defaultActionChanged();
+    }
+}
+
+QMimeData* DeclarativeDragItem::mimeData() const
+{
+    // Default implementation, empty mime data.
+    return new QMimeData;
+}
+
+void
+DeclarativeDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
+{
+    int distance = (event->buttonDownScreenPos(Qt::LeftButton) - event->screenPos()).manhattanLength();
+    if (distance < QApplication::startDragDistance()) {
+        return;
+    }
+
+    QDrag* drag = new QDrag(event->widget());
+    drag->setMimeData(mimeData());
+
+    if (m_delegate != NULL) {
+        QObject* delegateObject = m_delegate->create(QDeclarativeEngine::contextForObject(this));
+        QDeclarativeItem* delegate = qobject_cast<QDeclarativeItem*>(delegateObject);
+        if (delegate != NULL) {
+            /* Render the delegate to a pixmap. */
+            QGraphicsScene scene;
+            scene.addItem(delegate);
+
+            QPixmap pixmap(scene.sceneRect().width(), scene.sceneRect().height());
+            bool compositing = QX11Info::isCompositingManagerRunning();
+            if (!compositing) {
+                pixmap.fill(Qt::transparent);
+            }
+            QPainter painter(&pixmap);
+            if (compositing) {
+                painter.setCompositionMode(QPainter::CompositionMode_Source);
+            } else {
+                /* Cheap solution to avoid aliasing: draw a solid white background. */
+                painter.setPen(Qt::white);
+                painter.setBrush(Qt::white);
+                painter.drawRoundedRect(scene.sceneRect(), 5, 5);
+            }
+            scene.render(&painter);
+            scene.removeItem(delegate);
+            delete delegate;
+
+            drag->setPixmap(pixmap);
+            drag->setHotSpot(QPoint(pixmap.width() / 2, pixmap.height() / 2));
+        }
+    }
+
+    Qt::DropAction action = drag->exec(m_supportedActions, m_defaultAction);
+    Q_EMIT drop(action);
+}
+
+void
+DeclarativeDragItem::mousePressEvent(QGraphicsSceneMouseEvent* event)
+{
+    Q_EMIT pressed();
+}
+
+void
+DeclarativeDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+{
+    Q_EMIT released();
+}
+
 
=== added file 'libunity-2d-private/Unity2d/dragitem.h'
--- libunity-2d-private/Unity2d/dragitem.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/dragitem.h	2011-05-30 16:06:44 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DeclarativeDragItem_H
+#define DeclarativeDragItem_H
+
+#include <QDeclarativeItem>
+
+class QMimeData;
+class QDeclarativeComponent;
+
+class DeclarativeDragItem : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QDeclarativeComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged RESET resetDelegate)
+    Q_PROPERTY(Qt::DropActions supportedActions READ supportedActions WRITE setSupportedActions NOTIFY supportedActionsChanged)
+    Q_PROPERTY(Qt::DropAction defaultAction READ defaultAction WRITE setDefaultAction NOTIFY defaultActionChanged)
+
+public:
+    DeclarativeDragItem(QDeclarativeItem* parent=0);
+    ~DeclarativeDragItem();
+
+    // getters and setters
+    QDeclarativeComponent* delegate() const;
+    void setDelegate(QDeclarativeComponent* delegate);
+    void resetDelegate();
+    Qt::DropActions supportedActions() const;
+    void setSupportedActions(Qt::DropActions actions);
+    Qt::DropAction defaultAction() const;
+    void setDefaultAction(Qt::DropAction action);
+
+protected:
+    // override in child classes to set a non-empty mime data
+    virtual QMimeData* mimeData() const;
+
+Q_SIGNALS:
+    void delegateChanged();
+    void supportedActionsChanged();
+    void defaultActionChanged();
+    void drop(int action);
+
+    // Can’t pass around the mouse events as parameters
+    // as QDeclarativeMouseEvent is a private class.
+    void pressed();
+    void released();
+
+protected:
+    // reimplemented
+    void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
+    void mousePressEvent(QGraphicsSceneMouseEvent* event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
+
+private:
+    QDeclarativeComponent* m_delegate;
+    Qt::DropActions m_supportedActions;
+    Qt::DropAction m_defaultAction;
+};
+
+#endif // DeclarativeDragItem_H
+
 
=== added file 'libunity-2d-private/Unity2d/dragitemwithurl.cpp'
--- libunity-2d-private/Unity2d/dragitemwithurl.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/dragitemwithurl.cpp	2011-05-30 16:06:44 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dragitemwithurl.h"
+
+// libunity-2d
+#include <gscopedpointer.h>
+
+// GIO
+#undef signals
+extern "C" {
+    #include <gio/gdesktopappinfo.h>
+}
+
+// Qt
+#include <QMimeData>
+
+DeclarativeDragItemWithUrl::DeclarativeDragItemWithUrl(QDeclarativeItem* parent)
+    : DeclarativeDragItem(parent)
+{
+}
+
+DeclarativeDragItemWithUrl::~DeclarativeDragItemWithUrl()
+{
+}
+
+const QString& DeclarativeDragItemWithUrl::url() const
+{
+    return m_url;
+}
+
+void DeclarativeDragItemWithUrl::setUrl(const QString& url)
+{
+    if (url != m_url) {
+        m_url = url;
+        Q_EMIT urlChanged(m_url);
+    }
+}
+
+QMimeData* DeclarativeDragItemWithUrl::mimeData() const
+{
+    QMimeData* data = new QMimeData;
+    if (!m_url.isEmpty()) {
+        QList<QUrl> urls;
+        urls.append(decodeUri(m_url));
+        data->setUrls(urls);
+    }
+    return data;
+}
+
+QUrl DeclarativeDragItemWithUrl::decodeUri(const QString& uri)
+{
+    if (uri.startsWith("application://")) {
+        QString desktopFileName = uri.mid(14);
+        QByteArray bytes = desktopFileName.toUtf8();
+        GObjectScopedPointer<GDesktopAppInfo> appInfo(g_desktop_app_info_new(bytes.constData()));
+        if (appInfo.isNull()) {
+            return QUrl(uri);
+        }
+        QString filePath = QString::fromUtf8(g_desktop_app_info_get_filename(appInfo.data()));
+        return QUrl("file://" + filePath);
+    } else {
+        return QUrl(uri);
+    }
+}
+
 
=== added file 'libunity-2d-private/Unity2d/dragitemwithurl.h'
--- libunity-2d-private/Unity2d/dragitemwithurl.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/dragitemwithurl.h	2011-05-30 16:06:44 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DeclarativeDragItemWithUrl_H
+#define DeclarativeDragItemWithUrl_H
+
+#include "dragitem.h"
+
+// Qt
+#include <QString>
+#include <QUrl>
+
+/* A specialized DragItem with a 'url' property that knows how to convert
+   application:// URLs into the corresponding file:// URLs. */
+class DeclarativeDragItemWithUrl : public DeclarativeDragItem
+{
+    Q_OBJECT
+
+    /* The URL cannot be a QUrl due to the malformed URIs returned by the place
+    backends (see https://bugs.launchpad.net/unity-place-applications/+bug/784478). */
+    Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
+
+public:
+    DeclarativeDragItemWithUrl(QDeclarativeItem* parent=0);
+    ~DeclarativeDragItemWithUrl();
+
+    // getters and setters
+    const QString& url() const;
+    void setUrl(const QString& url);
+
+protected:
+    // overridden
+    QMimeData* mimeData() const;
+
+private:
+    static QUrl decodeUri(const QString& uri);
+
+Q_SIGNALS:
+    void urlChanged(const QString&);
+
+private:
+    QString m_url;
+};
+
+#endif // DeclarativeDragItemWithUrl_H
+
 
=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-04-28 13:09:25 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-05-30 16:06:44 +0000
@@ -34,6 +34,7 @@
 
 #include "mimedata.h"
 #include "dragdropevent.h"
+#include "dragitemwithurl.h"
 #include "dropitem.h"
 
 #include <QtDeclarative/qdeclarative.h>
@@ -76,6 +77,7 @@
     qmlRegisterType<QGraphicsDropShadowEffect>("Effects", 1, 0, "DropShadow");
 
     /* Custom drag’n’drop implementation in QML */
+    qmlRegisterType<DeclarativeDragItemWithUrl>(uri, 0, 1, "DragItemWithUrl");
     qmlRegisterType<DeclarativeDropItem>(uri, 0, 1, "DropItem");
     qmlRegisterType<DeclarativeMimeData>();
     qmlRegisterType<DeclarativeDragDropEvent>();
 
=== modified file 'places/AbstractButton.qml'
--- places/AbstractButton.qml	2011-03-22 06:15:19 +0000
+++ places/AbstractButton.qml	2011-05-30 16:06:44 +0000
@@ -21,6 +21,13 @@
 FocusScope {
     property bool enabled: true
 
+    /* Use to manually set the "pressed" state of the button. This is not
+       necessary in the normal use case, but is useful when a child item eats
+       the mouse events (e.g. a DragArea).
+       This is a clumsy workaround for the lack of a MouseProxy element
+       (see http://bugreports.qt.nokia.com/browse/QTBUG-13007). */
+    property bool pressed: false
+
     signal clicked
 
     MouseArea {
@@ -45,7 +52,7 @@
     }
 
     state: {
-        if(mouse_area.pressed)
+        if(pressed || mouse_area.pressed)
             return "pressed"
         else if(mouse_area.containsMouse)
             return "selected"
 
=== modified file 'places/UnityDefaultRenderer.qml'
--- places/UnityDefaultRenderer.qml	2011-04-08 11:10:59 +0000
+++ places/UnityDefaultRenderer.qml	2011-05-30 16:06:44 +0000
@@ -17,6 +17,7 @@
  */
 
 import Qt 4.7
+import Unity2d 1.0 /* required for drag’n’drop handling */
 
 RendererGrid {
     cellWidth: 136
@@ -37,6 +38,34 @@
                 placeEntryModel.place.activate(decodeURIComponent(uri))
             }
 
+            DragItemWithUrl {
+                anchors.fill: parent
+                url: decodeURIComponent(uri)
+                defaultAction: {
+                    if (!url.indexOf("application://")) return Qt.CopyAction
+                    else if (!url.indexOf("unity-install://")) return Qt.IgnoreAction
+                    else return Qt.LinkAction
+                }
+                supportedActions: defaultAction
+                delegate: Component {
+                    Image {
+                        source: icon.source
+                        width: icon.width
+                        height: icon.height
+                        fillMode: icon.fillMode
+                        sourceSize.width: width
+                        sourceSize.height: height
+                        asynchronous: true
+                    }
+                }
+                onPressed: parent.pressed = true
+                onReleased: {
+                    parent.pressed = false
+                    parent.clicked()
+                }
+                onDrop: parent.pressed = false
+            }
+
             Image {
                 id: icon