Changeset 67686 in vbox

Timestamp:

Jun 29, 2017 9:57:17 AM (8 years ago)

Author:

vboxsync

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

116512

Message:

FE/Qt: bugref:8847: Host Network Manager: Forgot to rename dialog to widget according to it's real role.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/hostnetwork/UIHostNetworkDetailsWidget.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp ) (41 diffs)
• src/hostnetwork/UIHostNetworkDetailsWidget.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h ) (5 diffs)
• src/hostnetwork/UIHostNetworkManager.cpp (modified) (3 diffs)
• src/hostnetwork/UIHostNetworkManager.h (modified) (2 diffs)

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

@@ -335 +335 @@
         src/globals/VBoxGlobal.h \
         src/globals/VBoxUtils.h \
-        src/hostnetwork/UIHostNetworkDetailsDialog.h \
+        src/hostnetwork/UIHostNetworkDetailsWidget.h \
         src/hostnetwork/UIHostNetworkManager.h \
         src/medium/UIMediumEnumerator.h \
@@ -642 +642 @@
         src/globals/UIThreadPool.cpp \
         src/globals/VBoxGlobal.cpp \
-        src/hostnetwork/UIHostNetworkDetailsDialog.cpp \
+        src/hostnetwork/UIHostNetworkDetailsWidget.cpp \
         src/hostnetwork/UIHostNetworkManager.cpp \
         src/hostnetwork/UIHostNetworkUtils.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIHostNetworkDetailsDialog class implementation.
+ * VBox Qt GUI - UIHostNetworkDetailsWidget class implementation.
  */
 
@@ -33 +33 @@
 # include "QILineEdit.h"
 # include "QITabWidget.h"
-# include "UIHostNetworkDetailsDialog.h"
+# include "UIHostNetworkDetailsWidget.h"
 # include "UIHostNetworkUtils.h"
 # include "UIIconPool.h"
@@ -44 +44 @@
 
 
-UIHostNetworkDetailsDialog::UIHostNetworkDetailsDialog(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
+UIHostNetworkDetailsWidget::UIHostNetworkDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI2<QWidget>(pParent)
     , m_enmEmbedding(enmEmbedding)
@@ -66 +66 @@
 }
 
-void UIHostNetworkDetailsDialog::setData(const UIDataHostNetwork &data)
+void UIHostNetworkDetailsWidget::setData(const UIDataHostNetwork &data)
 {
     /* Cache old/new data: */
@@ -78 +78 @@
 }
 
-void UIHostNetworkDetailsDialog::clearData()
+void UIHostNetworkDetailsWidget::clearData()
 {
     /* Reset old/new data: */
@@ -90 +90 @@
 }
 
-void UIHostNetworkDetailsDialog::retranslateUi()
+void UIHostNetworkDetailsWidget::retranslateUi()
 {
     /* Translate tab-widget: */
@@ -150 +150 @@
 }
 
-void UIHostNetworkDetailsDialog::sltToggledButtonAutomatic(bool fChecked)
+void UIHostNetworkDetailsWidget::sltToggledButtonAutomatic(bool fChecked)
 {
     m_newData.m_interface.m_fDHCPEnabled = fChecked;
@@ -158 +158 @@
 }
 
