Changeset 98749 in vbox

Timestamp:

Feb 27, 2023 12:58:28 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156054

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.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

@@ -704 +704 @@
         QApplication::translate("UIMessageCenter", "Audio adapter failure ..."),
         QApplication::translate("UIMessageCenter", "Failed to acquire audio adapter parameter.") +
+        UIErrorString::formatErrorInfo(comAdapter));
+}
+
+/* static */
+void UINotificationMessage::cannotAcquireNetworkAdapterParameter(const CNetworkAdapter &comAdapter)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Network adapter failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire network adapter parameter.") +
         UIErrorString::formatErrorInfo(comAdapter));
 }

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

@@ -308 +308 @@
           * @param  comAdapter  Brings the object parameter get acquired from. */
         static void cannotAcquireAudioAdapterParameter(const CAudioAdapter &comAdapter);
+        /** Notifies about inability to acquire INetworkAdapter parameter.
+          * @param  comAdapter  Brings the object parameter get acquired from. */
+        static void cannotAcquireNetworkAdapterParameter(const CNetworkAdapter &comAdapter);
         /** Notifies about inability to acquire IConsole parameter.
           * @param  comConsole  Brings the object parameter get acquired from. */

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

@@ -742 +742 @@
 {
     return uisession()->webcamDetach(strPath, strName);
+}
+
+bool UIMachine::acquireWhetherNetworkAdapterEnabled(ulong uSlot, bool &fEnabled)
+{
+    return uisession()->acquireWhetherNetworkAdapterEnabled(uSlot, fEnabled);
+}
+
+bool UIMachine::acquireWhetherNetworkCableConnected(ulong uSlot, bool &fConnected)
+{
+    return uisession()->acquireWhetherNetworkCableConnected(uSlot, fConnected);
+}
+
+bool UIMachine::setNetworkCableConnected(ulong uSlot, bool fConnected)
+{
+    return uisession()->setNetworkCableConnected(uSlot, fConnected);
 }
 

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

@@ -515 +515 @@
     /** @} */
 
+    /** @name Network stuff.
+     ** @{ */
+        /** Acquires whether network adapter is enabled. */
+        bool acquireWhetherNetworkAdapterEnabled(ulong uSlot, bool &fEnabled);
+        /** Acquires whether network adapter cable is connected. */
+        bool acquireWhetherNetworkCableConnected(ulong uSlot, bool &fConnected);
+        /** Set whether network adapter cable is connected. */
+        bool setNetworkCableConnected(ulong uSlot, bool fConnected);
+    /** @} */
+
     /** @name Virtualization stuff.
      ** @{ */

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

@@ -2280 +2280 @@
 }
 
