Changeset 94623 in vbox

Timestamp:

Apr 18, 2022 12:00:35 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: Network page accessibility improvements (part 6); Renaming UIMachineNetworkFeaturesEditor to UINetworkFeaturesEditor; Small cleanup as well.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UINetworkFeaturesEditor.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineNetworkFeaturesEditor.cpp ) (23 diffs)
• src/settings/editors/UINetworkFeaturesEditor.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineNetworkFeaturesEditor.h ) (6 diffs)
• src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (15 diffs)

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

@@ -911 +911 @@
         src/settings/editors/UIMachineDisplayScreenFeaturesEditor.h \
         src/settings/editors/UIMachineDescriptionEditor.h \
-        src/settings/editors/UIMachineNetworkFeaturesEditor.h \
+        src/settings/editors/UINetworkFeaturesEditor.h \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.h \
         src/settings/editors/UIMiniToolbarSettingsEditor.h \
@@ -1478 +1478 @@
         src/settings/editors/UIMachineDisplayScreenFeaturesEditor.cpp \
         src/settings/editors/UIMachineDescriptionEditor.cpp \
-        src/settings/editors/UIMachineNetworkFeaturesEditor.cpp \
+        src/settings/editors/UINetworkFeaturesEditor.cpp \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp \
         src/settings/editors/UIMiniToolbarSettingsEditor.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIMachineNetworkFeaturesEditor class implementation.
+ * VBox Qt GUI - UINetworkFeaturesEditor class implementation.
  */
 
@@ -32 +32 @@
 #include "UIConverter.h"
 #include "UIIconPool.h"
-#include "UIMachineNetworkFeaturesEditor.h"
+#include "UINetworkFeaturesEditor.h"
 
 /* COM includes: */
@@ -38 +38 @@
 
 
-UIMachineNetworkFeaturesEditor::UIMachineNetworkFeaturesEditor(QWidget *pParent /* = 0 */)
+UINetworkFeaturesEditor::UINetworkFeaturesEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fAdvancedButtonExpanded(false)
@@ -62 +62 @@
 }
 
-void UIMachineNetworkFeaturesEditor::setAdvancedButtonExpanded(bool fExpanded)
+void UINetworkFeaturesEditor::setAdvancedButtonExpanded(bool fExpanded)
 {
     if (m_fAdvancedButtonExpanded != fExpanded)
@@ -75 +75 @@
 }
 
-bool UIMachineNetworkFeaturesEditor::advancedButtonExpanded() const
+bool UINetworkFeaturesEditor::advancedButtonExpanded() const
 {
     return m_pButtonAdvanced ? m_pButtonAdvanced->isExpanded() : m_fAdvancedButtonExpanded;
 }
 
-void UIMachineNetworkFeaturesEditor::setAdapterType(const KNetworkAdapterType &enmType)
+void UINetworkFeaturesEditor::setAdapterType(const KNetworkAdapterType &enmType)
 {
     if (m_enmAdapterType != enmType)
@@ -89 +89 @@
 }
 
-KNetworkAdapterType UIMachineNetworkFeaturesEditor::adapterType() const
+KNetworkAdapterType UINetworkFeaturesEditor::adapterType() const
 {
     return m_pComboAdapterType ? m_pComboAdapterType->currentData().value<KNetworkAdapterType>() : m_enmAdapterType;
 }
 
-void UIMachineNetworkFeaturesEditor::setPromiscuousMode(const KNetworkAdapterPromiscModePolicy &enmMode)
+void UINetworkFeaturesEditor::setPromiscuousMode(const KNetworkAdapterPromiscModePolicy &enmMode)
 {
     if (m_enmPromiscuousMode != enmMode)
@@ -103 +103 @@
 }
 
-KNetworkAdapterPromiscModePolicy UIMachineNetworkFeaturesEditor::promiscuousMode() const
+KNetworkAdapterPromiscModePolicy UINetworkFeaturesEditor::promiscuousMode() const
 {
     return m_pComboPromiscuousMode ? m_pComboPromiscuousMode->currentData().value<KNetworkAdapterPromiscModePolicy>() : m_enmPromiscuousMode;
 }
 
