Changeset 83884 in vbox

Timestamp:

Apr 21, 2020 10:02:06 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Implement cloud VM drag&drop functionality allowing to move cloud VMs and profiles inside their groups.

Location:

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

Files:

• UIChooserItem.cpp (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (2 diffs)
• UIChooserItemMachine.cpp (modified) (1 diff)
• UIChooserNode.h (modified) (1 diff)
• UIChooserNodeGlobal.cpp (modified) (1 diff)
• UIChooserNodeGlobal.h (modified) (1 diff)
• UIChooserNodeGroup.cpp (modified) (1 diff)
• UIChooserNodeGroup.h (modified) (1 diff)
• UIChooserNodeMachine.cpp (modified) (1 diff)
• UIChooserNodeMachine.h (modified) (1 diff)

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

@@ -495 +495 @@
         return;
 
-    /* Initialize dragging for local VMs only: */
-    if (!m_pNode->hasAtLeastOneCloudNode())
-    {
-        QDrag *pDrag = new QDrag(pEvent->widget());
-        model()->setCurrentDragObject(pDrag);
-        pDrag->setPixmap(toPixmap());
-        pDrag->setMimeData(createMimeData());
-        pDrag->exec(Qt::MoveAction | Qt::CopyAction, Qt::MoveAction);
-    }
+    /* Initialize dragging: */
+    QDrag *pDrag = new QDrag(pEvent->widget());
+    model()->setCurrentDragObject(pDrag);
+    pDrag->setPixmap(toPixmap());
+    pDrag->setMimeData(createMimeData());
+    pDrag->exec(Qt::MoveAction | Qt::CopyAction, Qt::MoveAction);
 }
 

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

@@ -683 +683 @@
         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': */
-        if (pItem == this)
-            return false;
-        /* Make sure passed group is not among our parents: */
-        const UIChooserItem *pTestedItem = this;
-        while (UIChooserItem *pParentOfTestedWidget = pTestedItem->parentItem())
-        {
-            if (pItem == pParentOfTestedWidget)
+        /* For local items: */
+        if (   node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Local
+            && pItem->node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Local)
+        {
+            /* Make sure passed machine isn't immutable within own group: */
+            if (   pGroupItem->isContainsLockedMachine()
+                && !m_groupItems.contains(pItem))
                 return false;
-            pTestedItem = pParentOfTestedWidget;
-        }
-
-        /* Allow finally: */
-        return true;
+            /* Make sure passed group is not 'this': */
+            if (pItem == this)
+                return false;
+            /* Make sure passed group is not among our parents: */
+            const UIChooserItem *pTestedItem = this;
+            while (UIChooserItem *pParentOfTestedWidget = pTestedItem->parentItem())
+            {
+                if (pItem == pParentOfTestedWidget)
+                    return false;
+                pTestedItem = pParentOfTestedWidget;
+            }
+
+            /* Allow finally: */
+            return true;
+        }
+        /* For cloud items: */
+        else
+        if (   node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Provider
+            && pItem->node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Profile)
+        {
+            /* Make sure passed item is ours: */
+            return m_groupItems.contains(pItem);
+        }
     }
     else if (pMimeData->hasFormat(UIChooserItemMachine::className()))
@@ -710 +723 @@
         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())
