Changeset 84517 in vbox for trunk/src

Timestamp:

May 25, 2020 4:23:21 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane cleanup: Move remove VMs action trigger handling to proper place in UIVirtualBoxManager class.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserModel.cpp (modified) (4 diffs)
• chooser/UIChooserModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -777 +777 @@
 }
 
+void UIVirtualBoxManager::sltPerformMachineRemove()
+{
+    m_pWidget->removeMachine();
+}
+
 void UIVirtualBoxManager::sltPerformMachineMoveToNewGroup()
 {
@@ -1612 +1617 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenExportApplianceWizard);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltPerformMachineRemove);
     connect(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformMachineMoveToNewGroup);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -210 +210 @@
         /** Handles call to move machine. */
         void sltPerformMachineMove();
+
+        /** Handles call to remove machine. */
+        void sltPerformMachineRemove();
 
         /** Handles call to move machine to a new group. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -124 +124 @@
 {
     m_pPaneChooser->disbandGroup();
+}
+
+void UIVirtualBoxManagerWidget::removeMachine()
+{
+    m_pPaneChooser->removeMachine();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -142 +142 @@
         /** Disbands group. */
         void disbandGroup();
+        /** Removes machine. */
+        void removeMachine();
         /** Moves machine to a new group. */
         void moveMachineToNewGroup();

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

@@ -123 +123 @@
     AssertPtrReturnVoid(model());
     model()->disbandSelectedGroupItem();
+}
+
+void UIChooser::removeMachine()
+{
+    AssertPtrReturnVoid(model());
+    model()->removeSelectedMachineItems();
 }
 

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

@@ -136 +136 @@
         /** Disbands group. */
         void disbandGroup();
+        /** Removes machine. */
+        void removeMachine();
         /** Moves machine to a new group. */
         void moveMachineToNewGroup();

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

@@ -48 +48 @@
 #include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
-#include "UIWizardNewCloudVM.h"
-#include "UIWizardNewVM.h"
 
 /* COM includes: */
@@ -661 +659 @@
     }
     saveGroups();
+}
+
+void UIChooserModel::removeSelectedMachineItems()
+{
+    /* Enumerate all the selected machine-items: */
+    QList<UIChooserItemMachine*> selectedMachineItemList;
+    UIChooserItemMachine::enumerateMachineItems(selectedItems(), selectedMachineItemList);
+    /* Enumerate all the existing machine-items: */
+    QList<UIChooserItemMachine*> existingMachineItemList;
+    UIChooserItemMachine::enumerateMachineItems(root()->items(), existingMachineItemList);
+
+    /* Prepare arrays: */
+    QMap<QUuid, bool> verdicts;
+    QList<UIChooserItemMachine*> itemsToRemove;
+    QList<CMachine> localMachinesToUnregister;
+    QList<CCloudMachine> cloudMachinesToUnregister;
+
+    /* For each selected machine-item: */
+    foreach (UIChooserItemMachine *pMachineItem, selectedMachineItemList)
+    {
+        /* Get machine-item id: */
+        AssertPtrReturnVoid(pMachineItem);
+        const QUuid uId = pMachineItem->id();
+
+        /* We already decided for that machine? */
+        if (verdicts.contains(uId))
+        {
+            /* To remove similar machine items? */
+            if (!verdicts.value(uId))
+                itemsToRemove << pMachineItem;
+            continue;
+        }
+
+        /* Selected copy count: */
+        int iSelectedCopyCount = 0;
+        foreach (UIChooserItemMachine *pSelectedItem, selectedMachineItemList)
+        {
+            AssertPtrReturnVoid(pSelectedItem);
+            if (pSelectedItem->id() == uId)
+                ++iSelectedCopyCount;
+        }
+        /* Existing copy count: */
+        int iExistingCopyCount = 0;
+        foreach (UIChooserItemMachine *pExistingItem, existingMachineItemList)
+        {
+            AssertPtrReturnVoid(pExistingItem);
+            if (pExistingItem->id() == uId)
+                ++iExistingCopyCount;
+        }
+        /* If selected copy count equal to existing copy count,
+         * we will propose ro unregister machine fully else
+         * we will just propose to remove selected-items: */
+        const bool fVerdict = iSelectedCopyCount == iExistingCopyCount;
+        verdicts.insert(uId, fVerdict);
+        if (fVerdict)
+        {
+            if (pMachineItem->cacheType() == UIVirtualMachineItemType_Local)
+                localMachinesToUnregister.append(pMachineItem->cache()->toLocal()->machine());
+            else if (pMachineItem->cacheType() == UIVirtualMachineItemType_CloudReal)
+                cloudMachinesToUnregister.append(pMachineItem->cache()->toCloud()->machine());
+        }
+        else
+            itemsToRemove << pMachineItem;
+    }
+
+    /* If we have something to remove: */
+    if (!itemsToRemove.isEmpty())
+        removeItems(itemsToRemove);
+    /* If we have something local to unregister: */
+    if (!localMachinesToUnregister.isEmpty())
+        unregisterLocalMachines(localMachinesToUnregister);
+    /* If we have something cloud to unregister: */
+    if (!cloudMachinesToUnregister.isEmpty())
+        unregisterCloudMachines(cloudMachinesToUnregister);
 }
 