-void UIMachineNetworkFeaturesEditor::setMACAddress(const QString &strAddress)
+void UINetworkFeaturesEditor::setMACAddress(const QString &strAddress)
 {
     if (m_strMACAddress != strAddress)
@@ -118 +118 @@
 }
 
-QString UIMachineNetworkFeaturesEditor::macAddress() const
+QString UINetworkFeaturesEditor::macAddress() const
 {
     return m_pEditorMAC ? m_pEditorMAC->text() : m_strMACAddress;
 }
 
-void UIMachineNetworkFeaturesEditor::setGenericProperties(const QString &strProperties)
+void UINetworkFeaturesEditor::setGenericProperties(const QString &strProperties)
 {
     if (m_strGenericProperties != strProperties)
@@ -133 +133 @@
 }
 
-QString UIMachineNetworkFeaturesEditor::genericProperties() const
+QString UINetworkFeaturesEditor::genericProperties() const
 {
     return m_pEditorGenericProperties ? m_pEditorGenericProperties->toPlainText() : m_strGenericProperties;
 }
 
-void UIMachineNetworkFeaturesEditor::setCableConnected(bool fConnected)
+void UINetworkFeaturesEditor::setCableConnected(bool fConnected)
 {
     if (m_fCableConnected != fConnected)
@@ -148 +148 @@
 }
 
-bool UIMachineNetworkFeaturesEditor::cableConnected() const
+bool UINetworkFeaturesEditor::cableConnected() const
 {
     return m_pCheckBoxCableConnected ? m_pCheckBoxCableConnected->isChecked() : m_fCableConnected;
 }
 
-void UIMachineNetworkFeaturesEditor::setPortForwardingRules(const UIPortForwardingDataList &rules)
+void UINetworkFeaturesEditor::setPortForwardingRules(const UIPortForwardingDataList &rules)
 {
     if (m_portForwardingRules != rules)
@@ -159 +159 @@
 }
 
-UIPortForwardingDataList UIMachineNetworkFeaturesEditor::portForwardingRules() const
+UIPortForwardingDataList UINetworkFeaturesEditor::portForwardingRules() const
 {
     return m_portForwardingRules;
 }
 
-void UIMachineNetworkFeaturesEditor::setAdvancedOptionsAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setAdvancedOptionsAvailable(bool fAvailable)
 {
     m_pButtonAdvanced->setEnabled(fAvailable);
 }
 
-void UIMachineNetworkFeaturesEditor::setAdapterOptionsAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setAdapterOptionsAvailable(bool fAvailable)
 {
     m_pLabelAdapterType->setEnabled(fAvailable);
@@ -175 +175 @@
 }
 
-void UIMachineNetworkFeaturesEditor::setPromiscuousOptionsAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setPromiscuousOptionsAvailable(bool fAvailable)
 {
     m_pLabelPromiscuousMode->setEnabled(fAvailable);
@@ -181 +181 @@
 }
 
-void UIMachineNetworkFeaturesEditor::setMACOptionsAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setMACOptionsAvailable(bool fAvailable)
 {
     m_pLabelMAC->setEnabled(fAvailable);
@@ -188 +188 @@
 }
 
-void UIMachineNetworkFeaturesEditor::setGenericPropertiesAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setGenericPropertiesAvailable(bool fAvailable)
 {
     m_pLabelGenericProperties->setVisible(fAvailable);
@@ -194 +194 @@
 }
 
-void UIMachineNetworkFeaturesEditor::setCableOptionsAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setCableOptionsAvailable(bool fAvailable)
 {
     m_pCheckBoxCableConnected->setEnabled(fAvailable);
 }
 
-void UIMachineNetworkFeaturesEditor::setForwardingOptionsAvailable(bool fAvailable)
+void UINetworkFeaturesEditor::setForwardingOptionsAvailable(bool fAvailable)
 {
     m_pButtonPortForwarding->setEnabled(fAvailable);
 }
 
