Changeset 87219 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 12, 2021 7:51:48 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Network Manager: Renaming UINetworkDetailsWidget to UIDetailsWidgetHostNetwork.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/networkmanager/UIDetailsWidgetHostNetwork.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkDetailsWidget.cpp ) (40 diffs)
• src/networkmanager/UIDetailsWidgetHostNetwork.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkDetailsWidget.h ) (7 diffs)
• src/networkmanager/UINetworkManager.cpp (modified) (3 diffs)
• src/networkmanager/UINetworkManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -622 +622 @@
         src/medium/UIMediumManager.h \
         src/monitor/resource/UIResourceMonitor.h \
-        src/networkmanager/UINetworkDetailsWidget.h \
+        src/networkmanager/UIDetailsWidgetHostNetwork.h \
         src/networkmanager/UINetworkManager.h \
         src/snapshots/UISnapshotDetailsWidget.h \
@@ -1103 +1103 @@
         src/medium/UIMediumManager.cpp \
         src/monitor/resource/UIResourceMonitor.cpp \
-        src/networkmanager/UINetworkDetailsWidget.cpp \
+        src/networkmanager/UIDetailsWidgetHostNetwork.cpp \
         src/networkmanager/UINetworkManager.cpp \
         src/networkmanager/UINetworkManagerUtils.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UINetworkDetailsWidget class implementation.
+ * VBox Qt GUI - UIDetailsWidgetHostNetwork class implementation.
  */
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include "QITabWidget.h"
 #include "UIIconPool.h"
-#include "UINetworkDetailsWidget.h"
+#include "UIDetailsWidgetHostNetwork.h"
 #include "UINetworkManagerUtils.h"
 
@@ -38 +38 @@
 
 
-UINetworkDetailsWidget::UINetworkDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
+UIDetailsWidgetHostNetwork::UIDetailsWidgetHostNetwork(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_enmEmbedding(enmEmbedding)
@@ -60 +60 @@
 }
 
-void UINetworkDetailsWidget::setData(const UIDataHostNetwork &data)
+void UIDetailsWidgetHostNetwork::setData(const UIDataHostNetwork &data)
 {
     /* Cache old/new data: */
@@ -72 +72 @@
 }
 
-void UINetworkDetailsWidget::retranslateUi()
+void UIDetailsWidgetHostNetwork::retranslateUi()
 {
     /* Translate tab-widget: */
@@ -132 +132 @@
 }
 
-void UINetworkDetailsWidget::sltToggledButtonAutomatic(bool fChecked)
+void UIDetailsWidgetHostNetwork::sltToggledButtonAutomatic(bool fChecked)
 {
     m_newData.m_interface.m_fDHCPEnabled = fChecked;
@@ -140 +140 @@
 }
 
