Changeset 55422 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 24, 2015 1:52:33 PM (10 years ago)

Author:

vboxsync

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

99765

Message:

DnD: Protocol overhaul with versioning added which now can communicate with Main.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (4 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• runtime/UIDnDHandler.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -73 +73 @@
 # ifdef VBOX_WITH_DRAG_AND_DROP
 #  include "CGuest.h"
+#  include "CDnDTarget.h"
 # endif /* VBOX_WITH_DRAG_AND_DROP */
 
@@ -2394 +2395 @@
 {
     error(pParent, MessageType_Error,
-          tr("Failed to drop data."),
+          tr("Drag and drop operation failed."),
           formatErrorInfo(guest));
 }
@@ -2401 +2402 @@
 {
     error(pParent, MessageType_Error,
-          tr("Failed to drop data."),
+          tr("Failed while dropping data."),
           formatErrorInfo(progress));
+}
+
+void UIMessageCenter::cannotCancelDrop(const CDnDTarget &dndTarget, QWidget *pParent /* = 0*/) const
+{
+    error(pParent, MessageType_Error,
+          tr("Unable to cancel drag and drop operation."),
+          formatErrorInfo(dndTarget));
 }
 #endif /* VBOX_WITH_DRAG_AND_DROP */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -351 +351 @@
     void cannotDropData(const CGuest &guest, QWidget *pParent = 0) const;
     void cannotDropData(const CProgress &progress, QWidget *pParent = 0) const;
+    void cannotCancelDrop(const CDnDTarget &dndTarget, QWidget *pParent = 0) const;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#undef LOG_GROUP
+#ifdef LOG_GROUP
+ #undef LOG_GROUP
+#endif
 #define LOG_GROUP LOG_GROUP_GUEST_DND
 #include <VBox/log.h>
-
 
 
@@ -127 +128 @@
             && !format.isEmpty())
         {
-            /* Convert the actual MIME data to a vector (needed
-             * for the COM wrapper). */
+            /* Convert the actual MIME data to a vector (needed for the COM wrapper). */
             QVector<uint8_t> dv(d.size());
             memcpy(dv.data(), d.constData(), d.size());
 
             CProgress progress = dndTarget.SendData(screenId, format, dv);
-            if (guest.isOk())
+
+            if (progress.isOk())
             {
+                LogFlowFunc(("Transferring data to guest ...\n"));
+
                 msgCenter().showModalProgressDialog(progress,
                                                     tr("Dropping data ..."), ":/progress_dnd_hg_90px.png",
                                                     pParent);
-                if (   !progress.GetCanceled()
+
+                LogFlowFunc(("Transfer fCompleted=%RTbool, fCanceled=%RTbool, hr=%Rhrc\n",
+                             progress.GetCompleted(), progress.GetCanceled(), progress.GetResultCode()));
+
+                BOOL fCanceled = progress.GetCanceled();
+
+                /* Some error occurred? */
+                if (   !fCanceled
                     && (   !progress.isOk()
                         ||  progress.GetResultCode() != 0))
@@ -145 +155 @@
                     result = KDnDAction_Ignore;
                 }
+                #if 0
+                else if (fCanceled) /* Operation canceled by user? */
+                {
+                    Assert(progress.isOk());
+                    Assert(progress.GetResultCode() == 0);
+
+                    /* Tell the guest. */
+                    BOOL fVeto = dndTarget.Cancel();
+                    if (fVeto) /* Cancelling vetoed by the target? Tell the user why. */
+                        msgCenter().cannotCancelDrop(dndTarget, pParent);
+                }
+                #endif
             }
             else