-int UIMachineNetworkFeaturesEditor::minimumLabelHorizontalHint() const
+int UINetworkFeaturesEditor::minimumLabelHorizontalHint() const
 {
     int iMinimumLabelHorizontalHint = 0;
@@ -218 +218 @@
 }
 
-void UIMachineNetworkFeaturesEditor::setMinimumLayoutIndent(int iIndent)
+void UINetworkFeaturesEditor::setMinimumLayoutIndent(int iIndent)
 {
     if (m_pLayoutSettings)
@@ -224 +224 @@
 }
 
-void UIMachineNetworkFeaturesEditor::generateMac()
+void UINetworkFeaturesEditor::generateMac()
 {
     setMACAddress(uiCommon().host().GenerateMACAddress());
 }
 
-void UIMachineNetworkFeaturesEditor::retranslateUi()
+void UINetworkFeaturesEditor::retranslateUi()
 {
     if (m_pButtonAdvanced)
@@ -291 +291 @@
 }
 
-void UIMachineNetworkFeaturesEditor::sltHandleAdvancedButtonStateChange()
+void UINetworkFeaturesEditor::sltHandleAdvancedButtonStateChange()
 {
     /* What's the state? */
@@ -301 +301 @@
 }
 
-void UIMachineNetworkFeaturesEditor::sltOpenPortForwardingDlg()
+void UINetworkFeaturesEditor::sltOpenPortForwardingDlg()
 {
     UIMachineSettingsPortForwardingDlg dlg(this, m_portForwardingRules);
@@ -308 +308 @@
 }
 
-void UIMachineNetworkFeaturesEditor::prepare()
+void UINetworkFeaturesEditor::prepare()
 {
     /* Prepare main layout: */
@@ -429 +429 @@
     if (m_pButtonAdvanced)
         connect(m_pButtonAdvanced, &QIArrowButtonSwitch::sigClicked,
-                this, &UIMachineNetworkFeaturesEditor::sltHandleAdvancedButtonStateChange);
+                this, &UINetworkFeaturesEditor::sltHandleAdvancedButtonStateChange);
     if (m_pEditorMAC)
         connect(m_pEditorMAC, &QILineEdit::textChanged,
-                this, &UIMachineNetworkFeaturesEditor::sigMACAddressChanged);
+                this, &UINetworkFeaturesEditor::sigMACAddressChanged);
     if (m_pButtonMAC)
         connect(m_pButtonMAC, &QIToolButton::clicked,
-                this, &UIMachineNetworkFeaturesEditor::generateMac);
+                this, &UINetworkFeaturesEditor::generateMac);
     if (m_pButtonPortForwarding)
         connect(m_pButtonPortForwarding, &QPushButton::clicked,
-                this, &UIMachineNetworkFeaturesEditor::sltOpenPortForwardingDlg);
+                this, &UINetworkFeaturesEditor::sltOpenPortForwardingDlg);
 
     /* Update widget availability: */
@@ -447 +447 @@
 }
 
-void UIMachineNetworkFeaturesEditor::repopulateAdapterTypeCombo()
+void UINetworkFeaturesEditor::repopulateAdapterTypeCombo()
 {
     if (m_pComboAdapterType)
@@ -477 +477 @@
 }
 
