Changeset 98811 in vbox

Timestamp:

Mar 1, 2023 5:52:24 PM (21 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• runtime/UIMachine.cpp (modified) (2 diffs)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -73 +73 @@
 #include "CStringFormValue.h"
 #include "CStorageController.h"
-#ifdef VBOX_WITH_UPDATE_AGENT
-# include "CSystemProperties.h"
-#endif
+#include "CSystemProperties.h"
 #include "CUnattended.h"
 #include "CUpdateAgent.h"
@@ -618 +616 @@
         UIErrorString::formatErrorInfo(comAppliance),
         QString(), QString(), pParent);
+}
+
+/* static */
+void UINotificationMessage::cannotAcquireSystemPropertiesParameter(const CSystemProperties &comProperties)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "System properties failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire system properties parameter.") +
+        UIErrorString::formatErrorInfo(comProperties));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -79 +79 @@
 class CNetworkAdapter;
 class CStorageController;
+class CSystemProperties;
 class CVirtualBox;
 class CVirtualBoxErrorInfo;
@@ -282 +283 @@
         static void cannotAcquireApplianceParameter(const CAppliance &comAppliance,
                                                     UINotificationCenter *pParent = 0);
+        /** Notifies about inability to acquire ISystemProperties parameter.
+          * @param  comProperties  Brings the object parameter get acquired from. */
+        static void cannotAcquireSystemPropertiesParameter(const CSystemProperties &comProperties);
         /** Notifies about inability to acquire IExtPackManager parameter.
           * @param  comVBox  Brings the object parameter get acquired from. */

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

@@ -829 +829 @@
 {
     return uisession()->acquireWhetherNetworkAdapterEnabled(uSlot, fEnabled);
+}
+
+bool UIMachine::acquireWhetherAtLeastOneNetworkAdapterEnabled(bool &fEnabled)
+{
+    return uisession()->acquireWhetherAtLeastOneNetworkAdapterEnabled(fEnabled);
 }
 
@@ -1870 +1875 @@
     {
         /* Initialize Network menu: */
-        bool fAtLeastOneAdapterActive = false;
-        const KChipsetType enmChipsetType = uisession()->machine().GetChipsetType();
-        ULONG uSlots = uiCommon().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(enmChipsetType);
-        for (ULONG uSlot = 0; uSlot < uSlots; ++uSlot)
-        {
-            const CNetworkAdapter &comNetworkAdapter = uisession()->machine().GetNetworkAdapter(uSlot);
-            if (comNetworkAdapter.GetEnabled())
-            {
-                fAtLeastOneAdapterActive = true;
-                break;
-            }
-        }
-        if (!fAtLeastOneAdapterActive)
+        bool fAtLeastOneAdapterEnabled = false;
+        acquireWhetherAtLeastOneNetworkAdapterEnabled(fAtLeastOneAdapterEnabled);
+        if (!fAtLeastOneAdapterEnabled)
             restrictionForDevices = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)
                                     (restrictionForDevices | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Network);

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

@@ -563 +563 @@
         /** Acquires whether network adapter is enabled. */
         bool acquireWhetherNetworkAdapterEnabled(ulong uSlot, bool &fEnabled);
+        /** Acquires whether at leasst one network adapter is enabled. */
+        bool acquireWhetherAtLeastOneNetworkAdapterEnabled(bool &fEnabled);
         /** Acquires whether network adapter cable is connected. */
         bool acquireWhetherNetworkCableConnected(ulong uSlot, bool &fConnected);

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

@@ -1107 +1107 @@
         else
             fEnabled = fAdapterEnabled == TRUE;
+    }
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherAtLeastOneNetworkAdapterEnabled(bool &fEnabled)
+{
+    /* Acquire system properties: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
+    AssertReturn(comVBox.isNotNull(), false);
+    CSystemProperties comProperties = comVBox.GetSystemProperties();
+    if (!comVBox.isOk())
+    {
+        UINotificationMessage::cannotAcquireVirtualBoxParameter(comVBox);
+        return false;
+    }
+
+    /* Acquire chipset type: */
+    KChipsetType enmChipsetType = KChipsetType_Null;
+    bool fSuccess = acquireChipsetType(enmChipsetType);
+    if (fSuccess)
+    {
+        /* Acquire maximum network adapters count: */
+        const ulong uSlots = comProperties.GetMaxNetworkAdapters(enmChipsetType);
+        fSuccess = comProperties.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireSystemPropertiesParameter(comProperties);
+        else
+        {
+            /* Search for 1st enabled adapter: */
+            for (ulong uSlot = 0; uSlot < uSlots; ++uSlot)
+            {
+                bool fAdapterEnabled = false;
+                fSuccess = acquireWhetherNetworkAdapterEnabled(uSlot, fAdapterEnabled);
+                if (!fSuccess)
+                    break;
+                if (!fAdapterEnabled)
+                    continue;
+                fEnabled = true;
+                break;
+            }
+        }
     }
     return fSuccess;

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

@@ -373 +373 @@
         /** Acquires whether network adapter is enabled. */
         bool acquireWhetherNetworkAdapterEnabled(ulong uSlot, bool &fEnabled);
+        /** Acquires whether at leasst one network adapter is enabled. */
+        bool acquireWhetherAtLeastOneNetworkAdapterEnabled(bool &fEnabled);
         /** Acquires whether network adapter cable is connected. */
         bool acquireWhetherNetworkCableConnected(ulong uSlot, bool &fConnected);