Changeset 87572 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2021 3:23:34 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Network Manager: Extend a set of tree-widget columns for NAT network stuff, reflecting IPv4/v6 prefixes and DHCP status.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp (modified) (6 diffs)

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

@@ -74 +74 @@
 {
     NATNetworkColumn_Name,
+    NATNetworkColumn_IPv4,
+    NATNetworkColumn_IPv6,
+    NATNetworkColumn_DHCP,
     NATNetworkColumn_Max,
 };
@@ -233 +236 @@
     /* Compose item fields: */
     setText(NATNetworkColumn_Name, m_strName);
-
-    /* Compose tool-tip: */
+    setText(NATNetworkColumn_IPv4, m_strPrefixIPv4);
+    setText(NATNetworkColumn_IPv6, m_strPrefixIPv6);
+    setText(NATNetworkColumn_DHCP, m_fSupportsDHCP ? tr("Enabled", "DHCP Server") : tr("Disabled", "DHCP Server"));
+
+    /* Compose item tool-tip: */
     const QString strTable("<table cellspacing=5>%1</table>");
     const QString strHeader("<tr><td><nobr>%1:&nbsp;</nobr></td><td><nobr>%2</nobr></td></tr>");
@@ -324 +330 @@
     {
         const QStringList fields = QStringList()
-                                   << UINetworkManager::tr("Name");
+                                   << UINetworkManager::tr("Name")
+                                   << UINetworkManager::tr("IPv4 Prefix")
+                                   << UINetworkManager::tr("IPv6 Prefix")
+                                   << UINetworkManager::tr("DHCP Server");
         m_pTreeWidgetNATNetwork->setHeaderLabels(fields);
     }
@@ -680 +689 @@
 void UINetworkManagerWidget::sltHandleCurrentTabWidgetIndexChange()
 {
+    /* Adjust tree-widgets first of all: */
+    sltAdjustTreeWidgets();
+
     /* Show/hide details area and Apply/Reset buttons: */
     const bool fVisible = m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->isChecked();
@@ -730 +742 @@
     }
 
-#if 0
     /* Check NAT network tree-widget: */
     if (m_pTreeWidgetNATNetwork)
@@ -742 +753 @@
         const int iTotal = m_pTreeWidgetNATNetwork->viewport()->width();
         /* Look for a minimum width hints for non-important columns: */
-        const int iMinWidth1 = qMax(pItemView->sizeHintForColumn(NATNetworkColumn_Availability), pItemHeader->sectionSizeHint(NATNetworkColumn_Availability));
+        const int iMinWidth1 = qMax(pItemView->sizeHintForColumn(NATNetworkColumn_IPv4), pItemHeader->sectionSizeHint(NATNetworkColumn_IPv4));
+        const int iMinWidth2 = qMax(pItemView->sizeHintForColumn(NATNetworkColumn_IPv6), pItemHeader->sectionSizeHint(NATNetworkColumn_IPv6));
+        const int iMinWidth3 = qMax(pItemView->sizeHintForColumn(NATNetworkColumn_DHCP), pItemHeader->sectionSizeHint(NATNetworkColumn_DHCP));
         /* Propose suitable width hints for non-important columns: */
         const int iWidth1 = iMinWidth1 < iTotal / NATNetworkColumn_Max ? iMinWidth1 : iTotal / NATNetworkColumn_Max;
+        const int iWidth2 = iMinWidth2 < iTotal / NATNetworkColumn_Max ? iMinWidth2 : iTotal / NATNetworkColumn_Max;
+        const int iWidth3 = iMinWidth3 < iTotal / NATNetworkColumn_Max ? iMinWidth3 : iTotal / NATNetworkColumn_Max;
         /* Apply the proposal: */
-        m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_Availability, iWidth1);
-        m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_Name, iTotal - iWidth1);
-    }
-#endif
+        m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_IPv4, iWidth1);
+        m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_IPv6, iWidth2);
+        m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_DHCP, iWidth3);
+        m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_Name, iTotal - iWidth1 - iWidth2 - iWidth3);
+    }
 }