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

Timestamp:

Oct 27, 2023 4:17:24 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Machine settings / Network page: Adjust attachment type editor for Basic experience mode to have only NAT and Bridged types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors

Files:

• UINetworkAttachmentEditor.cpp (modified) (2 diffs)
• UINetworkAttachmentEditor.h (modified) (1 diff)

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

@@ -198 +198 @@
 #endif /* VBOX_WITH_VMNET */
 
+void UINetworkAttachmentEditor::filterOut(bool fExpertMode, const QString &strFilter)
+{
+    /* Call to base-class: */
+    UIEditor::filterOut(fExpertMode, strFilter);
+
+    /* Repopulate type combo to make
+     * sure excessive types removed: */
+    populateTypeCombo();
+}
+
 void UINetworkAttachmentEditor::retranslateUi()
 {
@@ -358 +368 @@
     CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
     QVector<KNetworkAttachmentType> supportedTypes = comProperties.GetSupportedNetworkAttachmentTypes();
+    /* Filter out types unrelated to current experience mode: */
+    if (!m_fInExpertMode)
+    {
+        /* Keep only allowed types but in the same order they came from CSystemProperties: */
+        const QVector<KNetworkAttachmentType> allowedTypes =  QVector<KNetworkAttachmentType>()
+                                                           << KNetworkAttachmentType_NAT
+                                                           << KNetworkAttachmentType_Bridged;
+        QVector<KNetworkAttachmentType> resultingTypes;
+        foreach (KNetworkAttachmentType enmType, supportedTypes)
+            if (allowedTypes.contains(enmType))
+                resultingTypes << enmType;
+        supportedTypes = resultingTypes;
+    }
     /* Take currently requested type into account if it's different from initial one: */
     if (!supportedTypes.contains(m_enmType) && m_enmType != KNetworkAttachmentType_Max)

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

@@ -102 +102 @@
 protected:
 
+    /** Filters out contents.
+      * @param  fExpertMode  Brings whether settings expert mode is requested.
+      * @param  strFilter    Brings the filter description should correspond to. */
+    virtual void filterOut(bool fExpertMode, const QString &strFilter) RT_OVERRIDE;
+
     /** Handles translation event. */
     virtual void retranslateUi() RT_OVERRIDE;