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

Timestamp:

Jul 5, 2017 6:56:54 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

116736

Message:

FE/Qt: bugref:8847: Host Network Manager: A bit of cleanup.

Location:

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

Files:

• UIHostNetworkDetailsWidget.cpp (modified) (4 diffs)
• UIHostNetworkDetailsWidget.h (modified) (4 diffs)
• UIHostNetworkManager.cpp (modified) (2 diffs)
• UIHostNetworkManager.h (modified) (2 diffs)

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

@@ -78 +78 @@
 }
 
-void UIHostNetworkDetailsWidget::clearData()
-{
-    /* Reset old/new data: */
-    m_oldData = UIDataHostNetwork();
-    m_newData = m_oldData;
-
-    /* Load 'Interface' data: */
-    loadDataForInterface();
-    /* Load 'DHCP server' data: */
-    loadDataForDHCPServer();
-}
-
 void UIHostNetworkDetailsWidget::retranslateUi()
 {
@@ -232 +220 @@
 void UIHostNetworkDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
+    /* Make sure button-box exists: */
+    AssertPtrReturnVoid(m_pButtonBoxInterface);
+    AssertPtrReturnVoid(m_pButtonBoxServer);
+
     /* Disable buttons first of all: */
-    if (m_pButtonBoxInterface)
-    {
-        m_pButtonBoxInterface->button(QDialogButtonBox::Cancel)->setEnabled(false);
-        m_pButtonBoxInterface->button(QDialogButtonBox::Ok)->setEnabled(false);
-    }
-    if (m_pButtonBoxServer)
-    {
-        m_pButtonBoxServer->button(QDialogButtonBox::Cancel)->setEnabled(false);
-        m_pButtonBoxServer->button(QDialogButtonBox::Ok)->setEnabled(false);
-    }
+    m_pButtonBoxInterface->button(QDialogButtonBox::Cancel)->setEnabled(false);
+    m_pButtonBoxInterface->button(QDialogButtonBox::Ok)->setEnabled(false);
+    m_pButtonBoxServer->button(QDialogButtonBox::Cancel)->setEnabled(false);
+    m_pButtonBoxServer->button(QDialogButtonBox::Ok)->setEnabled(false);
 
     /* Compare with known buttons: */
-    if (   (   m_pButtonBoxInterface
-            && pButton == m_pButtonBoxInterface->button(QDialogButtonBox::Cancel))
-        || (   m_pButtonBoxServer
-            && pButton == m_pButtonBoxServer->button(QDialogButtonBox::Cancel)))
+    if (   pButton == m_pButtonBoxInterface->button(QDialogButtonBox::Cancel)
+        || pButton == m_pButtonBoxServer->button(QDialogButtonBox::Cancel))
         emit sigDataChangeRejected();
-
     else
-
-    if (   (   m_pButtonBoxInterface
-            && pButton == m_pButtonBoxInterface->button(QDialogButtonBox::Ok))
-        || (   m_pButtonBoxServer
-            && pButton == m_pButtonBoxServer->button(QDialogButtonBox::Ok)))
+    if (   pButton == m_pButtonBoxInterface->button(QDialogButtonBox::Ok)
+        || pButton == m_pButtonBoxServer->button(QDialogButtonBox::Ok))
         emit sigDataChangeAccepted();
 }
@@ -280 +260 @@
         /* Configure layout: */
         pLayout->setContentsMargins(0, 0, 0, 0);
+
         /* Prepare tab-widget: */
         prepareTabWidget();
@@ -295 +276 @@
         /* Prepare 'DHCP server' tab: */
         prepareTabDHCPServer();
+
         /* Add into layout: */
         layout()->addWidget(m_pTabWidget);

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

@@ -158 +158 @@
 
 
-/** Host Network Manager: Host network details widget. */
+/** Host Network Manager: Host network details-widget. */
 class UIHostNetworkDetailsWidget : public QIWithRetranslateUI<QWidget>
 {
@@ -175 +175 @@
 public:
 
-    /** Constructs host network details dialog for the passed @a pParent and @a data. */
+    /** Constructs medium details dialog passing @a pParent to the base-class.
+      * @param  enmEmbedding  Brings embedding type. */
     UIHostNetworkDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
 
@@ -182 +183 @@
     /** Defines the host network @a data. */
     void setData(const UIDataHostNetwork &data);
-    /** Clears the host network data. */
-    void clearData();
 
 protected:
@@ -265 +264 @@
         /** Holds the new data copy. */
         UIDataHostNetwork  m_newData;
+
         /** Holds the tab-widget. */
-        QITabWidget       *m_pTabWidget;
+        QITabWidget *m_pTabWidget;
     /** @} */
 

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

@@ -662 +662 @@
     {
         /* Otherwise => clear details and close the area: */
-        m_pDetailsWidget->clearData();
+        m_pDetailsWidget->setData(UIDataHostNetwork());
         sltToggleHostNetworkDetailsVisibility(false);
     }
@@ -1028 +1028 @@
     if (pButton == button(ButtonType_Reset))
         emit sigDataChangeRejected();
-
     else
-
     if (pButton == button(ButtonType_Apply))
         emit sigDataChangeAccepted();

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

@@ -45 +45 @@
 signals:
 
-    /** Notifies listeners about host network details widget @a fVisible. */
+    /** Notifies listeners about host network details-widget @a fVisible. */
     void sigHostNetworkDetailsVisibilityChanged(bool fVisible);
     /** Notifies listeners about host network details data @a fDiffers. */
@@ -79 +79 @@
 public slots:
 
-    /** @name Menu/action stuff.
+    /** @name Details-widget stuff.
       * @{ */
         /** Handles command to reset host network details changes. */