@@ -1048 +1120 @@
 }
 
-void UIChooserModel::sltRemoveSelectedMachine()
-{
-    /* Check if action is enabled: */
-    if (!actionPool()->action(UIActionIndexST_M_Machine_S_Remove)->isEnabled())
-        return;
-
-    /* Enumerate all the selected machine-items: */
-    QList<UIChooserItemMachine*> selectedMachineItemList;
-    UIChooserItemMachine::enumerateMachineItems(selectedItems(), selectedMachineItemList);
-    /* Enumerate all the existing machine-items: */
-    QList<UIChooserItemMachine*> existingMachineItemList;
-    UIChooserItemMachine::enumerateMachineItems(root()->items(), existingMachineItemList);
-
-    /* Prepare arrays: */
-    QMap<QUuid, bool> verdicts;
-    QList<UIChooserItemMachine*> itemsToRemove;
-    QList<CMachine> localMachinesToUnregister;
-    QList<CCloudMachine> cloudMachinesToUnregister;
-
-    /* For each selected machine-item: */
-    foreach (UIChooserItemMachine *pMachineItem, selectedMachineItemList)
-    {
-        /* Get machine-item id: */
-        AssertPtrReturnVoid(pMachineItem);
-        const QUuid uId = pMachineItem->id();
-
-        /* We already decided for that machine? */
-        if (verdicts.contains(uId))
-        {
-            /* To remove similar machine items? */
-            if (!verdicts.value(uId))
-                itemsToRemove << pMachineItem;
-            continue;
-        }
-
-        /* Selected copy count: */
-        int iSelectedCopyCount = 0;
-        foreach (UIChooserItemMachine *pSelectedItem, selectedMachineItemList)
-        {
-            AssertPtrReturnVoid(pSelectedItem);
-            if (pSelectedItem->id() == uId)
-                ++iSelectedCopyCount;
-        }
-        /* Existing copy count: */
-        int iExistingCopyCount = 0;
-        foreach (UIChooserItemMachine *pExistingItem, existingMachineItemList)
-        {
-            AssertPtrReturnVoid(pExistingItem);
-            if (pExistingItem->id() == uId)
-                ++iExistingCopyCount;
-        }
-        /* If selected copy count equal to existing copy count,
-         * we will propose ro unregister machine fully else
-         * we will just propose to remove selected-items: */
-        const bool fVerdict = iSelectedCopyCount == iExistingCopyCount;
-        verdicts.insert(uId, fVerdict);
-        if (fVerdict)
-        {
-            if (pMachineItem->cacheType() == UIVirtualMachineItemType_Local)
-                localMachinesToUnregister.append(pMachineItem->cache()->toLocal()->machine());
-            else if (pMachineItem->cacheType() == UIVirtualMachineItemType_CloudReal)
-                cloudMachinesToUnregister.append(pMachineItem->cache()->toCloud()->machine());
-        }
-        else
-            itemsToRemove << pMachineItem;
-    }
-
-    /* If we have something to remove: */
-    if (!itemsToRemove.isEmpty())
-        removeItems(itemsToRemove);
-    /* If we have something local to unregister: */
-    if (!localMachinesToUnregister.isEmpty())
-        unregisterLocalMachines(localMachinesToUnregister);
-    /* If we have something cloud to unregister: */
-    if (!cloudMachinesToUnregister.isEmpty())
-        unregisterCloudMachines(cloudMachinesToUnregister);
-}
-
 void UIChooserModel::sltStartScrolling()
 {
@@ -1303 +1297 @@
 {
     /* Setup action connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
-            this, &UIChooserModel::sltRemoveSelectedMachine);
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Search), &UIAction::triggered,
             this, &UIChooserModel::sltShowHideSearchWidget);

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

@@ -220 +220 @@
         /** Disbands selected group item. */
         void disbandSelectedGroupItem();
+        /** Removes selected machine items. */
+        void removeSelectedMachineItems();
         /** Moves selected machine items to new group item. */
         void moveSelectedMachineItemsToNewGroupItem();
@@ -299 +301 @@
     /** @name Children stuff.
       * @{ */
-        /** Handles remove selected machine request. */
-        void sltRemoveSelectedMachine();
-
         /** Handles D&D scrolling. */
         void sltStartScrolling();