-void UIMachineNetworkFeaturesEditor::repopulatePromiscuousModeCombo()
+void UINetworkFeaturesEditor::repopulatePromiscuousModeCombo()
 {
     if (m_pComboPromiscuousMode)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkFeaturesEditor.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIMachineNetworkFeaturesEditor class declaration.
+ * VBox Qt GUI - UINetworkFeaturesEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIMachineNetworkFeaturesEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIMachineNetworkFeaturesEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UINetworkFeaturesEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UINetworkFeaturesEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -39 +39 @@
 class QIToolButton;
 
-/** QWidget subclass used as machine description editor. */
-class SHARED_LIBRARY_STUFF UIMachineNetworkFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as a network features editor. */
+class SHARED_LIBRARY_STUFF UINetworkFeaturesEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -54 +54 @@
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UIMachineNetworkFeaturesEditor(QWidget *pParent = 0);
+    UINetworkFeaturesEditor(QWidget *pParent = 0);
 
     /** Defines whether advanced button @a fExpanded. */
@@ -138 +138 @@
     void repopulatePromiscuousModeCombo();
 
-    /** @name Widgets
+    /** @name Values
      * @{ */
         /** Holds whether advanced button expanded. */
@@ -189 +189 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIMachineNetworkFeaturesEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UINetworkFeaturesEditor_h */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -26 +26 @@
 #include "UICommon.h"
 #include "UIErrorString.h"
-#include "UIMachineNetworkFeaturesEditor.h"
 #include "UIMachineSettingsNetwork.h"
 #include "UINetworkAttachmentEditor.h"
+#include "UINetworkFeaturesEditor.h"
 #include "UITranslator.h"
 
@@ -225 +225 @@
      * @{ */
         /** Holds the adapter check-box instance. */
-        QCheckBox                      *m_pCheckBoxAdapter;
+        QCheckBox                 *m_pCheckBoxAdapter;
         /** Holds the adapter settings widget instance. */
-        QWidget                        *m_pWidgetAdapterSettings;
-        /** Holds the attachment type editor instance. */
-        UINetworkAttachmentEditor      *m_pEditorAttachmentType;
+        QWidget                   *m_pWidgetAdapterSettings;
+        /** Holds the network attachment editor instance. */
+        UINetworkAttachmentEditor *m_pEditorNetworkAttachment;
         /** Holds the network features editor instance. */
-        UIMachineNetworkFeaturesEditor *m_pEditorNetworkFeatures;
+        UINetworkFeaturesEditor   *m_pEditorNetworkFeatures;
     /** @} */
 };
@@ -246 +246 @@
     , m_pCheckBoxAdapter(0)
     , m_pWidgetAdapterSettings(0)
-    , m_pEditorAttachmentType(0)
+    , m_pEditorNetworkAttachment(0)
     , m_pEditorNetworkFeatures(0)
 {
@@ -266 +266 @@
 
     /* Load attachment type: */
-    m_pEditorAttachmentType->setValueType(oldAdapterData.m_attachmentType);
+    m_pEditorNetworkAttachment->setValueType(oldAdapterData.m_attachmentType);
     /* Load alternative names: */
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_Bridged, wipedOutString(oldAdapterData.m_strBridgedAdapterName));
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_Internal, wipedOutString(oldAdapterData.m_strInternalNetworkName));
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_HostOnly, wipedOutString(oldAdapterData.m_strHostInterfaceName));
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_Generic, wipedOutString(oldAdapterData.m_strGenericDriverName));
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_NATNetwork, wipedOutString(oldAdapterData.m_strNATNetworkName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_Bridged, wipedOutString(oldAdapterData.m_strBridgedAdapterName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_Internal, wipedOutString(oldAdapterData.m_strInternalNetworkName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_HostOnly, wipedOutString(oldAdapterData.m_strHostInterfaceName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_Generic, wipedOutString(oldAdapterData.m_strGenericDriverName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_NATNetwork, wipedOutString(oldAdapterData.m_strNATNetworkName));
 #ifdef VBOX_WITH_CLOUD_NET
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_Cloud, wipedOutString(oldAdapterData.m_strCloudNetworkName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_Cloud, wipedOutString(oldAdapterData.m_strCloudNetworkName));
 #endif
 #ifdef VBOX_WITH_VMNET
-    m_pEditorAttachmentType->setValueName(KNetworkAttachmentType_HostOnlyNetwork, wipedOutString(oldAdapterData.m_strHostOnlyNetworkName));
+    m_pEditorNetworkAttachment->setValueName(KNetworkAttachmentType_HostOnlyNetwork, wipedOutString(oldAdapterData.m_strHostOnlyNetworkName));
 #endif
     /* Handle attachment type change: */
@@ -321 +321 @@
             break;
         case KNetworkAttachmentType_Internal:
-            newAdapterData.m_strInternalNetworkName = m_pEditorAttachmentType->valueName(KNetworkAttachmentType_Internal);
+            newAdapterData.m_strInternalNetworkName = m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_Internal);
             break;
         case KNetworkAttachmentType_HostOnly:
-            newAdapterData.m_strHostInterfaceName = m_pEditorAttachmentType->valueName(KNetworkAttachmentType_HostOnly);
+            newAdapterData.m_strHostInterfaceName = m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_HostOnly);
             break;
         case KNetworkAttachmentType_Generic:
-            newAdapterData.m_strGenericDriverName = m_pEditorAttachmentType->valueName(KNetworkAttachmentType_Generic);
+            newAdapterData.m_strGenericDriverName = m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_Generic);
             break;
         case KNetworkAttachmentType_NATNetwork:
-            newAdapterData.m_strNATNetworkName = m_pEditorAttachmentType->valueName(KNetworkAttachmentType_NATNetwork);
+            newAdapterData.m_strNATNetworkName = m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_NATNetwork);
             break;
 #ifdef VBOX_WITH_CLOUD_NET
         case KNetworkAttachmentType_Cloud:
-            newAdapterData.m_strCloudNetworkName = m_pEditorAttachmentType->valueName(KNetworkAttachmentType_Cloud);
+            newAdapterData.m_strCloudNetworkName = m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_Cloud);
             break;
 #endif /* VBOX_WITH_CLOUD_NET */
 #ifdef VBOX_WITH_VMNET
         case KNetworkAttachmentType_HostOnlyNetwork:
-            newAdapterData.m_strHostOnlyNetworkName = m_pEditorAttachmentType->valueName(KNetworkAttachmentType_HostOnlyNetwork);
+            newAdapterData.m_strHostOnlyNetworkName = m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_HostOnlyNetwork);
             break;
 #endif /* VBOX_WITH_VMNET */
@@ -487 +487 @@
 {
     setTabOrder(pWidget, m_pCheckBoxAdapter);
-    setTabOrder(m_pCheckBoxAdapter, m_pEditorAttachmentType);
-    setTabOrder(m_pEditorAttachmentType, m_pEditorNetworkFeatures);
+    setTabOrder(m_pCheckBoxAdapter, m_pEditorNetworkAttachment);
+    setTabOrder(m_pEditorNetworkAttachment, m_pEditorNetworkFeatures);
     return m_pEditorNetworkFeatures;
 }
@@ -499 +499 @@
 KNetworkAttachmentType UIMachineSettingsNetwork::attachmentType() const
 {
-    return m_pEditorAttachmentType->valueType();
+    return m_pEditorNetworkAttachment->valueType();
 }
 
@@ -506 +506 @@
     if (enmType == KNetworkAttachmentType_Null)
         enmType = attachmentType();
-    return m_pEditorAttachmentType->valueName(enmType);
+    return m_pEditorNetworkAttachment->valueName(enmType);
 }
 
@@ -513 +513 @@
     /* Basic attributes: */
     m_pCheckBoxAdapter->setEnabled(m_pParent->isMachineOffline());
-    m_pEditorAttachmentType->setEnabled(m_pParent->isMachineInValidMode());
+    m_pEditorNetworkAttachment->setEnabled(m_pParent->isMachineInValidMode());
 
     /* Advanced attributes: */
@@ -529 +529 @@
 void UIMachineSettingsNetwork::reloadAlternatives()
 {
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_Bridged, m_pParent->bridgedAdapterList());
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_Internal, m_pParent->internalNetworkList());
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_HostOnly, m_pParent->hostInterfaceList());
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_Generic, m_pParent->genericDriverList());
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_NATNetwork, m_pParent->natNetworkList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_Bridged, m_pParent->bridgedAdapterList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_Internal, m_pParent->internalNetworkList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_HostOnly, m_pParent->hostInterfaceList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_Generic, m_pParent->genericDriverList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_NATNetwork, m_pParent->natNetworkList());
 #ifdef VBOX_WITH_CLOUD_NET
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_Cloud, m_pParent->cloudNetworkList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_Cloud, m_pParent->cloudNetworkList());
 #endif
 #ifdef VBOX_WITH_VMNET
