Changeset 87232 in vbox for trunk/src/VBox

Timestamp:

Jan 13, 2021 11:00:34 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Network Manager: More cleanup.

Location:

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

Files:

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

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

@@ -39 +39 @@
 
 
-/** Host Network Manager: Host Network Interface data structure. */
+/** Network Manager: Host Network Interface data structure. */
 struct UIDataHostNetworkInterface
 {
@@ -89 +89 @@
 
 
-/** Host Network Manager: DHCP Server data structure. */
+/** Network Manager: DHCP Server data structure. */
 struct UIDataDHCPServer
 {
@@ -131 +131 @@
 
 
-/** Host Network Manager: Host network data structure. */
+/** Network Manager: Host network data structure. */
 struct UIDataHostNetwork
 {
@@ -161 +161 @@
 
 
-/** Host Network Manager: Host network details-widget. */
+/** Network Manager: Host network details-widget. */
 class UIDetailsWidgetHostNetwork : public QIWithRetranslateUI<QWidget>
 {

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

@@ -48 +48 @@
 
 
+/** Tab-widget indexes. */
+enum TabWidgetIndex
+{
+    TabWidgetIndex_HostNetwork,
+};
+
+
 /** Host network tree-widget column indexes. */
 enum HostNetworkColumn
@@ -267 +274 @@
     switch (m_pTabWidget->currentIndex())
     {
-        case 0:
-        {
-            sltHandleCurrentItemChangeHostNetwork();
-            break;
-        }
-        default:
-            break;
+        case TabWidgetIndex_HostNetwork: sltHandleCurrentItemChangeHostNetwork(); break;
+        default: break;
     }
 }
@@ -285 +287 @@
     switch (m_pTabWidget->currentIndex())
     {
-        case 0:
-        {
-            sltApplyDetailsChangesHostNetwork();
-            break;
-        }
-        default:
-            break;
+        case TabWidgetIndex_HostNetwork: sltApplyDetailsChangesHostNetwork(); break;
+        default: break;
     }
 }
@@ -297 +294 @@
 void UINetworkManagerWidget::sltCreateHostNetwork()
 {
+    /* For host networks only: */
+    if (m_pTabWidget->currentIndex() != TabWidgetIndex_HostNetwork)
+        return;
+
     /* Get host for further activities: */
     CHost comHost = uiCommon().host();
@@ -341 +342 @@
             UIDataHostNetwork data;
             loadHostNetwork(comInterface, data);
-            createItemForNetworkHost(data, true);
+            createItemForHostNetwork(data, true);
 
             /* Adjust tree-widgets: */
@@ -351 +352 @@
 void UINetworkManagerWidget::sltRemoveHostNetwork()
 {
+    /* For host networks only: */
+    if (m_pTabWidget->currentIndex() != TabWidgetIndex_HostNetwork)
+        return;
+
     /* Check host network tree-widget: */
     AssertMsgReturnVoid(m_pTreeWidgetHostNetwork, ("Host network tree-widget isn't created!\n"));
@@ -542 +547 @@
                     UIDataHostNetwork data;
                     loadHostNetwork(comInterface, data);
-                    updateItemForNetworkHost(data, true, pChangedItem);
+                    updateItemForHostNetwork(data, true, pChangedItem);
 
                     /* Make sure current item fetched: */
@@ -573 +578 @@
     if (pItem)
         m_pDetailsWidgetHostNetwork->setData(*pItem);
+    /* Otherwise => clear details: */
     else
-    {
-        /* Otherwise => clear details and close the area: */
         m_pDetailsWidgetHostNetwork->setData(UIDataHostNetwork());
-        sltToggleDetailsVisibility(false);
-    }
 }
 
@@ -717 +719 @@
             UIDataHostNetwork data;
             loadHostNetwork(comInterface, data);
-            updateItemForNetworkHost(data, true, pItem);
+            updateItemForHostNetwork(data, true, pItem);
 
             /* Make sure current item fetched: */
@@ -845 +847 @@
 
         /* Add into tab-widget: */
-        m_pTabWidget->addTab(m_pTabHostNetwork, QString());
+        m_pTabWidget->insertTab(TabWidgetIndex_HostNetwork, m_pTabHostNetwork, QString());
     }
 }
@@ -933 +935 @@
                 UIDataHostNetwork data;
                 loadHostNetwork(comInterface, data);
-                createItemForNetworkHost(data, false);
+                createItemForHostNetwork(data, false);
             }
 
@@ -1003 +1005 @@
 }
 
-void UINetworkManagerWidget::createItemForNetworkHost(const UIDataHostNetwork &data, bool fChooseItem)
+void UINetworkManagerWidget::createItemForHostNetwork(const UIDataHostNetwork &data, bool fChooseItem)
 {
     /* Create new item: */
@@ -1020 +1022 @@
 }
 
-void UINetworkManagerWidget::updateItemForNetworkHost(const UIDataHostNetwork &data, bool fChooseItem, UIItemHostNetwork *pItem)
+void UINetworkManagerWidget::updateItemForHostNetwork(const UIDataHostNetwork &data, bool fChooseItem, UIItemHostNetwork *pItem)
 {
     /* Update passed item: */

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

@@ -161 +161 @@
       * @{ */
         /** Creates a new host network tree-widget item on the basis of passed @a data, @a fChooseItem if requested. */
-        void createItemForNetworkHost(const UIDataHostNetwork &data, bool fChooseItem);
+        void createItemForHostNetwork(const UIDataHostNetwork &data, bool fChooseItem);
         /** Updates passed host network tree-widget item on the basis of passed @a data, @a fChooseItem if requested. */
-        void updateItemForNetworkHost(const UIDataHostNetwork &data, bool fChooseItem, UIItemHostNetwork *pItem);
+        void updateItemForHostNetwork(const UIDataHostNetwork &data, bool fChooseItem, UIItemHostNetwork *pItem);
     /** @} */