-        {
-            case Qt::MoveAction:
+        /* For local items: */
+        if (   node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Local
+            && pMachineItem->node()->toMachineNode()->cache()->itemType() == UIVirtualMachineItem::ItemType_Local)
+        {
+            /* Make sure passed machine isn't immutable within own group: */
+            if (   pMachineItem->isLockedMachine()
+                && !m_machineItems.contains(pItem))
+                return false;
+            switch (pEvent->proposedAction())
             {
-                /* Make sure passed item is ours or there is no other item with such id: */
-                return m_machineItems.contains(pItem) || !isContainsMachine(pMachineItem->id());
+                case Qt::MoveAction:
+                {
+                    /* Make sure passed item is ours or there is no other item with such id: */
+                    return m_machineItems.contains(pItem) || !isContainsMachine(pMachineItem->id());
+                }
+                case Qt::CopyAction:
+                {
+                    /* Make sure there is no other item with such id: */
+                    return !isContainsMachine(pMachineItem->id());
+                }
+                default:
+                    break;
             }
-            case Qt::CopyAction:
-            {
-                /* Make sure there is no other item with such id: */
-                return !isContainsMachine(pMachineItem->id());
-            }
-            default:
-                break;
+        }
+        /* For cloud items: */
+        else
+        if (   node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Profile
+            && pMachineItem->node()->toMachineNode()->cache()->itemType() == UIVirtualMachineItem::ItemType_CloudReal)
+        {
+            /* Make sure passed item is ours: */
+            return m_machineItems.contains(pItem);
         }
     }

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

@@ -394 +394 @@
         UIChooserItemMachine *pMachineItem = pItem->toMachineItem();
 
+        /* No drops for cloud items: */
+        if (   node()->toMachineNode()->cache()->itemType() != UIVirtualMachineItem::ItemType_Local
+            || pMachineItem->node()->toMachineNode()->cache()->itemType() != UIVirtualMachineItem::ItemType_Local)
+            return false;
         /* No drops for immutable item: */
         if (pMachineItem->isLockedMachine())

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNode.h

@@ -105 +105 @@
     virtual void updateAllNodes(const QUuid &uId) = 0;
 
-    /** Returns whether this node is a cloud node itself
-      * or contains at least one cloud VM node child. */
-    virtual bool hasAtLeastOneCloudNode() const = 0;
-
     /** Returns node position. */
     int position();

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

@@ -118 +118 @@
 }
 
-bool UIChooserNodeGlobal::hasAtLeastOneCloudNode() const
-{
-    return false;
-}
-
 int UIChooserNodeGlobal::positionOf(UIChooserNode *pNode)
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGlobal.h

@@ -77 +77 @@
     virtual void updateAllNodes(const QUuid &uId) /* override */;
 
-    /** Returns whether this node is a cloud node itself
-      * or contains at least one cloud VM node child. */
-    virtual bool hasAtLeastOneCloudNode() const /* override */;
-
     /** Returns position of specified node inside this one. */
     virtual int positionOf(UIChooserNode *pNode) /* override */;

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

@@ -178 +178 @@
     foreach (UIChooserNode *pNode, nodes())
         pNode->updateAllNodes(uId);
-}
-
-bool UIChooserNodeGroup::hasAtLeastOneCloudNode() const
-{
-    foreach (UIChooserNode *pNode, m_nodesGroup)
-        if (pNode->hasAtLeastOneCloudNode())
-            return true;
-
-    foreach (UIChooserNode *pNode, m_nodesMachine)
-        if (pNode->hasAtLeastOneCloudNode())
-            return true;
-
-    return false;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeGroup.h

@@ -81 +81 @@
     virtual void updateAllNodes(const QUuid &uId) /* override */;
 
-    /** Returns whether this node is a cloud node itself
-      * or contains at least one cloud VM node child. */
-    virtual bool hasAtLeastOneCloudNode() const /* override */;
-
     /** Returns position of specified node inside this one. */
     virtual int positionOf(UIChooserNode *pNode) /* override */;

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

@@ -188 +188 @@
     if (item())
         item()->updateItem();
-}
-
-bool UIChooserNodeMachine::hasAtLeastOneCloudNode() const
-{
-    return cache()->itemType() != UIVirtualMachineItem::ItemType_Local;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.h

@@ -96 +96 @@
     virtual void updateAllNodes(const QUuid &uId) /* override */;
 
-    /** Returns whether this node is a cloud node itself
-      * or contains at least one cloud VM node child. */
-    virtual bool hasAtLeastOneCloudNode() const /* override */;
-
     /** Returns position of specified node inside this one. */
     virtual int positionOf(UIChooserNode *pNode) /* override */;