-    m_pEditorAttachmentType->setValueNames(KNetworkAttachmentType_HostOnlyNetwork, m_pParent->hostOnlyNetworkList());
+    m_pEditorNetworkAttachment->setValueNames(KNetworkAttachmentType_HostOnlyNetwork, m_pParent->hostOnlyNetworkList());
 #endif
 }
@@ -562 +562 @@
     /* These editors have own labels, but we want them to be properly layouted according to each other: */
     int iMinimumLayoutHint = 0;
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAttachmentType->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkAttachment->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkFeatures->minimumLabelHorizontalHint());
-    m_pEditorAttachmentType->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorNetworkAttachment->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorNetworkFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
@@ -603 +603 @@
         case KNetworkAttachmentType_Internal:
         {
-            if (!m_pEditorAttachmentType->valueName(KNetworkAttachmentType_Internal).isNull())
+            if (!m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_Internal).isNull())
                 emit sigTabUpdated();
             break;
@@ -609 +609 @@
         case KNetworkAttachmentType_Generic:
         {
-            if (!m_pEditorAttachmentType->valueName(KNetworkAttachmentType_Generic).isNull())
+            if (!m_pEditorNetworkAttachment->valueName(KNetworkAttachmentType_Generic).isNull())
                 emit sigTabUpdated();
             break;
@@ -658 +658 @@
 
                 /* Prepare attachment type editor: */
-                m_pEditorAttachmentType = new UINetworkAttachmentEditor(m_pWidgetAdapterSettings);
-                if (m_pEditorAttachmentType)
-                    pLayoutAdapterSettings->addWidget(m_pEditorAttachmentType);
+                m_pEditorNetworkAttachment = new UINetworkAttachmentEditor(m_pWidgetAdapterSettings);
+                if (m_pEditorNetworkAttachment)
+                    pLayoutAdapterSettings->addWidget(m_pEditorNetworkAttachment);
 
                 /* Prepare advanced settingseditor: */
-                m_pEditorNetworkFeatures = new UIMachineNetworkFeaturesEditor(m_pWidgetAdapterSettings);
+                m_pEditorNetworkFeatures = new UINetworkFeaturesEditor(m_pWidgetAdapterSettings);
                 if (m_pEditorNetworkFeatures)
                     pLayoutAdapterSettings->addWidget(m_pEditorNetworkFeatures);
@@ -679 +679 @@
     connect(m_pCheckBoxAdapter, &QCheckBox::toggled,
             this, &UIMachineSettingsNetwork::sltHandleAdapterActivityChange);
-    connect(m_pEditorAttachmentType, &UINetworkAttachmentEditor::sigValueTypeChanged,
+    connect(m_pEditorNetworkAttachment, &UINetworkAttachmentEditor::sigValueTypeChanged,
             this, &UIMachineSettingsNetwork::sltHandleAttachmentTypeChange);
-    connect(m_pEditorAttachmentType, &UINetworkAttachmentEditor::sigValueNameChanged,
+    connect(m_pEditorNetworkAttachment, &UINetworkAttachmentEditor::sigValueNameChanged,
             this, &UIMachineSettingsNetwork::sltHandleAlternativeNameChange);
-    connect(m_pEditorNetworkFeatures, &UIMachineNetworkFeaturesEditor::sigNotifyAdvancedButtonStateChange,
+    connect(m_pEditorNetworkFeatures, &UINetworkFeaturesEditor::sigNotifyAdvancedButtonStateChange,
             this, &UIMachineSettingsNetwork::sigNotifyAdvancedButtonStateChange);
-    connect(m_pEditorNetworkFeatures, &UIMachineNetworkFeaturesEditor::sigMACAddressChanged,
+    connect(m_pEditorNetworkFeatures, &UINetworkFeaturesEditor::sigMACAddressChanged,
             m_pParent, &UIMachineSettingsNetworkPage::revalidate);
     connect(this, &UIMachineSettingsNetwork::sigTabUpdated,