Changeset 97605 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2022 10:25:20 AM (2 years ago)

Author:

vboxsync

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

154649

Message:

FE/Qt: bugref:10276: VirtualBox Manager: Re-register VM if groups have changed from outside.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (2 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)

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

@@ -726 +726 @@
                 addLocalMachineIntoTheTree(comMachine, true /* make it visible */);
         }
+    }
+}
+
+void UIChooserAbstractModel::sltLocalMachineGroupsChanged(const QUuid &uMachineId)
+{
+    /* Skip VM if restricted: */
+    if (!gEDataManager->showMachineInVirtualBoxManagerChooser(uMachineId))
+        return;
+
+    /* Search for cached group list: */
+    const QStringList oldGroupList = m_groups.value(toOldStyleUuid(uMachineId));
+    //printf("Old groups for VM with ID=%s: %s\n",
+    //       uMachineId.toString().toUtf8().constData(),
+    //       oldGroupList.join(", ").toUtf8().constData());
+
+    /* Search for existing registered machine: */
+    const CMachine comMachine = uiCommon().virtualBox().FindMachine(uMachineId.toString());
+    if (comMachine.isNull())
+        return;
+    /* Look for a new group list: */
+    const QStringList newGroupList = comMachine.GetGroups().toList();
+    //printf("New groups for VM with ID=%s: %s\n",
+    //       uMachineId.toString().toUtf8().constData(),
+    //       newGroupList.join(", ").toUtf8().constData());
+
+    /* Re-register VM if required: */
+    if (newGroupList.toSet() != oldGroupList.toSet())
+    {
+        sltLocalMachineRegistrationChanged(uMachineId, false);
+        sltLocalMachineRegistrationChanged(uMachineId, true);
     }
 }
@@ -1016 +1046 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
             this, &UIChooserAbstractModel::sltLocalMachineRegistrationChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineGroupsChange,
+            this, &UIChooserAbstractModel::sltLocalMachineGroupsChanged);
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSessionStateChange,
             this, &UIChooserAbstractModel::sltSessionStateChanged);

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

@@ -182 +182 @@
         /** Handles local machine registering/unregistering for machine with certain @a uMachineId. */
         virtual void sltLocalMachineRegistrationChanged(const QUuid &uMachineId, const bool fRegistered);
+        /** Handles local machine registering/unregistering for machine with certain @a uMachineId. */
+        virtual void sltLocalMachineGroupsChanged(const QUuid &uMachineId);
 
         /** Handles session @a enmState change for machine with certain @a uMachineId. */