Changeset 83883 in vbox for trunk

Timestamp:

Apr 21, 2020 9:55:16 AM (5 years ago)

Author:

vboxsync

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

137412

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Cleanup for local VM drag&drop functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItemGroup.cpp (modified) (5 diffs)
• UIChooserItemMachine.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -669 +669 @@
     if (model()->isGroupSavingInProgress())
         return false;
-    /* Get mime: */
-    const QMimeData *pMimeData = pEvent->mimeData();
     /* If drag token is shown, its up to parent to decide: */
     if (where != UIChooserItemDragToken_Off)
         return parentItem()->isDropAllowed(pEvent);
+
     /* Else we should check mime format: */
+    const QMimeData *pMimeData = pEvent->mimeData();
     if (pMimeData->hasFormat(UIChooserItemGroup::className()))
     {
@@ -681 +681 @@
         AssertMsg(pCastedMimeData, ("Can't cast passed mime-data to UIChooserItemMimeData!"));
         UIChooserItem *pItem = pCastedMimeData->item();
-        /* Make sure passed group is mutable within this group: */
-        if (pItem->toGroupItem()->isContainsLockedMachine() &&
-            !items(UIChooserNodeType_Group).contains(pItem))
+        UIChooserItemGroup *pGroupItem = pItem->toGroupItem();
+
+        /* Make sure passed machine isn't immutable within own group: */
+        if (   pGroupItem->isContainsLockedMachine()
+            && !m_groupItems.contains(pItem))
             return false;
         /* Make sure passed group is not 'this': */
@@ -689 +691 @@
             return false;
         /* Make sure passed group is not among our parents: */
-        const UIChooserItem *pTestedWidget = this;
-        while (UIChooserItem *pParentOfTestedWidget = pTestedWidget->parentItem())
+        const UIChooserItem *pTestedItem = this;
+        while (UIChooserItem *pParentOfTestedWidget = pTestedItem->parentItem())
         {
             if (pItem == pParentOfTestedWidget)
                 return false;
-            pTestedWidget = pParentOfTestedWidget;
-        }
+            pTestedItem = pParentOfTestedWidget;
+        }
+
+        /* Allow finally: */
         return true;
     }
@@ -704 +708 @@
         AssertMsg(pCastedMimeData, ("Can't cast passed mime-data to UIChooserItemMimeData!"));
         UIChooserItem *pItem = pCastedMimeData->item();
-        /* Make sure passed machine is mutable within this group: */
-        if (pItem->toMachineItem()->isLockedMachine() &&
-            !items(UIChooserNodeType_Machine).contains(pItem))
+        UIChooserItemMachine *pMachineItem = pItem->toMachineItem();
+
+        /* Make sure passed machine isn't immutable within own group: */
+        if (   pMachineItem->isLockedMachine()
+            && !m_machineItems.contains(pItem))
             return false;
         switch (pEvent->proposedAction())
@@ -713 +719 @@
             {
                 /* Make sure passed item is ours or there is no other item with such id: */
-                return m_machineItems.contains(pItem) || !isContainsMachine(pItem->toMachineItem()->id());
+                return m_machineItems.contains(pItem) || !isContainsMachine(pMachineItem->id());
             }
             case Qt::CopyAction:
             {
                 /* Make sure there is no other item with such id: */
-                return !isContainsMachine(pItem->toMachineItem()->id());
+                return !isContainsMachine(pMachineItem->id());
             }
-            default: break; /* Shut up, MSC! */
+            default:
+                break;
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -373 +373 @@
     if (model()->isGroupSavingInProgress())
         return false;
+    /* If drag token is shown, its up to parent to decide: */
+    if (where != UIChooserItemDragToken_Off)
+        return parentItem()->isDropAllowed(pEvent);
+
     /* No drops for immutable item: */
     if (isLockedMachine())
         return false;
-    /* Get mime: */
-    const QMimeData *pMimeData = pEvent->mimeData();
-    /* If drag token is shown, its up to parent to decide: */
-    if (where != UIChooserItemDragToken_Off)
-        return parentItem()->isDropAllowed(pEvent);
-    /* Else we should make sure machine is accessible: */
+    /* No drops for inaccessible item: */
     if (!accessible())
         return false;
+
     /* Else we should try to cast mime to known classes: */
+    const QMimeData *pMimeData = pEvent->mimeData();
     if (pMimeData->hasFormat(UIChooserItemMachine::className()))
     {
-        /* Make sure passed item id is not ours: */
+        /* Get passed machine-item: */
         const UIChooserItemMimeData *pCastedMimeData = qobject_cast<const UIChooserItemMimeData*>(pMimeData);
         AssertMsg(pCastedMimeData, ("Can't cast passed mime-data to UIChooserItemMimeData!"));
         UIChooserItem *pItem = pCastedMimeData->item();
         UIChooserItemMachine *pMachineItem = pItem->toMachineItem();
-        /* Make sure passed machine is mutable: */
+
+        /* No drops for immutable item: */
         if (pMachineItem->isLockedMachine())
             return false;
-        return pMachineItem->id() != id();
+        /* No drops for the same item: */
+        if (pMachineItem->id() == id())
+            return false;
+
+        /* Allow finally: */
+        return true;
     }
     /* That was invalid mime: */