Changeset 87576 in vbox

Timestamp:

Feb 3, 2021 3:35:40 PM (4 years ago)

Author:

vboxsync

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

142603

Message:

FE/Qt: bugref:9871: Network Manager: Wipe out DHCP enable/disable functionality for Host-only network's tree-widget since that functionality is already present in network details anyway; This is compatibility decision directed to sync stuff with NAT networks.

Location:

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

Files:

• UINetworkManager.cpp (modified) (4 diffs)
• UINetworkManager.h (modified) (1 diff)

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

@@ -133 +133 @@
     setText(HostNetworkColumn_IPv6, m_interface.m_strAddress6.isEmpty() || !m_interface.m_fSupportedIPv6 ? QString() :
                                     QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strPrefixLength6.toInt()));
-    setText(HostNetworkColumn_DHCP, tr("Enable", "DHCP Server"));
-    setCheckState(HostNetworkColumn_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked);
+    setText(HostNetworkColumn_DHCP, m_dhcpserver.m_fEnabled ? tr("Enabled", "DHCP Server") : tr("Disabled", "DHCP Server"));
 
     /* Compose item tool-tip: */
@@ -320 +319 @@
         const QStringList fields = QStringList()
                                    << UINetworkManager::tr("Name")
-                                   << UINetworkManager::tr("IPv4 Address/Mask")
-                                   << UINetworkManager::tr("IPv6 Address/Mask")
+                                   << UINetworkManager::tr("IPv4 Prefix")
+                                   << UINetworkManager::tr("IPv6 Prefix")
                                    << UINetworkManager::tr("DHCP Server");
         m_pTreeWidgetHostNetwork->setHeaderLabels(fields);
@@ -765 +764 @@
         m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_DHCP, iWidth3);
         m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_Name, iTotal - iWidth1 - iWidth2 - iWidth3);
-    }
-}
-
-void UINetworkManagerWidget::sltHandleItemChangeHostNetwork(QTreeWidgetItem *pItem)
-{
-    /* Get network item: */
-    UIItemHostNetwork *pChangedItem = static_cast<UIItemHostNetwork*>(pItem);
-    AssertMsgReturnVoid(pChangedItem, ("Changed item must not be null!\n"));
-
-    /* Get item data: */
-    UIDataHostNetwork oldData = *pChangedItem;
-
-    /* Make sure dhcp server status changed: */
-    if (   (   oldData.m_dhcpserver.m_fEnabled
-            && pChangedItem->checkState(HostNetworkColumn_DHCP) == Qt::Checked)
-        || (   !oldData.m_dhcpserver.m_fEnabled
-            && pChangedItem->checkState(HostNetworkColumn_DHCP) == Qt::Unchecked))
-        return;
-
-    /* Get host for further activities: */
-    CHost comHost = uiCommon().host();
-
-    /* Find corresponding interface: */
-    CHostNetworkInterface comInterface = comHost.FindHostNetworkInterfaceByName(oldData.m_interface.m_strName);
-
-    /* Show error message if necessary: */
-    if (!comHost.isOk() || comInterface.isNull())
-        msgCenter().cannotFindHostNetworkInterface(comHost, oldData.m_interface.m_strName, this);
-    else
-    {
-        /* Get network name for further activities: */
-        const QString strNetworkName = comInterface.GetNetworkName();
-
-        /* Show error message if necessary: */
-        if (!comInterface.isOk())
-            msgCenter().cannotAcquireHostNetworkInterfaceParameter(comInterface, this);
-        else
-        {
-            /* Get VBox for further activities: */
-            CVirtualBox comVBox = uiCommon().virtualBox();
-
-            /* Find corresponding DHCP server (create if necessary): */
-            CDHCPServer comServer = comVBox.FindDHCPServerByNetworkName(strNetworkName);
-            if (!comVBox.isOk() || comServer.isNull())
-                comServer = comVBox.CreateDHCPServer(strNetworkName);
-
-            /* Show error message if necessary: */
-            if (!comVBox.isOk() || comServer.isNull())
-                msgCenter().cannotCreateDHCPServer(comVBox, strNetworkName, this);
-            else
-            {
-                /* Save whether DHCP server is enabled: */
-                if (comServer.isOk())
-                    comServer.SetEnabled(!oldData.m_dhcpserver.m_fEnabled);
-                /* Save default DHCP server configuration if current is invalid: */
-                if (   comServer.isOk()
-                    && !oldData.m_dhcpserver.m_fEnabled
-                    && (   oldData.m_dhcpserver.m_strAddress == "0.0.0.0"
-                        || oldData.m_dhcpserver.m_strMask == "0.0.0.0"
-                        || oldData.m_dhcpserver.m_strLowerAddress == "0.0.0.0"
-                        || oldData.m_dhcpserver.m_strUpperAddress == "0.0.0.0"))
-                {
-                    const QStringList &proposal = makeDhcpServerProposal(oldData.m_interface.m_strAddress,
-                                                                         oldData.m_interface.m_strMask);
-                    comServer.SetConfiguration(proposal.at(0), proposal.at(1), proposal.at(2), proposal.at(3));
-                }
-
-                /* Show error message if necessary: */
-                if (!comServer.isOk())
-                    msgCenter().cannotSaveDHCPServerParameter(comServer, this);
-                else
-                {
-                    /* Update interface in the tree: */
-                    UIDataHostNetwork data;
-                    loadHostNetwork(comInterface, data);
-                    updateItemForHostNetwork(data, true, pChangedItem);
-
-                    /* Make sure current item fetched: */
-                    sltHandleCurrentItemChangeHostNetwork();
-
-                    /* Adjust tree-widgets: */
-                    sltAdjustTreeWidgets();
-                }
-            }
-        }
     }
 }
@@ -1343 +1257 @@
         connect(m_pTreeWidgetHostNetwork, &QITreeWidget::customContextMenuRequested,
                 this, &UINetworkManagerWidget::sltHandleContextMenuRequestHostNetwork);
-        connect(m_pTreeWidgetHostNetwork, &QITreeWidget::itemChanged,
-                this, &UINetworkManagerWidget::sltHandleItemChangeHostNetwork);
         connect(m_pTreeWidgetHostNetwork, &QITreeWidget::itemDoubleClicked,
                 m_pActionPool->action(UIActionIndexMN_M_Network_T_Details), &QAction::setChecked);

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

@@ -131 +131 @@
         void sltAdjustTreeWidgets();
 
-        /** Handles host network tree-widget @a pItem change. */
-        void sltHandleItemChangeHostNetwork(QTreeWidgetItem *pItem);
         /** Handles host network tree-widget current item change. */
         void sltHandleCurrentItemChangeHostNetwork();