-void UIHostNetworkDetailsDialog::sltToggledButtonManual(bool fChecked)
+void UIHostNetworkDetailsWidget::sltToggledButtonManual(bool fChecked)
 {
     m_newData.m_interface.m_fDHCPEnabled = !fChecked;
@@ -166 +166 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedIPv4(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedIPv4(const QString &strText)
 {
     m_newData.m_interface.m_strAddress = strText;
@@ -173 +173 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedNMv4(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedNMv4(const QString &strText)
 {
     m_newData.m_interface.m_strMask = strText;
@@ -180 +180 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedIPv6(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedIPv6(const QString &strText)
 {
     m_newData.m_interface.m_strAddress6 = strText;
@@ -187 +187 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedNMv6(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedNMv6(const QString &strText)
 {
     m_newData.m_interface.m_strPrefixLength6 = strText;
@@ -194 +194 @@
 }
 
-void UIHostNetworkDetailsDialog::sltStatusChangedServer(int iChecked)
+void UIHostNetworkDetailsWidget::sltStatusChangedServer(int iChecked)
 {
     m_newData.m_dhcpserver.m_fEnabled = (bool)iChecked;
@@ -202 +202 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedAddress(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedAddress(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strAddress = strText;
@@ -209 +209 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedMask(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedMask(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strMask = strText;
@@ -216 +216 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedLowerAddress(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedLowerAddress(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strLowerAddress = strText;
@@ -223 +223 @@
 }
 
-void UIHostNetworkDetailsDialog::sltTextChangedUpperAddress(const QString &strText)
+void UIHostNetworkDetailsWidget::sltTextChangedUpperAddress(const QString &strText)
 {
     m_newData.m_dhcpserver.m_strUpperAddress = strText;
@@ -230 +230 @@
 }
 
-void UIHostNetworkDetailsDialog::sltHandleButtonBoxClick(QAbstractButton *pButton)
+void UIHostNetworkDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
     /* Disable buttons first of all: */
@@ -260 +260 @@
 }
 
-void UIHostNetworkDetailsDialog::prepare()
+void UIHostNetworkDetailsWidget::prepare()
 {
     /* Prepare this: */
@@ -272 +272 @@
 }
 
-void UIHostNetworkDetailsDialog::prepareThis()
+void UIHostNetworkDetailsWidget::prepareThis()
 {
     /* Create layout: */
@@ -285 +285 @@
 }
 
-void UIHostNetworkDetailsDialog::prepareTabWidget()
+void UIHostNetworkDetailsWidget::prepareTabWidget()
 {
     /* Create tab-widget: */
@@ -300 +300 @@
 }
 
-void UIHostNetworkDetailsDialog::prepareTabInterface()
+void UIHostNetworkDetailsWidget::prepareTabInterface()
 {
     /* Create 'Interface' tab: */
@@ -332 +332 @@
                     /* Configure radio-button: */
                     connect(m_pButtonAutomatic, &QRadioButton::toggled,
-                            this, &UIHostNetworkDetailsDialog::sltToggledButtonAutomatic);
+                            this, &UIHostNetworkDetailsWidget::sltToggledButtonAutomatic);
                     /* Add into layout: */
                     pLayoutAutomatic->addWidget(m_pButtonAutomatic);
@@ -367 +367 @@
                     /* Configure radio-button: */
                     connect(m_pButtonManual, &QRadioButton::toggled,
-                            this, &UIHostNetworkDetailsDialog::sltToggledButtonManual);
+                            this, &UIHostNetworkDetailsWidget::sltToggledButtonManual);
                     /* Add into layout: */
                     pLayoutManual->addWidget(m_pButtonManual);
@@ -412 +412 @@
                     m_pLabelIPv4->setBuddy(m_pEditorIPv4);
                     connect(m_pEditorIPv4, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedIPv4);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedIPv4);
                     /* Add into layout: */
                     pLayoutIPv4->addWidget(m_pEditorIPv4);
@@ -453 +453 @@
                     m_pLabelNMv4->setBuddy(m_pEditorNMv4);
                     connect(m_pEditorNMv4, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedNMv4);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedNMv4);
                     /* Add into layout: */
                     pLayoutNMv4->addWidget(m_pEditorNMv4);
@@ -494 +494 @@
                     m_pLabelIPv6->setBuddy(m_pEditorIPv6);
                     connect(m_pEditorIPv6, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedIPv6);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedIPv6);
                     /* Add into layout: */
                     pLayoutIPv6->addWidget(m_pEditorIPv6);
@@ -535 +535 @@
                     m_pLabelNMv6->setBuddy(m_pEditorNMv6);
                     connect(m_pEditorNMv6, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedNMv6);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedNMv6);
                     /* Add into layout: */
                     pLayoutNMv6->addWidget(m_pEditorNMv6);
@@ -582 +582 @@
                 /* Configure button-box: */
                 m_pButtonBoxInterface->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                connect(m_pButtonBoxInterface, &QIDialogButtonBox::clicked, this, &UIHostNetworkDetailsDialog::sltHandleButtonBoxClick);
+                connect(m_pButtonBoxInterface, &QIDialogButtonBox::clicked, this, &UIHostNetworkDetailsWidget::sltHandleButtonBoxClick);
 
                 /* Add into layout: */
@@ -593 +593 @@
 }
 
-void UIHostNetworkDetailsDialog::prepareTabDHCPServer()
+void UIHostNetworkDetailsWidget::prepareTabDHCPServer()
 {
     /* Create 'DHCP server' tab: */
@@ -618 +618 @@
                 /* Configure check-box: */
                 connect(m_pCheckBoxDHCP, &QCheckBox::stateChanged,
-                        this, &UIHostNetworkDetailsDialog::sltStatusChangedServer);
+                        this, &UIHostNetworkDetailsWidget::sltStatusChangedServer);
                 /* Add into layout: */
                 pLayoutDHCPServer->addWidget(m_pCheckBoxDHCP, 0, 0, 1, 2);
@@ -648 +648 @@
                     m_pLabelDHCPAddress->setBuddy(m_pEditorDHCPAddress);
                     connect(m_pEditorDHCPAddress, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedAddress);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedAddress);
                     /* Add into layout: */
                     pLayoutDHCPAddress->addWidget(m_pEditorDHCPAddress);
@@ -689 +689 @@
                     m_pLabelDHCPMask->setBuddy(m_pEditorDHCPMask);
                     connect(m_pEditorDHCPMask, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedMask);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedMask);
                     /* Add into layout: */
                     pLayoutDHCPMask->addWidget(m_pEditorDHCPMask);
@@ -730 +730 @@
                     m_pLabelDHCPLowerAddress->setBuddy(m_pEditorDHCPLowerAddress);
                     connect(m_pEditorDHCPLowerAddress, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedLowerAddress);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedLowerAddress);
                     /* Add into layout: */
                     pLayoutDHCPLowerAddress->addWidget(m_pEditorDHCPLowerAddress);
@@ -771 +771 @@
                     m_pLabelDHCPUpperAddress->setBuddy(m_pEditorDHCPUpperAddress);
                     connect(m_pEditorDHCPUpperAddress, &QLineEdit::textChanged,
-                            this, &UIHostNetworkDetailsDialog::sltTextChangedUpperAddress);
+                            this, &UIHostNetworkDetailsWidget::sltTextChangedUpperAddress);
                     /* Add into layout: */
                     pLayoutDHCPUpperAddress->addWidget(m_pEditorDHCPUpperAddress);
@@ -818 +818 @@
                 /* Configure button-box: */
                 m_pButtonBoxServer->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                connect(m_pButtonBoxServer, &QIDialogButtonBox::clicked, this, &UIHostNetworkDetailsDialog::sltHandleButtonBoxClick);
+                connect(m_pButtonBoxServer, &QIDialogButtonBox::clicked, this, &UIHostNetworkDetailsWidget::sltHandleButtonBoxClick);
 
                 /* Add into layout: */
@@ -829 +829 @@
 }
 
-void UIHostNetworkDetailsDialog::loadDataForInterface()
+void UIHostNetworkDetailsWidget::loadDataForInterface()
 {
     /* Toggle IPv4 & IPv6 interface fields availability: */
@@ -856 +856 @@
 }
 
-void UIHostNetworkDetailsDialog::loadDataForDHCPServer()
+void UIHostNetworkDetailsWidget::loadDataForDHCPServer()
 {
     /* Toggle DHCP server fields availability: */
@@ -897 +897 @@
 }
 
-void UIHostNetworkDetailsDialog::revalidate(QWidget *pWidget /* = 0 */)
+void UIHostNetworkDetailsWidget::revalidate(QWidget *pWidget /* = 0 */)
 {
     /* Validate 'Interface' tab content: */
@@ -982 +982 @@
 }
 
-void UIHostNetworkDetailsDialog::retranslateValidation(QWidget *pWidget /* = 0 */)
+void UIHostNetworkDetailsWidget::retranslateValidation(QWidget *pWidget /* = 0 */)
 {
     /* Translate 'Interface' tab content: */
@@ -1016 +1016 @@
 }
 
-void UIHostNetworkDetailsDialog::updateButtonStates()
+void UIHostNetworkDetailsWidget::updateButtonStates()
 {
 //    if (m_oldData != m_newData)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIHostNetworkDetailsDialog class declaration.
+ * VBox Qt GUI - UIHostNetworkDetailsWidget class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef ___UIHostNetworkDetailsDialog_h___
-#define ___UIHostNetworkDetailsDialog_h___
+#ifndef ___UIHostNetworkDetailsWidget_h___
+#define ___UIHostNetworkDetailsWidget_h___
 
 /* Qt includes: */
@@ -159 +159 @@
 
 /** Host Network Manager: Host network details widget. */
-class UIHostNetworkDetailsDialog : public QIWithRetranslateUI2<QWidget>
+class UIHostNetworkDetailsWidget : public QIWithRetranslateUI2<QWidget>
 {
     Q_OBJECT;
@@ -176 +176 @@
 
     /** Constructs host network details dialog for the passed @a pParent and @a data. */
-    UIHostNetworkDetailsDialog(EmbedTo enmEmbedding, QWidget *pParent = 0);
+    UIHostNetworkDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
 
     /** Returns the host network data. */
@@ -351 +351 @@
 };
 
-#endif /* !___UIHostNetworkDetailsDialog_h___ */
-
+#endif /* !___UIHostNetworkDetailsWidget_h___ */
+

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

@@ -29 +29 @@
 # include "QITreeWidget.h"
 # include "UIIconPool.h"
-# include "UIHostNetworkDetailsDialog.h"
+# include "UIHostNetworkDetailsWidget.h"
 # include "UIHostNetworkManager.h"
 # include "UIHostNetworkUtils.h"
@@ -858 +858 @@
 {
     /* Create details-widget: */
-    m_pDetailsWidget = new UIHostNetworkDetailsDialog(m_enmEmbedding);
+    m_pDetailsWidget = new UIHostNetworkDetailsWidget(m_enmEmbedding);
     AssertPtrReturnVoid(m_pDetailsWidget);
     {
@@ -864 +864 @@
         m_pDetailsWidget->setVisible(false);
         m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-        connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChanged,
+        connect(m_pDetailsWidget, &UIHostNetworkDetailsWidget::sigDataChanged,
                 this, &UIHostNetworkManagerWidget::sigHostNetworkDetailsDataChanged);
-        connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChangeRejected,
+        connect(m_pDetailsWidget, &UIHostNetworkDetailsWidget::sigDataChangeRejected,
                 this, &UIHostNetworkManagerWidget::sltResetHostNetworkDetailsChanges);
-        connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChangeAccepted,
+        connect(m_pDetailsWidget, &UIHostNetworkDetailsWidget::sigDataChangeAccepted,
                 this, &UIHostNetworkManagerWidget::sltApplyHostNetworkDetailsChanges);
 

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

@@ -32 +32 @@
 class QIDialogButtonBox;
 class QITreeWidget;
-class UIHostNetworkDetailsDialog;
+class UIHostNetworkDetailsWidget;
 class UIItemHostNetwork;
 class UIToolBar;
@@ -175 +175 @@
         QITreeWidget *m_pTreeWidget;
         /** Holds the details-widget instance. */
-        UIHostNetworkDetailsDialog *m_pDetailsWidget;
+        UIHostNetworkDetailsWidget *m_pDetailsWidget;
     /** @} */
 };