Changeset 57288 in vbox

Timestamp:

Aug 12, 2015 11:45:18 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102047

Message:

DnD: Fe/Qt: Emit signal for sltGetData() instead of directly calling it, send extra mouse event to guest on a successful drop to host to more reliably let the guest know what happened.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIDnDHandler.cpp (modified) (3 diffs)
• UIDnDHandler.h (modified) (1 diff)
• UIDnDMIMEData.cpp (modified) (2 diffs)
• UIDnDMIMEData.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp

@@ -383 +383 @@
             m_pMIMEData, SLOT(sltDropActionChanged(Qt::DropAction)));
 
+    /* Invoke this handler as data needs to be retrieved by our derived QMimeData class. */
+    connect(m_pMIMEData, SIGNAL(sigGetData(Qt::DropAction, const QString&, QVariant::Type, QVariant&)),
+            this, SLOT(sltGetData(Qt::DropAction, const QString&, QVariant::Type, QVariant&)));
+
     /*
      * Set MIME data object and start the (modal) drag'n drop operation on the host.
@@ -651 +655 @@
     int rc = VINF_SUCCESS;
 
+    /* Send a mouse event with released mouse buttons into the guest that triggers
+     * the "drop" event in our proxy window on the guest. */
+    AssertPtr(m_pSession);
+    m_pSession->mouse().PutMouseEvent(0, 0, 0, 0, 0);
+
     /* Start getting the data from the source. Request and transfer data
      * from the source and display a modal progress dialog while doing this. */
@@ -703 +712 @@
     m_enmMode = enmMode;
     LogFlowFunc(("Mode is now: %RU32\n", m_enmMode));
+}
+
+int UIDnDHandler::sltGetData(      Qt::DropAction  dropAction,
+                             const QString        &strMIMEType,
+                                   QVariant::Type  vaType,
+                                   QVariant       &vaData)
+{
+    int rc = retrieveData(dropAction, strMIMEType, vaType, vaData);
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h

@@ -100 +100 @@
     static Qt::DropActions     toQtDnDActions(const QVector<KDnDAction> &vecActions);
 
+public slots:
+
+    /**
+     * Called by UIDnDMIMEData (Linux, OS X, Solaris) to start retrieving the actual data
+     * from the guest. This function will block and show a modal progress dialog until
+     * the data transfer is complete.
+     *
+     * @return IPRT status code.
+     * @param dropAction            Drop action to perform.
+     * @param strMIMEType           MIME data type.
+     * @param vaType                Qt's variant type of the MIME data.
+     * @param vaData                Reference to QVariant where to store the retrieved data.
+     */
+    int                        sltGetData(Qt::DropAction dropAction, const QString &strMIMEType, QVariant::Type vaType, QVariant &vaData);
+
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp

@@ -159 +159 @@
     {
         QVariant vaData;
-        rc = m_pDnDHandler->retrieveData(Qt::CopyAction, strMIMEType, vaType, vaData);
+        rc = emit sigGetData(Qt::CopyAction, strMIMEType, vaType, vaData);
         if (RT_SUCCESS(rc))
         {
@@ -174 +174 @@
         LogRel(("DnD: Retrieving data failed with %Rrc\n", rc));
 
-    return QMimeData::retrieveData(strMIMEType, vaType);
+    return QVariant(QVariant::Invalid);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h

@@ -70 +70 @@
      *
      * @returns IPRT status code.
-     * @param strMIMEType               MIME type to retrieve data for.
+     * @param dropAction            Drop action to perform.
+     * @param strMimeType           MIME data type.
+     * @param vaType                Qt's variant type of the MIME data.
+     * @param vaData                Reference to QVariant where to store the retrieved data.
      */
-    int getData(const QString &strMIMEType) const;
-
-#ifdef RT_OS_DARWIN
-    void notifyDropped(void) const;
-#endif
+    int sigGetData(Qt::DropAction dropAction, const QString &strMIMEType, QVariant::Type vaType, QVariant &vaData) const;
 
 public slots: