Changeset 82563 in vbox

Timestamp:

Dec 12, 2019 8:36:15 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9611: UINetworkAttachmentEditor: Get rid of hardcoded network attachment types, instead acquire these types through CSystemProperties interface.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINetworkAttachmentEditor.cpp

@@ -29 +29 @@
 
 /* COM includes: */
+#ifdef VBOX_WITH_CLOUD_NET
+# include "CCloudNetwork.h"
+#endif
 #include "CHostNetworkInterface.h"
 #include "CNATNetwork.h"
-#ifdef VBOX_WITH_CLOUD_NET
-#include "CCloudNetwork.h"
-#endif /* VBOX_WITH_CLOUD_NET */
+#include "CSystemProperties.h"
 
 
@@ -43 +44 @@
     , m_fWithLabels(fWithLabels)
     , m_enmRestrictedNetworkAttachmentTypes(UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Invalid)
+    , m_enmType(KNetworkAttachmentType_Max)
     , m_pLabelType(0)
     , m_pComboType(0)
@@ -66 +68 @@
     if (!m_pComboType)
         return;
-
-    /* Search for an item with required data value, choose item to be current if found: */
-    const int iIndex = m_pComboType->findData(QVariant::fromValue(enmType));
-    if (iIndex != -1)
-        m_pComboType->setCurrentIndex(iIndex);
+    /* Make sure type is changed: */
+    if (m_enmType == enmType)
+        return;
+
+    /* Remember requested type: */
+    m_enmType = enmType;
+    /* Repopulate finally, supported values might change: */
+    populateTypeCombo();
 }
 
 KNetworkAttachmentType UINetworkAttachmentEditor::valueType() const
 {
-    /* Make sure combo is there: */
-    if (!m_pComboType)
-        return KNetworkAttachmentType_Null;
-
-    /* Return current item data: */
-    return m_pComboType->currentData().value<KNetworkAttachmentType>();
+    return m_pComboType ? m_pComboType->currentData().value<KNetworkAttachmentType>() : m_enmType;
 }
 
@@ -190 +190 @@
         {
             const KNetworkAttachmentType enmType = m_pComboType->itemData(i).value<KNetworkAttachmentType>();
-            m_pComboType->setItemText(i, gpConverter->toString(enmType));
+            const QString strName = gpConverter->toString(enmType);
+            m_pComboType->setItemData(i, strName, Qt::ToolTipRole);
+            m_pComboType->setItemText(i, strName);
         }
     }
@@ -338 +340 @@
     m_pComboType->blockSignals(true);
 
-    /* Remember currently selected type index: */
-    int iCurrentAttachment = m_pComboType->currentIndex();
-
     /* Clear the type combo-box: */
     m_pComboType->clear();
 
-    /* Populate attachments: */
+    /* Load currently supported network attachment types (system-properties getter): */
+    CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+    QVector<KNetworkAttachmentType> supportedTypes = comProperties.GetSupportedNetworkAttachmentTypes();
+    /* Take currently requested type into account if it's sane: */
+    if (!supportedTypes.contains(m_enmType) && m_enmType != KNetworkAttachmentType_Max)
+        supportedTypes.prepend(m_enmType);
+
+    /* Populate attachment types: */
     int iAttachmentTypeIndex = 0;
-    // WORKAROUND:
-    // We want some hardcoded order, so prepare a list of enum values.
-    QList<KNetworkAttachmentType> attachmentTypes  = QList<KNetworkAttachmentType>() << KNetworkAttachmentType_Null
-                                                  << KNetworkAttachmentType_NAT << KNetworkAttachmentType_NATNetwork
-                                                  << KNetworkAttachmentType_Bridged << KNetworkAttachmentType_Internal
-                                                  << KNetworkAttachmentType_HostOnly << KNetworkAttachmentType_Generic;
-#ifdef VBOX_WITH_CLOUD_NET
-    attachmentTypes.append(KNetworkAttachmentType_Cloud);
-#endif /* VBOX_WITH_CLOUD_NET */
-    for (int i = 0; i < attachmentTypes.size(); ++i)
-    {
-        const KNetworkAttachmentType enmType = attachmentTypes.at(i);
+    foreach (const KNetworkAttachmentType &enmType, supportedTypes)
+    {
+        /* Filter currently restricted network attachment types (extra-data getter): */
         if (m_enmRestrictedNetworkAttachmentTypes & toUiNetworkAdapterEnum(enmType))
             continue;
@@ -366 +363 @@
     }
 
-    /* Restore previously selected type index: */
-    m_pComboType->setCurrentIndex(iCurrentAttachment == -1 ? 0 : iCurrentAttachment);
+    /* Restore previously selected type if possible: */
+    const int iIndex = m_pComboType->findData(m_enmType);
+    m_pComboType->setCurrentIndex(iIndex != -1 ? iIndex : 0);
 
     /* Handle combo item change: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINetworkAttachmentEditor.h

@@ -134 +134 @@
     QMap<KNetworkAttachmentType, QString>      m_name;
 
+    /** Holds the requested type. */
+    KNetworkAttachmentType  m_enmType;
+
     /** Holds the type label instance. */
     QLabel     *m_pLabelType;