Changeset 80213 in vbox for trunk/src

Timestamp:

Aug 9, 2019 1:12:48 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: VM settings / Network page: Move more of network page related stuff to UINetworkAttachmentEditor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/machine/UIMachineSettingsNetwork.cpp (modified) (6 diffs)
• settings/machine/UIMachineSettingsNetwork.h (modified) (1 diff)
• widgets/UINetworkAttachmentEditor.cpp (modified) (2 diffs)
• widgets/UINetworkAttachmentEditor.h (modified) (1 diff)

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

@@ -28 +28 @@
 
 /* COM includes: */
+#include "CNATEngine.h"
 #include "CNetworkAdapter.h"
-#include "CHostNetworkInterface.h"
-#include "CNATNetwork.h"
-
-/* COM includes: */
-#include "CNATEngine.h"
 
 /* Other VBox includes: */
@@ -1058 +1054 @@
 void UIMachineSettingsNetworkPage::refreshBridgedAdapterList()
 {
-    /* Reload bridged interface list: */
-    m_bridgedAdapterList.clear();
-    const CHostNetworkInterfaceVector &ifaces = uiCommon().host().GetNetworkInterfaces();
-    for (int i = 0; i < ifaces.size(); ++i)
-    {
-        const CHostNetworkInterface &iface = ifaces[i];
-        if (iface.GetInterfaceType() == KHostNetworkInterfaceType_Bridged && !m_bridgedAdapterList.contains(iface.GetName()))
-            m_bridgedAdapterList << iface.GetName();
-    }
+    /* Reload bridged adapters: */
+    m_bridgedAdapterList = UINetworkAttachmentEditor::bridgedAdapters();
 }
 
@@ -1075 +1064 @@
     /* Get internal network names from other VMs: */
     if (fFullRefresh)
-        m_internalNetworkList << otherInternalNetworkList();
+        m_internalNetworkList << UINetworkAttachmentEditor::internalNetworks();
     /* Append internal network list with names from all the tabs: */
     for (int iTab = 0; iTab < m_pTabWidget->count(); ++iTab)
@@ -1091 +1080 @@
 void UIMachineSettingsNetworkPage::refreshHostInterfaceList()
 {
-    /* Reload host-only interface list: */
-    m_hostInterfaceList.clear();
-    const CHostNetworkInterfaceVector &ifaces = uiCommon().host().GetNetworkInterfaces();
-    for (int i = 0; i < ifaces.size(); ++i)
-    {
-        const CHostNetworkInterface &iface = ifaces[i];
-        if (iface.GetInterfaceType() == KHostNetworkInterfaceType_HostOnly && !m_hostInterfaceList.contains(iface.GetName()))
-            m_hostInterfaceList << iface.GetName();
-    }
+    /* Reload host interfaces: */
+    m_bridgedAdapterList = UINetworkAttachmentEditor::hostInterfaces();
 }
 
@@ -1108 +1090 @@
     /* Get generic driver names from other VMs: */
     if (fFullRefresh)
-        m_genericDriverList << otherGenericDriverList();
+        m_genericDriverList << UINetworkAttachmentEditor::genericDrivers();
     /* Append generic driver list with names from all the tabs: */
     for (int iTab = 0; iTab < m_pTabWidget->count(); ++iTab)
