Changeset 83175 in vbox

Timestamp:

Feb 27, 2020 6:10:52 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Extend UICloudMachine and UICloudNetworkingStuff to generate more of General and System details (s.a. r136281).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICloudMachine.cpp (modified) (3 diffs)
• UICloudMachine.h (modified) (3 diffs)
• UICloudNetworkingStuff.cpp (modified) (2 diffs)
• UICloudNetworkingStuff.h (modified) (1 diff)
• UIDetailsGenerator.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudMachine.cpp

@@ -39 +39 @@
     , m_iMemorySize(0)
     , m_iCpuCount(0)
+    //, m_strInstanceShape("None")
+    //, m_strDomain("None")
+    //, m_strBootingFirmware("None")
 {
     //printf("Data for machine with id = {%s} is created\n", m_strId.toUtf8().constData());
@@ -53 +56 @@
     , m_iMemorySize(other.m_iMemorySize)
     , m_iCpuCount(other.m_iCpuCount)
+    , m_strInstanceShape(other.m_strInstanceShape)
+    , m_strDomain(other.m_strDomain)
+    , m_strBootingFirmware(other.m_strBootingFirmware)
 {
     //printf("Data for machine with id = {%s} is copied\n", m_strId.toUtf8().constData());
@@ -72 +78 @@
     m_iCpuCount = fetchCpuCount(infoMap);
     m_enmMachineState = fetchMachineState(infoMap);
+    m_strInstanceShape = fetchInstanceShape(infoMap);
+    m_strDomain = fetchDomain(infoMap);
+    m_strBootingFirmware = fetchBootingFirmware(infoMap);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudMachine.h

@@ -73 +73 @@
     /** Returns cloud VM CPU count. */
     int cpuCount() const { return m_iCpuCount; }
+    /** Returns cloud VM instance shape. */
+    QString instanceShape() const { return m_strInstanceShape; }
+    /** Returns cloud VM domain. */
+    QString domain() const { return m_strDomain; }
+    /** Returns cloud VM booting firmware. */
+    QString bootingFirmware() const { return m_strBootingFirmware; }
 
 private:
@@ -96 +102 @@
     /** Holds the cloud VM CPU count. */
     int      m_iCpuCount;
+    /** Holds the cloud VM instance shape. */
+    QString  m_strInstanceShape;
+    /** Holds the cloud VM domain. */
+    QString  m_strDomain;
+    /** Holds the cloud VM booting firmware. */
+    QString  m_strBootingFirmware;
 };
 
@@ -144 +156 @@
     /** Returns cloud VM CPU count. */
     int cpuCount() const { return d->cpuCount(); }
+    /** Returns cloud VM instance shape. */
+    QString instanceShape() const { return d->instanceShape(); }
+    /** Returns cloud VM domain. */
+    QString domain() const { return d->domain(); }
+    /** Returns cloud VM booting firmware. */
+    QString bootingFirmware() const { return d->bootingFirmware(); }
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp

@@ -208 +208 @@
 }
 
+QString UICloudNetworkingStuff::fetchInstanceShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Return instance shape value: */
+    return infoMap.value(KVirtualSystemDescriptionType_CloudInstanceShape);
+}
+
+QString UICloudNetworkingStuff::fetchDomain(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Return domain value: */
+    return infoMap.value(KVirtualSystemDescriptionType_CloudDomain);
+}
+
 KMachineState UICloudNetworkingStuff::fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
 {
@@ -220 +232 @@
     return machineStates.value(infoMap.value(KVirtualSystemDescriptionType_CloudInstanceState), KMachineState_PoweredOff);
 }
+
+QString UICloudNetworkingStuff::fetchBootingFirmware(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Return booting firmware value: */
+    return infoMap.value(KVirtualSystemDescriptionType_BootingFirmware);
+}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h

@@ -64 +64 @@
     /** Fetches cloud VM CPU count from the passed @a info. */
     SHARED_LIBRARY_STUFF int fetchCpuCount(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud VM instance shape from the passed @a info. */
+    SHARED_LIBRARY_STUFF QString fetchInstanceShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud VM domain from the passed @a info. */
+    SHARED_LIBRARY_STUFF QString fetchDomain(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
     /** Fetches cloud VM state from the passed @a info. */
     SHARED_LIBRARY_STUFF KMachineState fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud VM booting firmware from the passed @a info. */
+    SHARED_LIBRARY_STUFF QString fetchBootingFirmware(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -147 +147 @@
                                  uiCommon().vmGuestOSTypeDescription(guiCloudMachine.osType()));
 
+    /* Domain: */
+    if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Location)
+        table << UITextTableLine(QApplication::translate("UIDetails", "Domain", "details (general)"),
+                                 guiCloudMachine.domain());
+
     return table;
 }
@@ -288 +293 @@
     }
 
+    /* Instance Shape: */
+    table << UITextTableLine(QApplication::translate("UIDetails", "Shape", "details (system)"),
+                             guiCloudMachine.instanceShape());
+
     /* Base memory: */
     if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_RAM)
@@ -297 +306 @@
         table << UITextTableLine(QApplication::translate("UIDetails", "Processors", "details (system)"),
                                  QString::number(guiCloudMachine.cpuCount()));
+
+    /* Booting firmware: */
+    if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeSystem_Firmware)
+        table << UITextTableLine(QApplication::translate("UIDetails", "Booting Firmware", "details (system)"),
+                                 guiCloudMachine.bootingFirmware());
 
     return table;