Changeset 83179 in vbox

Timestamp:

Feb 28, 2020 3:29:09 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Details pane: Rework set build procedure to allow to build certain details types only; This is required since cloud VMs have different set of details elements than local VMs.

Location:

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

Files:

• UIDetailsSet.cpp (modified) (4 diffs)
• UIDetailsSet.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp

@@ -43 +43 @@
     , m_configurationAccessLevel(ConfigurationAccessLevel_Null)
     , m_pBuildStep(0)
-    , m_iLastStepNumber(-1)
 {
     /* Add set to the parent group: */
@@ -73 +72 @@
     m_settings = settings;
 
-    /* Cleanup superfluous items: */
-    if (   !m_fHasDetails
-        || !m_fIsLocal
-        || !m_fFullSet)
-    {
-        int iFirstItem = !m_fHasDetails
-                       ? DetailsElementType_General
-                       : !m_fIsLocal
-                       ? DetailsElementType_Preview
-                       : DetailsElementType_Display;
-        int iLastItem = DetailsElementType_Description;
-        bool fCleanupPerformed = false;
-        for (int i = iFirstItem; i <= iLastItem; ++i)
-            if (m_elements.contains(i))
+    /* Prepare a list of types to build: */
+    QList<DetailsElementType> types;
+
+    /* Make sure we have details: */
+    if (m_fHasDetails)
+    {
+        /* Special handling wrt item type: */
+        switch (m_pMachineItem->itemType())
+        {
+            case UIVirtualMachineItem::ItemType_Local:
             {
-                delete m_elements[i];
-                fCleanupPerformed = true;
+                /* Get local machine: */
+                m_machine = m_pMachineItem->toLocal()->machine();
+
+                /* Compose a list of types to build: */
+                if (m_fFullSet)
+                    types << DetailsElementType_General << DetailsElementType_System << DetailsElementType_Preview
+                          << DetailsElementType_Display << DetailsElementType_Storage << DetailsElementType_Audio
+                          << DetailsElementType_Network << DetailsElementType_Serial << DetailsElementType_USB
+                          << DetailsElementType_SF << DetailsElementType_UI << DetailsElementType_Description;
+                else
+                    types << DetailsElementType_General << DetailsElementType_System << DetailsElementType_Preview;
+
+                /* Take into account USB controller restrictions: */
+                const CUSBDeviceFilters &filters = m_machine.GetUSBDeviceFilters();
+                if (filters.isNull() || !m_machine.GetUSBProxyAvailable())
+                    m_settings.remove(DetailsElementType_USB);
+
+                break;
             }
-        if (fCleanupPerformed)
-            updateGeometry();
-    }
-
-    /* Make sure we have details: */
-    if (!m_fHasDetails)
-    {
-        /* Reset last-step number: */
-        m_iLastStepNumber = -1;
-        /* Notify parent group we are built: */
+            case UIVirtualMachineItem::ItemType_CloudReal:
+            {
+                /* Get cloud machine: */
+                m_cloudMachine = m_pMachineItem->toCloud()->machine();
+
+                /* Compose a list of types to build: */
+                types << DetailsElementType_General << DetailsElementType_System;
+
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    /* Cleanup if new types differs from old: */
+    if (m_types != types)
+    {
+        qDeleteAll(m_elements);
+        m_elements.clear();
+        updateGeometry();
+    }
+
+    /* Remember new types: */
+    m_types = types;
+
+    /* Build or emit fake signal: */
+    if (m_fHasDetails)
+        rebuildSet();
+    else
         emit sigBuildDone();
-        return;
-    }
-
-    /* Special handling wrt item type: */
-    switch (m_pMachineItem->itemType())
-    {
-        case UIVirtualMachineItem::ItemType_Local:
-        {
-            /* Get local machine: */
-            m_machine = m_pMachineItem->toLocal()->machine();
-
-            /* Choose last-step number: */
-            m_iLastStepNumber = m_fFullSet ? DetailsElementType_Description : DetailsElementType_Preview;
-
-            /* Fetch USB controller restrictions: */
-            const CUSBDeviceFilters &filters = m_machine.GetUSBDeviceFilters();
-            if (filters.isNull() || !m_machine.GetUSBProxyAvailable())
-                m_settings.remove(DetailsElementType_USB);
-
-            break;
-        }
-        case UIVirtualMachineItem::ItemType_CloudReal:
-        {
-            /* Get cloud machine: */
-            m_cloudMachine = m_pMachineItem->toCloud()->machine();
-
-            /* Choose last-step number: */
-            m_iLastStepNumber = DetailsElementType_System;
-
-            break;
-        }
-        default:
-            break;
-    }
-
-    /* Start building set: */
-    rebuildSet();
 }
 
@@ -152 +146 @@
 
     /* Step number feats the bounds: */
-    if (iStepNumber >= 0 && iStepNumber <= m_iLastStepNumber)
+    if (iStepNumber >= 0 && iStepNumber < m_types.size())
     {
         /* Load details settings: */
-        DetailsElementType enmElementType = (DetailsElementType)iStepNumber;
+        const DetailsElementType enmElementType = m_types.at(iStepNumber);
         /* Should the element be visible? */
         bool fVisible = m_settings.contains(enmElementType);
@@ -646 +640 @@
 
     /* Request to build first step: */
-    emit sigBuildStep(m_uSetId, DetailsElementType_General);
+    emit sigBuildStep(m_uSetId, 0);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.h

@@ -78 +78 @@
       * @{ */
         /** Handles request about starting step build.
-          * @param  uStepId    Brings the step ID.
+          * @param  uStepId      Brings the step ID.
           * @param  iStepNumber  Brings the step number. */
         virtual void sltBuildStep(const QUuid &uStepId, int iStepNumber) /* override */;
@@ -216 +216 @@
 
         /** Holds the build step instance. */
-        UIPrepareStep *m_pBuildStep;
-        /** Holds the last step number. */
-        int            m_iLastStepNumber;
+        UIPrepareStep             *m_pBuildStep;
+        /** Holds the list of types to build steps for. */
+        QList<DetailsElementType>  m_types;
         /** Holds the generated set ID. */
-        QUuid          m_uSetId;
+        QUuid                      m_uSetId;
     /** @} */