Changeset 83683 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2020 6:34:08 PM (5 years ago)

Author:

vboxsync

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

137178

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: A bit of cleanup for local machine removal procedure.

Location:

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

Files:

• UIChooserModel.cpp (modified) (9 diffs)
• UIChooserModel.h (modified) (2 diffs)

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

@@ -46 +46 @@
 #include "UIVirtualBoxManagerWidget.h"
 #include "UIVirtualMachineItemCloud.h"
+#include "UIVirtualMachineItemLocal.h"
 #include "UIWizardAddCloudVM.h"
 #include "UIWizardNewVM.h"
@@ -1123 +1124 @@
     QMap<QUuid, bool> verdicts;
     QList<UIChooserItem*> itemsToRemove;
-    QList<QUuid> machinesToUnregister;
+    QList<CMachine> localMachinesToUnregister;
 
     /* For each selected machine-item: */
@@ -1129 +1130 @@
     {
         /* Get machine-item id: */
-        QUuid uId = pItem->toMachineItem()->id();
+        const QUuid uId = pItem->toMachineItem()->id();
 
         /* We already decided for that machine? */
@@ -1135 +1136 @@
         {
             /* To remove similar machine items? */
-            if (!verdicts[uId])
+            if (!verdicts.value(uId))
                 itemsToRemove << pItem;
             continue;
@@ -1153 +1154 @@
          * we will propose ro unregister machine fully else
          * we will just propose to remove selected-items: */
-        bool fVerdict = iSelectedCopyCount == iExistingCopyCount;
+        const bool fVerdict = iSelectedCopyCount == iExistingCopyCount;
         verdicts.insert(uId, fVerdict);
         if (fVerdict)
-            machinesToUnregister.append(uId);
+            localMachinesToUnregister.append(pItem->node()->toMachineNode()->cache()->toLocal()->machine());
         else
             itemsToRemove << pItem;
@@ -1164 +1165 @@
     if (!itemsToRemove.isEmpty())
         removeItems(itemsToRemove);
-    /* If we have something to unregister: */
-    if (!machinesToUnregister.isEmpty())
-        unregisterMachines(machinesToUnregister);
+    /* If we have something local to unregister: */
+    if (!localMachinesToUnregister.isEmpty())
+        unregisterMachines(localMachinesToUnregister);
 }
 
@@ -1633 +1634 @@
 }
 
-void UIChooserModel::unregisterMachines(const QList<QUuid> &ids)
-{
-    /* Populate machine list: */
-    QList<CMachine> machines;
-    CVirtualBox vbox = uiCommon().virtualBox();
-    foreach (const QUuid &uId, ids)
-    {
-        CMachine machine = vbox.FindMachine(uId.toString());
-        if (!machine.isNull())
-            machines << machine;
-    }
-
+void UIChooserModel::unregisterMachines(const QList<CMachine> &machines)
+{
     /* Confirm machine removal: */
     int iResultCode = msgCenter().confirmMachineRemoval(machines);
@@ -1653 +1644 @@
     setSelectedItem(findClosestUnselectedItem());
 
-    /* For every selected-item: */
-    for (int iMachineIndex = 0; iMachineIndex < machines.size(); ++iMachineIndex)
-    {
-        /* Get iterated machine: */
-        CMachine &machine = machines[iMachineIndex];
+    /* For every selected machine: */
+    foreach (CMachine comMachine, machines)
+    {
         if (iResultCode == AlertButton_Choice1)
         {
             /* Unregister machine first: */
-            CMediumVector media = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
-            if (!machine.isOk())
+            CMediumVector comMedia = comMachine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            if (!comMachine.isOk())
             {
-                msgCenter().cannotRemoveMachine(machine);
+                msgCenter().cannotRemoveMachine(comMachine);
                 continue;
             }
             /* Prepare cleanup progress: */
-            CProgress progress = machine.DeleteConfig(media);
-            if (!machine.isOk())
+            CProgress comProgress = comMachine.DeleteConfig(comMedia);
+            if (!comMachine.isOk())
             {
-                msgCenter().cannotRemoveMachine(machine);
+                msgCenter().cannotRemoveMachine(comMachine);
                 continue;
             }
             /* And show cleanup progress finally: */
-            msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_delete_90px.png");
-            if (!progress.isOk() || progress.GetResultCode() != 0)
+            msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_delete_90px.png");
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
             {
-                msgCenter().cannotRemoveMachine(machine, progress);
+                msgCenter().cannotRemoveMachine(comMachine, comProgress);
                 continue;
             }
@@ -1685 +1674 @@
         {
             /* Unregister machine first: */
-            CMediumVector media = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
-            if (!machine.isOk())
+            CMediumVector comMedia = comMachine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
+            if (!comMachine.isOk())
             {
-                msgCenter().cannotRemoveMachine(machine);
+                msgCenter().cannotRemoveMachine(comMachine);
                 continue;
             }
             /* Finally close all media, deliberately ignoring errors: */
-            foreach (CMedium medium, media)
+            foreach (CMedium comMedium, comMedia)
             {
-                if (!medium.isNull())
-                    medium.Close();
+                if (!comMedium.isNull())
+                    comMedium.Close();
             }
         }

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

@@ -28 +28 @@
 #include "UIChooserAbstractModel.h"
 #include "UIExtraDataDefs.h"
+
+/* COM includes: */
+#include "COMEnums.h"
+#include "CMachine.h"
 
 /* Forward declaration: */
@@ -359 +363 @@
         /** Removes machine @a items. */
         void removeItems(const QList<UIChooserItem*> &items);
-        /** Unregisters virtual machines using list of @a ids. */
-        void unregisterMachines(const QList<QUuid> &ids);
+        /** Unregisters a list of virtual @a machines. */
+        void unregisterMachines(const QList<CMachine> &machines);
 
         /** Processes drag move @a pEvent. */