Changeset 56077 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 26, 2015 2:19:08 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: UIMachineView: Take shortcuts if DnD is not enabled on a per-machine level.

Location:

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

Files:

• UIMachineView.cpp (modified) (6 diffs)
• UIMachineView.h (modified) (1 diff)

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

@@ -182 +182 @@
 #ifdef VBOX_WITH_DRAG_AND_DROP
     if (pMachineView->m_pDnDHandler)
+    {
         delete pMachineView->m_pDnDHandler;
+        pMachineView->m_pDnDHandler = NULL;
+    }
 #endif
     delete pMachineView;
@@ -1417 +1420 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
+bool UIMachineView::dragAndDropIsActive(void) const
+{
+    return (   m_pDnDHandler
+            && machine().GetDnDMode() != KDnDMode_Disabled);
+}
+
 void UIMachineView::dragEnterEvent(QDragEnterEvent *pEvent)
 {
     AssertPtrReturnVoid(pEvent);
+
+    if (!dragAndDropIsActive())
+        return;
 
     /* Get mouse-pointer location. */
@@ -1441 +1453 @@
     AssertPtrReturnVoid(pEvent);
 
+    if (!dragAndDropIsActive())
+        return;
+
     /* Get mouse-pointer location. */
     const QPoint &cpnt = viewportToContents(pEvent->pos());
@@ -1461 +1476 @@
     AssertPtrReturnVoid(pEvent);
 
+    if (!dragAndDropIsActive())
+        return;
+
     m_pDnDHandler->dragLeave(screenId());
 
@@ -1468 +1486 @@
 void UIMachineView::dragIsPending(void)
 {
+    if (!dragAndDropIsActive())
+        return;
+
     /** @todo Add guest->guest DnD functionality here by getting
      *        the source of guest B (when copying from B to A). */
@@ -1476 +1497 @@
 {
     AssertPtrReturnVoid(pEvent);
+
+    if (!dragAndDropIsActive())
+        return;
 
     /* Get mouse-pointer location. */

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

@@ -259 +259 @@
 #ifdef VBOX_WITH_DRAG_AND_DROP
     /**
+     * Returns @true if drag and drop for this machine is active 
+     * (that is, host->guest, guest->host or bidirectional), @false if not. 
+     */
+    bool dragAndDropIsActive(void) const;
+
+    /**
      * Host -> Guest: Issued when the host cursor enters the guest (VM) window.
      *                The guest will receive the relative cursor coordinates of the