Changeset 92810 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2021 1:21:20 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Fixing regression after moving NAT networks code to Network Manager; Availability for Remove action should always be updated according to current tab-widget index.

Location:

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

Files:

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

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

@@ -915 +915 @@
 void UINetworkManagerWidget::sltHandleCurrentTabWidgetIndexChange()
 {
+    /* Update actions: */
+    updateActionAvailability();
+
     /* Adjust tree-widgets first of all: */
     sltAdjustTreeWidgets();
@@ -1032 +1035 @@
 void UINetworkManagerWidget::sltHandleCurrentItemChangeHostNetwork()
 {
+    /* Update actions: */
+    updateActionAvailability();
+
     /* Check host network tree-widget: */
     AssertMsgReturnVoid(m_pTreeWidgetHostNetwork, ("Host network tree-widget isn't created!\n"));
@@ -1037 +1043 @@
     /* Get network item: */
     UIItemHostNetwork *pItem = static_cast<UIItemHostNetwork*>(m_pTreeWidgetHostNetwork->currentItem());
-
-    /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
 
     /* Check host network details-widget: */
@@ -1208 +1211 @@
 void UINetworkManagerWidget::sltHandleCurrentItemChangeNATNetworkHoldingPosition(bool fHoldPosition)
 {
+    /* Update actions: */
+    updateActionAvailability();
+
     /* Check NAT network tree-widget: */
     AssertMsgReturnVoid(m_pTreeWidgetNATNetwork, ("NAT network tree-widget isn't created!\n"));
@@ -1213 +1219 @@
     /* Get network item: */
     UIItemNATNetwork *pItem = static_cast<UIItemNATNetwork*>(m_pTreeWidgetNATNetwork->currentItem());
-
-    /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
 
     /* Check NAT network details-widget: */
@@ -1376 +1379 @@
 void UINetworkManagerWidget::sltHandleCurrentItemChangeCloudNetwork()
 {
+    /* Update actions: */
+    updateActionAvailability();
+
     /* Check cloud network tree-widget: */
     AssertMsgReturnVoid(m_pTreeWidgetCloudNetwork, ("Cloud network tree-widget isn't created!\n"));
@@ -1381 +1387 @@
     /* Get network item: */
     UIItemCloudNetwork *pItem = static_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->currentItem());
-
-    /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
 
     /* Check Cloud network details-widget: */
@@ -2071 +2074 @@
 }
 
+void UINetworkManagerWidget::updateActionAvailability()
+{
+    /* Check which tab we have currently: */
+    switch (m_pTabWidget->currentIndex())
+    {
+        case TabWidgetIndex_HostNetwork:
+        {
+            AssertMsgReturnVoid(m_pTreeWidgetHostNetwork, ("Host network tree-widget isn't created!\n"));
+            UIItemHostNetwork *pItem = static_cast<UIItemHostNetwork*>(m_pTreeWidgetHostNetwork->currentItem());
+            m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
+            break;
+        }
+        case TabWidgetIndex_NATNetwork:
+        {
+            AssertMsgReturnVoid(m_pTreeWidgetNATNetwork, ("NAT network tree-widget isn't created!\n"));
+            UIItemNATNetwork *pItem = static_cast<UIItemNATNetwork*>(m_pTreeWidgetNATNetwork->currentItem());
+            m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
+            break;
+        }
+        case TabWidgetIndex_CloudNetwork:
+        {
+            AssertMsgReturnVoid(m_pTreeWidgetCloudNetwork, ("Cloud network tree-widget isn't created!\n"));
+            UIItemCloudNetwork *pItem = static_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->currentItem());
+            m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
+            break;
+        }
+        default:
+            break;
+    }
+}
+
 void UINetworkManagerWidget::createItemForHostNetwork(const UIDataHostNetwork &data, bool fChooseItem)
 {

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

@@ -225 +225 @@
     /** @} */
 
+    /** @name Actions stuff.
+      * @{ */
+        /** Updates action availability. */
+        void updateActionAvailability();
+    /** @} */
+
     /** @name Tree-widget stuff.
       * @{ */