-void UIMachineLogic::sltToggleNetworkAdapterConnection()
-{
-    /* Do not process if window(s) missed! */
-    if (!isMachineWindowsCreated())
-        return;
-
+void UIMachineLogic::sltToggleNetworkAdapterConnection(bool fChecked)
+{
     /* Get and check 'the sender' action object: */
     QAction *pAction = qobject_cast<QAction*>(sender());
     AssertMsgReturnVoid(pAction, ("Sender action should NOT be null!\n"));
 
-    /* Get operation target: */
-    CNetworkAdapter adapter = machine().GetNetworkAdapter((ULONG)pAction->property("slot").toInt());
-    AssertMsgReturnVoid(machine().isOk() && !adapter.isNull(),
-                        ("Network adapter should NOT be null!\n"));
-
-    /* Connect/disconnect cable to/from target: */
-    const bool fConnect = !adapter.GetCableConnected();
-    adapter.SetCableConnected(fConnect);
-    if (!adapter.isOk())
-        return UINotificationMessage::cannotToggleNetworkCable(adapter, machineName(), fConnect);
+    /* Acquire adapter slot: */
+    const ulong uSlot = pAction->property("slot").toUInt();
+
+    /* Toggle network adapter cable connection: */
+    uimachine()->setNetworkCableConnected(uSlot, fChecked);
 
     /* Save machine-settings: */
@@ -2708 +2699 @@
 {
     /* Determine how many adapters we should display: */
-    const KChipsetType chipsetType = machine().GetChipsetType();
-    const ULONG uCount = qMin((ULONG)4, uiCommon().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(chipsetType));
+    const KChipsetType enmChipsetType = machine().GetChipsetType();
+    const ulong uCount = qMin((ulong)4, (ulong)uiCommon().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(enmChipsetType));
 
     /* Enumerate existing network adapters: */
-    QMap<int, bool> adapterData;
-    for (ULONG uSlot = 0; uSlot < uCount; ++uSlot)
-    {
-        /* Get and check iterated adapter: */
-        const CNetworkAdapter adapter = machine().GetNetworkAdapter(uSlot);
-        AssertReturnVoid(machine().isOk() && !adapter.isNull());
-
+    QMap<ulong, bool> adapterData;
+    for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
+    {
         /* Skip disabled adapters: */
-        if (!adapter.GetEnabled())
+        bool fAdapterEnabled = false;
+        uimachine()->acquireWhetherNetworkAdapterEnabled(uSlot, fAdapterEnabled);
+        if (!fAdapterEnabled)
             continue;
 
         /* Remember adapter data: */
-        adapterData.insert((int)uSlot, (bool)adapter.GetCableConnected());
+        bool fCableConnected = false;
+        uimachine()->acquireWhetherNetworkCableConnected(uSlot, fCableConnected);
+        adapterData.insert(uSlot, fCableConnected);
     }
 
@@ -2732 +2723 @@
 
     /* Add new actions: */
-    foreach (int iSlot, adapterData.keys())
+    foreach (ulong uSlot, adapterData.keys())
     {
         QAction *pAction = pMenu->addAction(UIIconPool::iconSetOnOff(":/connect_on_16px.png", ":/connect_16px.png"),
                                             adapterData.size() == 1 ? UIActionPool::tr("&Connect Network Adapter") :
-                                                                      UIActionPool::tr("Connect Network Adapter &%1").arg(iSlot + 1),
-                                            this, SLOT(sltToggleNetworkAdapterConnection()));
-        pAction->setProperty("slot", iSlot);
+                                                                      UIActionPool::tr("Connect Network Adapter &%1").arg(uSlot + 1),
+                                            this, SLOT(sltToggleNetworkAdapterConnection(bool)));
+        pAction->setProperty("slot", (uint)uSlot);
         pAction->setCheckable(true);
-        pAction->setChecked(adapterData[iSlot]);
+        pAction->setChecked(adapterData.value(uSlot));
     }
 }

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

@@ -301 +301 @@
     void sltAttachWebcamDevice();
     void sltChangeSharedClipboardType(QAction *pAction);
-    void sltToggleNetworkAdapterConnection();
+    void sltToggleNetworkAdapterConnection(bool fChecked);
     void sltChangeDragAndDropType(QAction *pAction);
     void sltInstallGuestAdditions();

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

@@ -682 +682 @@
 }
 
+bool UISession::acquireWhetherNetworkAdapterEnabled(ulong uSlot, bool &fEnabled)
+{
+    CMachine comMachine = machine();
+    CNetworkAdapter comAdapter = comMachine.GetNetworkAdapter(uSlot);
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const BOOL fAdapterEnabled = comAdapter.GetEnabled();
+        fSuccess = comAdapter.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireNetworkAdapterParameter(comAdapter);
+        else
+            fEnabled = fAdapterEnabled == TRUE;
+    }
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherNetworkCableConnected(ulong uSlot, bool &fConnected)
+{
+    CMachine comMachine = machine();
+    CNetworkAdapter comAdapter = comMachine.GetNetworkAdapter(uSlot);
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        const BOOL fCableConnected = comAdapter.GetCableConnected();
+        fSuccess = comAdapter.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireNetworkAdapterParameter(comAdapter);
+        else
+            fConnected = fCableConnected == TRUE;
+    }
+    return fSuccess;
+}
+
+bool UISession::setNetworkCableConnected(ulong uSlot, bool fConnected)
+{
+    CMachine comMachine = machine();
+    CNetworkAdapter comAdapter = comMachine.GetNetworkAdapter(uSlot);
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        comAdapter.SetCableConnected(fConnected);
+        fSuccess = comAdapter.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotToggleNetworkCable(comAdapter, machineName(), fConnected);
+    }
+    return fSuccess;
+}
+
 bool UISession::guestAdditionsUpgradable()
 {

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

@@ -330 +330 @@
         /** Detaches web cam device with passed @a strName and @a strPath. */
         bool webcamDetach(const QString &strPath, const QString &strName);
+    /** @} */
+
+    /** @name Network stuff.
+     ** @{ */
+        /** Acquires whether network adapter is enabled. */
+        bool acquireWhetherNetworkAdapterEnabled(ulong uSlot, bool &fEnabled);
+        /** Acquires whether network adapter cable is connected. */
+        bool acquireWhetherNetworkCableConnected(ulong uSlot, bool &fConnected);
+        /** Set whether network adapter cable is connected. */
+        bool setNetworkCableConnected(ulong uSlot, bool fConnected);
     /** @} */