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

Timestamp:

Jan 15, 2021 1:09:39 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Network Manager: Reworking details widget to behave and be located more unconditionally.

Location:

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

Files:

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

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

@@ -441 +441 @@
     /* Save the setting: */
     gEDataManager->setHostNetworkManagerDetailsExpanded(fVisible);
-    /* Show/hide details area and Apply button: */
-    if (m_pDetailsWidgetHostNetwork)
-        m_pDetailsWidgetHostNetwork->setVisible(fVisible);
+    /* Show/hide details area and Apply/Reset buttons: */
+    switch (m_pTabWidget->currentIndex())
+    {
+        case TabWidgetIndex_HostNetwork:
+        {
+            if (m_pDetailsWidgetHostNetwork)
+                m_pDetailsWidgetHostNetwork->setVisible(fVisible);
+            break;
+        }
+    }
     /* Notify external listeners: */
     emit sigDetailsVisibilityChanged(fVisible);
+}
+
+void UINetworkManagerWidget::sltHandleCurrentTabWidgetIndexChange()
+{
+    /* Show/hide details area and Apply/Reset buttons: */
+    const bool fVisible = m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->isChecked();
+    switch (m_pTabWidget->currentIndex())
+    {
+        case TabWidgetIndex_HostNetwork:
+        {
+            if (m_pDetailsWidgetHostNetwork)
+                m_pDetailsWidgetHostNetwork->setVisible(fVisible);
+            break;
+        }
+    }
 }
 
@@ -543 +565 @@
                 if (!comServer.isOk())
                     msgCenter().cannotSaveDHCPServerParameter(comServer, this);
+                else
                 {
                     /* Update interface in the tree: */
@@ -570 +593 @@
     /* Update actions availability: */
     m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
-    m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->setEnabled(pItem);
 
     /* Check host network details-widget: */
@@ -783 +805 @@
         if (m_fShowToolbar)
             prepareToolBar();
+
         /* Prepare tab-widget: */
         prepareTabWidget();
+
+        /* Prepare details widgets: */
+        prepareDetailsWidgetHostNetwork();
     }
 }
@@ -790 +816 @@
 void UINetworkManagerWidget::prepareToolBar()
 {
-    /* Create toolbar: */
+    /* Prepare toolbar: */
     m_pToolBar = new QIToolBar(parentWidget());
     if (m_pToolBar)
     {
-        /* Configure toolbar: */
         const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-
-        /* Add toolbar actions: */
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create));
         m_pToolBar->addSeparator();
@@ -825 +848 @@
     if (m_pTabWidget)
     {
+        connect(m_pTabWidget, &QITabWidget::currentChanged,
+                this, &UINetworkManagerWidget::sltHandleCurrentTabWidgetIndexChange);
+
         prepareTabHostNetwork();
 
@@ -841 +867 @@
         m_pLayoutHostNetwork = new QVBoxLayout(m_pTabHostNetwork);
         if (m_pLayoutHostNetwork)
-        {
             prepareTreeWidgetHostNetwork();
-            prepareDetailsWidgetHostNetwork();
-        }
 
         /* Add into tab-widget: */
@@ -882 +905 @@
 {
     /* Prepare host network details-widget: */
-    m_pDetailsWidgetHostNetwork = new UIDetailsWidgetHostNetwork(m_enmEmbedding, m_pTabHostNetwork);
+    m_pDetailsWidgetHostNetwork = new UIDetailsWidgetHostNetwork(m_enmEmbedding, this);
     if (m_pDetailsWidgetHostNetwork)
     {
@@ -895 +918 @@
 
         /* Add into layout: */
-        m_pLayoutHostNetwork->addWidget(m_pDetailsWidgetHostNetwork);
+        layout()->addWidget(m_pDetailsWidgetHostNetwork);
     }
 }

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

@@ -113 +113 @@
     /** @name Tree-widget stuff.
       * @{ */
+        /** Handles current tab-widget's index change. */
+        void sltHandleCurrentTabWidgetIndexChange();
+
         /** Handles command to adjust tree-widget. */
         void sltAdjustTreeWidgets();