Changeset 83149 in vbox

Timestamp:

Feb 25, 2020 12:33:39 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Details pane: Make set and element items aware of chooser item type.

Location:

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

Files:

• UIDetailsElement.cpp (modified) (1 diff)
• UIDetailsElement.h (modified) (2 diffs)
• UIDetailsSet.cpp (modified) (5 diffs)
• UIDetailsSet.h (modified) (3 diffs)

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

@@ -305 +305 @@
 }
 
+const UICloudMachine &UIDetailsElement::cloudMachine()
+{
+    return m_pSet->cloudMachine();
+}
+
+bool UIDetailsElement::isLocal() const
+{
+    return m_pSet->isLocal();
+}
+
 void UIDetailsElement::setName(const QString &strName)
 {

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

@@ -34 +34 @@
 class QStateMachine;
 class QTextLayout;
+class UICloudMachine;
 class UIDetailsSet;
 class UIGraphicsRotatorButton;
@@ -159 +160 @@
         /** Returns cached machine reference. */
         const CMachine &machine();
+        /** Returns cached cloud machine reference. */
+        const UICloudMachine &cloudMachine();
+
+        /** Returns whether element is of local type. */
+        bool isLocal() const;
 
         /** Defines element @a strName. */

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

@@ -27 +27 @@
 #include "UIDetailsSet.h"
 #include "UIVirtualBoxEventHandler.h"
+#include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
 
@@ -38 +39 @@
     , m_pMachineItem(0)
     , m_fFullSet(true)
+    , m_fIsLocal(true)
     , m_fHasDetails(false)
     , m_configurationAccessLevel(ConfigurationAccessLevel_Null)
@@ -66 +68 @@
     /* Remember passed arguments: */
     m_pMachineItem = pMachineItem;
-    m_machine = m_pMachineItem->toLocal()->machine();
+    m_fIsLocal = m_pMachineItem->itemType() == UIVirtualMachineItem::ItemType_Local;
     m_fHasDetails = m_pMachineItem->hasDetails();
     m_fFullSet = fFullSet;
@@ -72 +74 @@
 
     /* Cleanup superfluous items: */
-    if (!m_fFullSet || !m_fHasDetails)
-    {
-        int iFirstItem = m_fHasDetails ? DetailsElementType_Display : DetailsElementType_General;
+    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;
@@ -97 +105 @@
     }
 
-    /* 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);
+    /* 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: */

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

@@ -23 +23 @@
 
 /* GUI includes: */
+#include "UICloudMachine.h"
 #include "UIDetailsItem.h"
 #include "UIExtraDataDefs.h"
@@ -61 +62 @@
         /** Returns cached machine. */
         const CMachine &machine() const { return m_machine; }
+        /** Returns cached cloud machine. */
+        const UICloudMachine &cloudMachine() const { return m_cloudMachine; }
+
+        /** Returns whether set is of local type. */
+        bool isLocal() const { return m_fIsLocal; }
         /** Returns whether set has cached details. */
         bool hasDetails() const { return m_fHasDetails; }
@@ -198 +204 @@
 
         /** Holds the machine reference. */
-        CMachine                  m_machine;
+        CMachine        m_machine;
+        /** Holds the cloud machine reference. */
+        UICloudMachine  m_cloudMachine;
+
+        /** Holds whether set is of local type. */
+        bool                      m_fIsLocal;
         /** Holds whether set has details. */
         bool                      m_fHasDetails;