-void UINetworkDetailsWidget::sltToggledButtonManual(bool fChecked)
+void UIDetailsWidgetHostNetwork::sltToggledButtonManual(bool fChecked)
 {
     m_newData.m_interface.m_fDHCPEnabled = !fChecked;
@@ -148 +148 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedIPv4(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedIPv4(const QString &strText)
 {
     m_newData.m_interface.m_strAddress = strText;
@@ -155 +155 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedNMv4(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedNMv4(const QString &strText)
 {
     m_newData.m_interface.m_strMask = strText;
@@ -162 +162 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedIPv6(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedIPv6(const QString &strText)
 {
     m_newData.m_interface.m_strAddress6 = strText;
@@ -169 +169 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedNMv6(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedNMv6(const QString &strText)
 {
     m_newData.m_interface.m_strPrefixLength6 = strText;
@@ -176 +176 @@
 }
 
-void UINetworkDetailsWidget::sltStatusChangedServer(int iChecked)
+void UIDetailsWidgetHostNetwork::sltStatusChangedServer(int iChecked)
 {
     m_newData.m_dhcpserver.m_fEnabled = (bool)iChecked;
@@ -184 +184 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedAddress(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedAddress(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strAddress = strText;
@@ -191 +191 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedMask(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedMask(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strMask = strText;
@@ -198 +198 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedLowerAddress(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedLowerAddress(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strLowerAddress = strText;
@@ -205 +205 @@
 }
 
-void UINetworkDetailsWidget::sltTextChangedUpperAddress(const QString &strText)
+void UIDetailsWidgetHostNetwork::sltTextChangedUpperAddress(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strUpperAddress = strText;
@@ -212 +212 @@
 }
 
-void UINetworkDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
+void UIDetailsWidgetHostNetwork::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
     /* Make sure button-box exists: */
@@ -234 +234 @@
 }
 
-void UINetworkDetailsWidget::prepare()
+void UIDetailsWidgetHostNetwork::prepare()
 {
     /* Prepare this: */
@@ -246 +246 @@
 }
 
-void UINetworkDetailsWidget::prepareThis()
+void UIDetailsWidgetHostNetwork::prepareThis()
 {
     /* Create layout: */
@@ -260 +260 @@
 }
 
-void UINetworkDetailsWidget::prepareTabWidget()
+void UIDetailsWidgetHostNetwork::prepareTabWidget()
 {
     /* Create tab-widget: */
@@ -276 +276 @@
 }
 
-void UINetworkDetailsWidget::prepareTabInterface()
+void UIDetailsWidgetHostNetwork::prepareTabInterface()
 {
     /* Create 'Interface' tab: */
@@ -308 +308 @@
                     /* Configure radio-button: */
                     connect(m_pButtonAutomatic, &QRadioButton::toggled,
-                            this, &UINetworkDetailsWidget::sltToggledButtonAutomatic);
+                            this, &UIDetailsWidgetHostNetwork::sltToggledButtonAutomatic);
                     /* Add into layout: */
                     pLayoutAutomatic->addWidget(m_pButtonAutomatic);
@@ -343 +343 @@
                     /* Configure radio-button: */
                     connect(m_pButtonManual, &QRadioButton::toggled,
-                            this, &UINetworkDetailsWidget::sltToggledButtonManual);
+                            this, &UIDetailsWidgetHostNetwork::sltToggledButtonManual);
                     /* Add into layout: */
                     pLayoutManual->addWidget(m_pButtonManual);
@@ -388 +388 @@
                     m_pLabelIPv4->setBuddy(m_pEditorIPv4);
                     connect(m_pEditorIPv4, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedIPv4);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedIPv4);
                     /* Add into layout: */
                     pLayoutIPv4->addWidget(m_pEditorIPv4);
@@ -429 +429 @@
                     m_pLabelNMv4->setBuddy(m_pEditorNMv4);
                     connect(m_pEditorNMv4, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedNMv4);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedNMv4);
                     /* Add into layout: */
                     pLayoutNMv4->addWidget(m_pEditorNMv4);
@@ -470 +470 @@
                     m_pLabelIPv6->setBuddy(m_pEditorIPv6);
                     connect(m_pEditorIPv6, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedIPv6);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedIPv6);
                     /* Add into layout: */
                     pLayoutIPv6->addWidget(m_pEditorIPv6);
@@ -511 +511 @@
                     m_pLabelNMv6->setBuddy(m_pEditorNMv6);
                     connect(m_pEditorNMv6, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedNMv6);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedNMv6);
                     /* Add into layout: */
                     pLayoutNMv6->addWidget(m_pEditorNMv6);
@@ -558 +558 @@
                 /* Configure button-box: */
                 m_pButtonBoxInterface->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                connect(m_pButtonBoxInterface, &QIDialogButtonBox::clicked, this, &UINetworkDetailsWidget::sltHandleButtonBoxClick);
+                connect(m_pButtonBoxInterface, &QIDialogButtonBox::clicked, this, &UIDetailsWidgetHostNetwork::sltHandleButtonBoxClick);
 
                 /* Add into layout: */
@@ -569 +569 @@
 }
 
-void UINetworkDetailsWidget::prepareTabDHCPServer()
+void UIDetailsWidgetHostNetwork::prepareTabDHCPServer()
 {
     /* Create 'DHCP server' tab: */
@@ -594 +594 @@
                 /* Configure check-box: */
                 connect(m_pCheckBoxDHCP, &QCheckBox::stateChanged,
-                        this, &UINetworkDetailsWidget::sltStatusChangedServer);
+                        this, &UIDetailsWidgetHostNetwork::sltStatusChangedServer);
                 /* Add into layout: */
                 pLayoutDHCPServer->addWidget(m_pCheckBoxDHCP, 0, 0, 1, 2);
@@ -624 +624 @@
                     m_pLabelDHCPAddress->setBuddy(m_pEditorDHCPAddress);
                     connect(m_pEditorDHCPAddress, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedAddress);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedAddress);
                     /* Add into layout: */
                     pLayoutDHCPAddress->addWidget(m_pEditorDHCPAddress);
@@ -665 +665 @@
                     m_pLabelDHCPMask->setBuddy(m_pEditorDHCPMask);
                     connect(m_pEditorDHCPMask, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedMask);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedMask);
                     /* Add into layout: */
                     pLayoutDHCPMask->addWidget(m_pEditorDHCPMask);
@@ -706 +706 @@
                     m_pLabelDHCPLowerAddress->setBuddy(m_pEditorDHCPLowerAddress);
                     connect(m_pEditorDHCPLowerAddress, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedLowerAddress);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedLowerAddress);
                     /* Add into layout: */
                     pLayoutDHCPLowerAddress->addWidget(m_pEditorDHCPLowerAddress);
@@ -747 +747 @@
                     m_pLabelDHCPUpperAddress->setBuddy(m_pEditorDHCPUpperAddress);
                     connect(m_pEditorDHCPUpperAddress, &QLineEdit::textChanged,
-                            this, &UINetworkDetailsWidget::sltTextChangedUpperAddress);
+                            this, &UIDetailsWidgetHostNetwork::sltTextChangedUpperAddress);
                     /* Add into layout: */
                     pLayoutDHCPUpperAddress->addWidget(m_pEditorDHCPUpperAddress);
@@ -794 +794 @@
                 /* Configure button-box: */
                 m_pButtonBoxServer->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                connect(m_pButtonBoxServer, &QIDialogButtonBox::clicked, this, &UINetworkDetailsWidget::sltHandleButtonBoxClick);
+                connect(m_pButtonBoxServer, &QIDialogButtonBox::clicked, this, &UIDetailsWidgetHostNetwork::sltHandleButtonBoxClick);
 
                 /* Add into layout: */
@@ -805 +805 @@
 }
 
-void UINetworkDetailsWidget::loadDataForInterface()
+void UIDetailsWidgetHostNetwork::loadDataForInterface()
 {
     /* Toggle IPv4 & IPv6 interface fields availability: */
@@ -832 +832 @@
 }
 
-void UINetworkDetailsWidget::loadDataForDHCPServer()
+void UIDetailsWidgetHostNetwork::loadDataForDHCPServer()
 {
     /* Toggle DHCP server fields availability: */
@@ -873 +873 @@
 }
 
-void UINetworkDetailsWidget::revalidate(QWidget *pWidget /* = 0 */)
+void UIDetailsWidgetHostNetwork::revalidate(QWidget *pWidget /* = 0 */)
 {
     /* Validate 'Interface' tab content: */
@@ -958 +958 @@
 }
 
-void UINetworkDetailsWidget::retranslateValidation(QWidget *pWidget /* = 0 */)
+void UIDetailsWidgetHostNetwork::retranslateValidation(QWidget *pWidget /* = 0 */)
 {
     /* Translate 'Interface' tab content: */
@@ -992 +992 @@
 }
 
-void UINetworkDetailsWidget::updateButtonStates()
+void UIDetailsWidgetHostNetwork::updateButtonStates()
 {
 //    if (m_oldData != m_newData)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UINetworkDetailsWidget class declaration.
+ * VBox Qt GUI - UIDetailsWidgetHostNetwork class declaration.
  */
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_networkmanager_UINetworkDetailsWidget_h
-#define FEQT_INCLUDED_SRC_networkmanager_UINetworkDetailsWidget_h
+#ifndef FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetHostNetwork_h
+#define FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetHostNetwork_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -73 +73 @@
 
     /** Holds interface name. */
-    QString m_strName;
+    QString  m_strName;
     /** Holds whether DHCP is enabled for that interface. */
-    bool m_fDHCPEnabled;
+    bool     m_fDHCPEnabled;
     /** Holds IPv4 interface address. */
-    QString m_strAddress;
+    QString  m_strAddress;
     /** Holds IPv4 interface mask. */
-    QString m_strMask;
+    QString  m_strMask;
     /** Holds whether IPv6 protocol supported. */
-    bool m_fSupportedIPv6;
+    bool     m_fSupportedIPv6;
     /** Holds IPv6 interface address. */
-    QString m_strAddress6;
+    QString  m_strAddress6;
     /** Holds IPv6 interface prefix length. */
-    QString m_strPrefixLength6;
+    QString  m_strPrefixLength6;
 };
 
@@ -119 +119 @@
 
     /** Holds whether DHCP server enabled. */
-    bool m_fEnabled;
+    bool     m_fEnabled;
     /** Holds DHCP server address. */
-    QString m_strAddress;
+    QString  m_strAddress;
     /** Holds DHCP server mask. */
-    QString m_strMask;
+    QString  m_strMask;
     /** Holds DHCP server lower address. */
-    QString m_strLowerAddress;
+    QString  m_strLowerAddress;
     /** Holds DHCP server upper address. */
-    QString m_strUpperAddress;
+    QString  m_strUpperAddress;
 };
 
@@ -155 +155 @@
 
     /** Holds the interface data. */
-    UIDataHostNetworkInterface m_interface;
+    UIDataHostNetworkInterface  m_interface;
     /** Holds the DHCP server data. */
-    UIDataDHCPServer m_dhcpserver;
+    UIDataDHCPServer            m_dhcpserver;
 };
 
 
 /** Host Network Manager: Host network details-widget. */