@@ -1124 +1106 @@
 void UIMachineSettingsNetworkPage::refreshNATNetworkList()
 {
-    /* Reload NAT network list: */
-    m_natNetworkList.clear();
-    const CNATNetworkVector &nws = uiCommon().virtualBox().GetNATNetworks();
-    for (int i = 0; i < nws.size(); ++i)
-    {
-        const CNATNetwork &nw = nws[i];
-        m_natNetworkList << nw.GetNetworkName();
-    }
-}
-
-/* static */
-QStringList UIMachineSettingsNetworkPage::otherInternalNetworkList()
-{
-    /* Load total internal network list of all VMs: */
-    const CVirtualBox vbox = uiCommon().virtualBox();
-    const QStringList otherInternalNetworks(QList<QString>::fromVector(vbox.GetInternalNetworks()));
-    return otherInternalNetworks;
-}
-
-/* static */
-QStringList UIMachineSettingsNetworkPage::otherGenericDriverList()
-{
-    /* Load total generic driver list of all VMs: */
-    const CVirtualBox vbox = uiCommon().virtualBox();
-    const QStringList otherGenericDrivers(QList<QString>::fromVector(vbox.GetGenericNetworkDrivers()));
-    return otherGenericDrivers;
+    /* Reload nat networks: */
+    m_natNetworkList = UINetworkAttachmentEditor::natNetworks();
 }
 

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

@@ -112 +112 @@
     void refreshNATNetworkList();
 
-    /** Populates a list of known internal networks. */
-    static QStringList otherInternalNetworkList();
-    /** Populates a list of known generic drivers. */
-    static QStringList otherGenericDriverList();
     /** Loads generic properties from passed @a adapter. */
     static QString loadGenericProperties(const CNetworkAdapter &adapter);

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

@@ -23 +23 @@
 /* GUI includes: */
 #include "QIComboBox.h"
+#include "UICommon.h"
 #include "UIConverter.h"
 #include "UIExtraDataManager.h"
 #include "UINetworkAttachmentEditor.h"
+
+/* COM includes: */
+#include "CHostNetworkInterface.h"
+#include "CNATNetwork.h"
 
 
@@ -106 +111 @@
 {
     return m_name.value(enmType);
+}
+
+/* static */
+QStringList UINetworkAttachmentEditor::bridgedAdapters()
+{
+    QStringList bridgedAdapterList;
+    foreach (const CHostNetworkInterface &comInterface, uiCommon().host().GetNetworkInterfaces())
+    {
+        if (   comInterface.GetInterfaceType() == KHostNetworkInterfaceType_Bridged
+            && !bridgedAdapterList.contains(comInterface.GetName()))
+            bridgedAdapterList << comInterface.GetName();
+    }
+    return bridgedAdapterList;
+}
+
+/* static */
+QStringList UINetworkAttachmentEditor::internalNetworks()
+{
+    return QList<QString>::fromVector(uiCommon().virtualBox().GetInternalNetworks());
+}
+
+/* static */
+QStringList UINetworkAttachmentEditor::hostInterfaces()
+{
+    QStringList hostInterfaceList;
+    foreach (const CHostNetworkInterface &comInterface, uiCommon().host().GetNetworkInterfaces())
+    {
+        if (   comInterface.GetInterfaceType() == KHostNetworkInterfaceType_HostOnly
+            && !hostInterfaceList.contains(comInterface.GetName()))
+            hostInterfaceList << comInterface.GetName();
+    }
+    return hostInterfaceList;
+}
+
+/* static */
+QStringList UINetworkAttachmentEditor::genericDrivers()
+{
+    return QList<QString>::fromVector(uiCommon().virtualBox().GetGenericNetworkDrivers());
+}
+
+/* static */
+QStringList UINetworkAttachmentEditor::natNetworks()
+{
+    QStringList natNetworkList;
+    foreach (const CNATNetwork &comNetwork, uiCommon().virtualBox().GetNATNetworks())
+        natNetworkList << comNetwork.GetNetworkName();
+    return natNetworkList;
 }
 

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

@@ -75 +75 @@
     QString valueName(KNetworkAttachmentType enmType) const;
 
+    /** Returns bridged adapter list. */
+    static QStringList bridgedAdapters();
+    /** Returns internal network list. */
+    static QStringList internalNetworks();
+    /** Returns host-only interface list. */
+    static QStringList hostInterfaces();
+    /** Returns generic driver list. */
+    static QStringList genericDrivers();
+    /** Returns NAT network list. */
+    static QStringList natNetworks();
+
 protected: