Changeset 98810 in vbox

Timestamp:

Mar 1, 2023 5:20:14 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Storage menu related stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (2 diffs)
• UIMachine.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -750 +750 @@
 {
     return uisession()->setDnDMode(enmMode);
+}
+
+bool UIMachine::acquireAmountOfStorageDevices(ulong &cHardDisks, ulong &cOpticalDrives, ulong &cFloppyDrives)
+{
+    return uisession()->acquireAmountOfStorageDevices(cHardDisks, cOpticalDrives, cFloppyDrives);
 }
 
@@ -1834 +1839 @@
     {
         /* Initialize CD/FD menus: */
-        int iDevicesCountCD = 0;
-        int iDevicesCountFD = 0;
-        foreach (const CMediumAttachment &comAttachment, uisession()->machine().GetMediumAttachments())
-        {
-            if (comAttachment.GetType() == KDeviceType_DVD)
-                ++iDevicesCountCD;
-            if (comAttachment.GetType() == KDeviceType_Floppy)
-                ++iDevicesCountFD;
-        }
+        ulong cHardDisks = 0;
+        ulong iOpticalDevices = 0;
+        ulong cFloppyDevices = 0;
+        acquireAmountOfStorageDevices(cHardDisks, iOpticalDevices, cFloppyDevices);
         QAction *pOpticalDevicesMenu = actionPool()->action(UIActionIndexRT_M_Devices_M_OpticalDevices);
         QAction *pFloppyDevicesMenu = actionPool()->action(UIActionIndexRT_M_Devices_M_FloppyDevices);
-        pOpticalDevicesMenu->setData(iDevicesCountCD);
-        pFloppyDevicesMenu->setData(iDevicesCountFD);
-        if (!iDevicesCountCD)
+        pOpticalDevicesMenu->setData((int)iOpticalDevices);
+        pFloppyDevicesMenu->setData((int)cFloppyDevices);
+        if (!iOpticalDevices)
             restrictionForDevices = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)
                                     (restrictionForDevices | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_OpticalDevices);
-        if (!iDevicesCountFD)
+        if (!cFloppyDevices)
             restrictionForDevices = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)
                                     (restrictionForDevices | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_FloppyDevices);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -516 +516 @@
     /** @name Storage stuff.
      ** @{ */
+        /** Enumerates amount of storage devices. */
+        bool acquireAmountOfStorageDevices(ulong &cHardDisks, ulong &cOpticalDrives, ulong &cFloppyDrives);
+
         /** Returns a list of storage devices. */
         bool storageDevices(KDeviceType enmDeviceType, QList<StorageDeviceInfo> &guiStorageDevices);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -555 +555 @@
     if (!fSuccess)
         UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    return fSuccess;
+}
+
+bool UISession::acquireAmountOfStorageDevices(ulong &cHardDisks, ulong &cOpticalDrives, ulong &cFloppyDrives)
+{
+    const CMachine comMachine = machine();
+    ulong cActualHardDisks = 0, cActualOpticalDrives = 0, cActualFloppyDrives = 0;
+    const CMediumAttachmentVector comAttachments = comMachine.GetMediumAttachments();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        foreach (const CMediumAttachment &comAttachment, comAttachments)
+        {
+            /* Get device type: */
+            const KDeviceType enmDeviceType = comAttachment.GetType();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+
+            /* And advance corresponding amount: */
+            switch (enmDeviceType)
+            {
+                case KDeviceType_HardDisk: ++cActualHardDisks; break;
+                case KDeviceType_DVD: ++cActualOpticalDrives; break;
+                case KDeviceType_Floppy: ++cActualFloppyDrives; break;
+                default: break;
+            }
+        }
+    }
+    if (fSuccess)
+    {
+        cHardDisks = cActualHardDisks;
+        cOpticalDrives = cActualOpticalDrives;
+        cFloppyDrives = cActualFloppyDrives;
+    }
     return fSuccess;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -326 +326 @@
     /** @name Storage stuff.
      ** @{ */
+        /** Enumerates amount of storage devices. */
+        bool acquireAmountOfStorageDevices(ulong &cHardDisks, ulong &cOpticalDrives, ulong &cFloppyDrives);
+
         /** Returns a list of storage devices. */
         bool storageDevices(KDeviceType enmDeviceType, QList<StorageDeviceInfo> &guiStorageDevices);