Changeset 87275 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 15, 2021 1:53:46 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: UIDetailsWidgetHostNetwork: Disable details-widget contents if host-only network is Null.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager

Files:

• UIDetailsWidgetHostNetwork.cpp (modified) (3 diffs)
• UIDetailsWidgetHostNetwork.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetHostNetwork.cpp

@@ -775 +775 @@
 void UIDetailsWidgetHostNetwork::loadDataForInterface()
 {
+    /* Check whether interface exists and configurable: */
+    const bool fIsInterfaceExists = m_newData.m_interface.m_fExists;
+    const bool fIsInterfaceConfigurable = !m_newData.m_interface.m_fDHCPEnabled;
+
+    /* Toggle radio-buttons availability: */
+    if (m_pButtonAutomatic)
+        m_pButtonAutomatic->setEnabled(fIsInterfaceExists);
+    if (m_pButtonManual)
+        m_pButtonManual->setEnabled(fIsInterfaceExists);
+
     /* Toggle IPv4 & IPv6 interface fields availability: */
-    const bool fIsInterfaceConfigurable = !m_newData.m_interface.m_fDHCPEnabled;
     if (m_pLabelIPv4)
-        m_pLabelIPv4->setEnabled(fIsInterfaceConfigurable);
+        m_pLabelIPv4->setEnabled(fIsInterfaceExists && fIsInterfaceConfigurable);
     if (m_pLabelNMv4)
-        m_pLabelNMv4->setEnabled(fIsInterfaceConfigurable);
+        m_pLabelNMv4->setEnabled(fIsInterfaceExists && fIsInterfaceConfigurable);
     if (m_pEditorIPv4)
-        m_pEditorIPv4->setEnabled(fIsInterfaceConfigurable);
+        m_pEditorIPv4->setEnabled(fIsInterfaceExists && fIsInterfaceConfigurable);
     if (m_pEditorNMv4)
-        m_pEditorNMv4->setEnabled(fIsInterfaceConfigurable);
+        m_pEditorNMv4->setEnabled(fIsInterfaceExists && fIsInterfaceConfigurable);
 
     /* Load IPv4 interface fields: */
@@ -799 +808 @@
     const bool fIsIpv6Configurable = fIsInterfaceConfigurable && m_newData.m_interface.m_fSupportedIPv6;
     if (m_pLabelIPv6)
-        m_pLabelIPv6->setEnabled(fIsIpv6Configurable);
+        m_pLabelIPv6->setEnabled(fIsInterfaceExists && fIsIpv6Configurable);
     if (m_pLabelNMv6)
-        m_pLabelNMv6->setEnabled(fIsIpv6Configurable);
+        m_pLabelNMv6->setEnabled(fIsInterfaceExists && fIsIpv6Configurable);
     if (m_pEditorIPv6)
-        m_pEditorIPv6->setEnabled(fIsIpv6Configurable);
+        m_pEditorIPv6->setEnabled(fIsInterfaceExists && fIsIpv6Configurable);
     if (m_pEditorNMv6)
-        m_pEditorNMv6->setEnabled(fIsIpv6Configurable);
+        m_pEditorNMv6->setEnabled(fIsInterfaceExists && fIsIpv6Configurable);
 
     /* Load IPv6 interface fields: */
@@ -816 +825 @@
 void UIDetailsWidgetHostNetwork::loadDataForDHCPServer()
 {
+    /* Check whether interface exists and DHCP server available: */
+    const bool fIsInterfaceExists = m_newData.m_interface.m_fExists;
+    const bool fIsDHCPServerEnabled = m_newData.m_dhcpserver.m_fEnabled;
+
+    /* Toggle check-box availability: */
+    m_pCheckBoxDHCP->setEnabled(fIsInterfaceExists);
+
     /* Toggle DHCP server fields availability: */
-    const bool fIsDHCPServerEnabled = m_newData.m_dhcpserver.m_fEnabled;
     if (m_pLabelDHCPAddress)
-        m_pLabelDHCPAddress->setEnabled(fIsDHCPServerEnabled);
+        m_pLabelDHCPAddress->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pLabelDHCPMask)
-        m_pLabelDHCPMask->setEnabled(fIsDHCPServerEnabled);
+        m_pLabelDHCPMask->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pLabelDHCPLowerAddress)
-        m_pLabelDHCPLowerAddress->setEnabled(fIsDHCPServerEnabled);
+        m_pLabelDHCPLowerAddress->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pLabelDHCPUpperAddress)
-        m_pLabelDHCPUpperAddress->setEnabled(fIsDHCPServerEnabled);
+        m_pLabelDHCPUpperAddress->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pEditorDHCPAddress)
-        m_pEditorDHCPAddress->setEnabled(fIsDHCPServerEnabled);
+        m_pEditorDHCPAddress->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pEditorDHCPMask)
-        m_pEditorDHCPMask->setEnabled(fIsDHCPServerEnabled);
+        m_pEditorDHCPMask->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pEditorDHCPLowerAddress)
-        m_pEditorDHCPLowerAddress->setEnabled(fIsDHCPServerEnabled);
+        m_pEditorDHCPLowerAddress->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
     if (m_pEditorDHCPUpperAddress)
-        m_pEditorDHCPUpperAddress->setEnabled(fIsDHCPServerEnabled);
+        m_pEditorDHCPUpperAddress->setEnabled(fIsInterfaceExists && fIsDHCPServerEnabled);
 
     /* Load DHCP server fields: */

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetHostNetwork.h

@@ -44 +44 @@
     /** Constructs data. */
     UIDataHostNetworkInterface()
-        : m_strName(QString())
+        : m_fExists(false)
+        , m_strName(QString())
         , m_fDHCPEnabled(false)
         , m_strAddress(QString())
@@ -57 +58 @@
     {
         return true
+               && (m_fExists == other.m_fExists)
                && (m_strName == other.m_strName)
                && (m_fDHCPEnabled == other.m_fDHCPEnabled)
@@ -72 +74 @@
     bool operator!=(const UIDataHostNetworkInterface &other) const { return !equal(other); }
 
+    /** Holds this interface is not NULL. */
+    bool     m_fExists;
     /** Holds interface name. */
     QString  m_strName;