-class UINetworkDetailsWidget : public QIWithRetranslateUI<QWidget>
+class UIDetailsWidgetHostNetwork : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -180 +180 @@
     /** Constructs medium details dialog passing @a pParent to the base-class.
       * @param  enmEmbedding  Brings embedding type. */
-    UINetworkDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
+    UIDetailsWidgetHostNetwork(EmbedTo enmEmbedding, QWidget *pParent = 0);
 
     /** Returns the host network data. */
@@ -354 +354 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_networkmanager_UINetworkDetailsWidget_h */
-
+#endif /* !FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetHostNetwork_h */
+

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #include "QITreeWidget.h"
 #include "UIActionPoolManager.h"
+#include "UIDetailsWidgetHostNetwork.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
-#include "UINetworkDetailsWidget.h"
 #include "UINetworkManager.h"
 #include "UINetworkManagerUtils.h"
@@ -890 +890 @@
 {
     /* Prepare host network details-widget: */
-    m_pDetailsWidgetHostNetwork = new UINetworkDetailsWidget(m_enmEmbedding, m_pTabHostNetwork);
+    m_pDetailsWidgetHostNetwork = new UIDetailsWidgetHostNetwork(m_enmEmbedding, m_pTabHostNetwork);
     if (m_pDetailsWidgetHostNetwork)
     {
         m_pDetailsWidgetHostNetwork->setVisible(false);
         m_pDetailsWidgetHostNetwork->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-        connect(m_pDetailsWidgetHostNetwork, &UINetworkDetailsWidget::sigDataChanged,
+        connect(m_pDetailsWidgetHostNetwork, &UIDetailsWidgetHostNetwork::sigDataChanged,
                 this, &UINetworkManagerWidget::sigDetailsDataChangedHostNetwork);
-        connect(m_pDetailsWidgetHostNetwork, &UINetworkDetailsWidget::sigDataChangeRejected,
+        connect(m_pDetailsWidgetHostNetwork, &UIDetailsWidgetHostNetwork::sigDataChangeRejected,
                 this, &UINetworkManagerWidget::sltHandleCurrentItemChangeHostNetwork);
-        connect(m_pDetailsWidgetHostNetwork, &UINetworkDetailsWidget::sigDataChangeAccepted,
+        connect(m_pDetailsWidgetHostNetwork, &UIDetailsWidgetHostNetwork::sigDataChangeAccepted,
                 this, &UINetworkManagerWidget::sltApplyDetailsChangesHostNetwork);
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
 class QITreeWidget;
 class UIActionPool;
-class UINetworkDetailsWidget;
+class UIDetailsWidgetHostNetwork;
 class UIItemHostNetwork;
 class QIToolBar;
@@ -188 +188 @@
 
         /** Holds the host network tab. */
-        QWidget                *m_pTabHostNetwork;
+        QWidget                    *m_pTabHostNetwork;
         /** Holds the host network layout. */
-        QVBoxLayout            *m_pLayoutHostNetwork;
+        QVBoxLayout                *m_pLayoutHostNetwork;
         /** Holds the host network tree-widget instance. */
-        QITreeWidget           *m_pTreeWidgetHostNetwork;
+        QITreeWidget               *m_pTreeWidgetHostNetwork;
         /** Holds the host network details-widget instance. */
-        UINetworkDetailsWidget *m_pDetailsWidgetHostNetwork;
+        UIDetailsWidgetHostNetwork *m_pDetailsWidgetHostNetwork;
     /** @} */
 };