Changeset 67251 in vbox for trunk

Timestamp:

Jun 2, 2017 3:42:28 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8847: Host Network Manager: A bit of shine and paranoia.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork

Files:

• UIHostNetworkDetailsDialog.cpp (modified) (1 diff)
• UIHostNetworkManager.cpp (modified) (8 diffs)
• UIHostNetworkManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp

@@ -63 +63 @@
 void UIHostNetworkDetailsDialog::setData(const UIDataHostNetwork &data)
 {
-    /* Save old data: */
+    /* Cache old/new data: */
     m_oldData = data;
-    /* Copy old data to new one: */
     m_newData = m_oldData;
 

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -410 +410 @@
 }
 
-void UIHostNetworkManagerWidget::sltToggleHostNetworkDetailsVisibility(bool fShow)
+void UIHostNetworkManagerWidget::sltToggleHostNetworkDetailsVisibility(bool fVisible)
 {
     /* Show/hide details area and Apply button: */
-    m_pDetailsWidget->setVisible(fShow);
-    m_pActionCommit->setVisible(fShow);
-}
-
-void UIHostNetworkManagerWidget::sltApplyHostNetworkDetailsChanges()
+    m_pDetailsWidget->setVisible(fVisible);
+    m_pActionCommit->setVisible(fVisible);
+}
+
+void UIHostNetworkManagerWidget::sltCommitHostNetworkDetailsChanges()
 {
     /* Disable button first of all: */
@@ -654 +654 @@
 
     /* Update actions availability: */
-    m_pActionRemove->setEnabled(pItem);
-    m_pActionDetails->setEnabled(pItem);
-    m_pActionCommit->setEnabled(false);
+    if (m_pActionRemove)
+        m_pActionRemove->setEnabled(pItem);
+    if (m_pActionDetails)
+        m_pActionDetails->setEnabled(pItem);
+    if (m_pActionCommit)
+        m_pActionCommit->setEnabled(false);
 
     /* If there is an item => update details data: */
@@ -675 +678 @@
     if (m_pTreeWidget->itemAt(pos))
     {
-        menu.addAction(m_pActionRemove);
-        menu.addAction(m_pActionDetails);
-        menu.addAction(m_pActionCommit);
+        if (m_pActionRemove)
+            menu.addAction(m_pActionRemove);
+        if (m_pActionDetails)
+            menu.addAction(m_pActionDetails);
+        if (m_pActionCommit)
+            menu.addAction(m_pActionCommit);
     }
     else
     {
-        menu.addAction(m_pActionAdd);
+        if (m_pActionAdd)
+            menu.addAction(m_pActionAdd);
     }
     /* And show it: */
@@ -760 +767 @@
                                                          ":/commit_host_iface_disabled_22px.png",
                                                          ":/commit_host_iface_disabled_16px.png"));
-        connect(m_pActionDetails, &QAction::toggled, m_pActionCommit, &QAction::setVisible);
-        connect(m_pActionCommit, &QAction::triggered, this, &UIHostNetworkManagerWidget::sltApplyHostNetworkDetailsChanges);
+        if (m_pActionDetails)
+            connect(m_pActionDetails, &QAction::toggled, m_pActionCommit, &QAction::setVisible);
+        connect(m_pActionCommit, &QAction::triggered, this, &UIHostNetworkManagerWidget::sltCommitHostNetworkDetailsChanges);
     }
 
@@ -775 +783 @@
     {
         /* Configure menu: */
-        m_pMenu->addAction(m_pActionAdd);
-        m_pMenu->addAction(m_pActionRemove);
-        m_pMenu->addAction(m_pActionDetails);
-        m_pMenu->addAction(m_pActionCommit);
+        if (m_pActionAdd)
+            m_pMenu->addAction(m_pActionAdd);
+        if (m_pActionRemove)
+            m_pMenu->addAction(m_pActionRemove);
+        if (m_pActionDetails)
+            m_pMenu->addAction(m_pActionDetails);
+        if (m_pActionCommit)
+            m_pMenu->addAction(m_pActionCommit);
     }
 }
@@ -861 +873 @@
         connect(m_pTreeWidget, &QITreeWidget::itemChanged,
                 this, &UIHostNetworkManagerWidget::sltHandleItemChange);
-        connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-                m_pActionDetails, &QAction::setChecked);
+        if (m_pActionDetails)
+            connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
+                    m_pActionDetails, &QAction::setChecked);
 
         /* Add into layout: */
@@ -878 +891 @@
         m_pDetailsWidget->setVisible(false);
         m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-        connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChanged,
-                m_pActionCommit, &QAction::setEnabled);
+        if (m_pActionCommit)
+            connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChanged,
+                    m_pActionCommit, &QAction::setEnabled);
 
         /* Add into layout: */
@@ -1056 +1070 @@
         setWidgetToolbar(pWidget->toolbar());
 #endif
-        /* Add to layout: */
+        /* Add into layout: */
         centralWidget()->layout()->addWidget(pWidget);
     }

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h

@@ -80 +80 @@
         /** Handles command to make host network details @a fVisible. */
         void sltToggleHostNetworkDetailsVisibility(bool fVisible);
-        /** Handles command to apply host network details changes. */
-        void sltApplyHostNetworkDetailsChanges();
+        /** Handles command to commit host network details changes. */
+        void sltCommitHostNetworkDetailsChanges();
     /** @} */