Changeset 80215 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 9, 2019 5:08:08 PM (6 years ago)

Author:

vboxsync

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

132660

Message:

FE/Qt: bugref:7720: VirtualBox Manager: Details pane: Possibility to edit VM network attachment type / interface name on-the-fly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (8 diffs)
• globals/UIMachineAttributeSetter.cpp (modified) (2 diffs)
• globals/UIMachineAttributeSetter.h (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/details/UIDetailsElement.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -563 +563 @@
     for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
     {
+        const QString strAnchorType = QString("network_attachment_type");
         const CNetworkAdapter comAdapter = comMachine.GetNetworkAdapter(uSlot);
 
@@ -570 +571 @@
 
         /* Gather adapter information: */
-        const KNetworkAttachmentType enmType = comAdapter.GetAttachmentType();
-        const QString strAttachmentTemplate = gpConverter->toString(comAdapter.GetAdapterType()).replace(QRegExp("\\s\\(.+\\)"), " (%1)");
+        const KNetworkAttachmentType enmAttachmentType = comAdapter.GetAttachmentType();
+        const QString strAttachmentTemplate = gpConverter->toString(comAdapter.GetAdapterType()).replace(QRegExp("\\s\\(.+\\)"), " (<a href=#%1,%2;%3;%4>%5</a>)");
         QString strAttachmentType;
-        switch (enmType)
+        switch (enmAttachmentType)
         {
             case KNetworkAttachmentType_NAT:
             {
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_NAT)
-                    strAttachmentType = strAttachmentTemplate.arg(gpConverter->toString(enmType));
+                    strAttachmentType = strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_NAT)
+                                            .arg(QString())
+                                            .arg(gpConverter->toString(KNetworkAttachmentType_NAT));
                 break;
             }
@@ -584 +590 @@
             {
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_BridgetAdapter)
-                    strAttachmentType = strAttachmentTemplate.arg(QApplication::translate("UIDetails", "Bridged Adapter, %1", "details (network)")
-                                                                  .arg(comAdapter.GetBridgedInterface()));
+                {
+                    const QString strName = comAdapter.GetBridgedInterface();
+                    strAttachmentType = strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_Bridged)
+                                            .arg(strName)
+                                            .arg(QApplication::translate("UIDetails", "Bridged Adapter, %1", "details (network)")
+                                                 .arg(strName));
+                }
                 break;
             }
@@ -591 +605 @@
             {
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_InternalNetwork)
-                    strAttachmentType = strAttachmentTemplate.arg(QApplication::translate("UIDetails", "Internal Network, '%1'", "details (network)")
-                                                                  .arg(comAdapter.GetInternalNetwork()));
+                {
+                    const QString strName = comAdapter.GetInternalNetwork();
+                    strAttachmentType = strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_Internal)
+                                            .arg(strName)
+                                            .arg(QApplication::translate("UIDetails", "Internal Network, '%1'", "details (network)")
+                                                 .arg(strName));
+                }
                 break;
             }
@@ -598 +620 @@
             {
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_HostOnlyAdapter)
-                    strAttachmentType = strAttachmentTemplate.arg(QApplication::translate("UIDetails", "Host-only Adapter, '%1'", "details (network)")
-                                                                  .arg(comAdapter.GetHostOnlyInterface()));
+                {
+                    const QString strName = comAdapter.GetHostOnlyInterface();
+                    strAttachmentType = strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_HostOnly)
+                                            .arg(strName)
+                                            .arg(QApplication::translate("UIDetails", "Host-only Adapter, '%1'", "details (network)")
+                                                 .arg(strName));
+                }
                 break;
             }
@@ -606 +636 @@
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_GenericDriver)
                 {
+                    const QString strName = comAdapter.GetGenericDriver();
                     const QString strGenericDriverProperties(summarizeGenericProperties(comAdapter));
-                    strAttachmentType = strGenericDriverProperties.isNull() ?
-                        strAttachmentTemplate.arg(QApplication::translate("UIDetails", "Generic Driver, '%1'", "details (network)")
-                                                  .arg(comAdapter.GetGenericDriver())) :
-                        strAttachmentTemplate.arg(QApplication::translate("UIDetails", "Generic Driver, '%1' { %2 }", "details (network)")
-                                                  .arg(comAdapter.GetGenericDriver(), strGenericDriverProperties));
+                    strAttachmentType = strGenericDriverProperties.isNull()
+                                      ? strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_Generic)
+                                            .arg(strName)
+                                            .arg(QApplication::translate("UIDetails", "Generic Driver, '%1'", "details (network)")
+                                                 .arg(strName))
+                                      : strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_Generic)
+                                            .arg(strName)
+                                            .arg(QApplication::translate("UIDetails", "Generic Driver, '%1' { %2 }", "details (network)")
+                                                 .arg(strName, strGenericDriverProperties));
                 }
                 break;
@@ -618 +659 @@
             {
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_NATNetwork)
-                    strAttachmentType = strAttachmentTemplate.arg(QApplication::translate("UIDetails", "NAT Network, '%1'", "details (network)")
-                                                                  .arg(comAdapter.GetNATNetwork()));
+                {
+                    const QString strName = comAdapter.GetNATNetwork();
+                    strAttachmentType = strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)KNetworkAttachmentType_NATNetwork)
+                                            .arg(strName)
+                                            .arg(QApplication::translate("UIDetails", "NAT Network, '%1'", "details (network)")
+                                                 .arg(strName));
+                }
                 break;
             }
@@ -625 +674 @@
             {
                 if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_NotAttached)
-                    strAttachmentType = strAttachmentTemplate.arg(gpConverter->toString(enmType));
+                    strAttachmentType = strAttachmentTemplate
+                                            .arg(strAnchorType)
+                                            .arg(uSlot)
+                                            .arg((int)enmAttachmentType)
+                                            .arg(QString())
+                                            .arg(gpConverter->toString(enmAttachmentType));
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.cpp

@@ -27 +27 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
+#include "CNetworkAdapter.h"
 #include "CUSBController.h"
 
@@ -215 +216 @@
                 break;
             }
+            case MachineAttribute_NetworkAttachmentType:
+            {
+                /* Acquire value itself: */
+                const UINetworkAdapterDescriptor nad = guiAttribute.value<UINetworkAdapterDescriptor>();
+                /* Acquire network adapter: */
+                CNetworkAdapter comAdapter = comMachine.GetNetworkAdapter(nad.m_iSlot);
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotAcquireMachineParameter(comMachine);
+                    fErrorHappened = true;
+                    break;
+                }
+                /* Change network adapter attachment type: */
+                comAdapter.SetAttachmentType(nad.m_enmType);
+                if (!comAdapter.isOk())
+                {
+                    msgCenter().cannotChangeNetworkAdapterAttribute(comAdapter);
+                    fErrorHappened = true;
+                    break;
+                }
+                /* Change network adapter name: */
+                switch (nad.m_enmType)
+                {
+                    case KNetworkAttachmentType_Bridged: comAdapter.SetBridgedInterface(nad.m_strName); break;
+                    case KNetworkAttachmentType_Internal: comAdapter.SetInternalNetwork(nad.m_strName); break;
+                    case KNetworkAttachmentType_HostOnly: comAdapter.SetHostOnlyInterface(nad.m_strName); break;
+                    case KNetworkAttachmentType_Generic: comAdapter.SetGenericDriver(nad.m_strName); break;
+                    case KNetworkAttachmentType_NATNetwork: comAdapter.SetNATNetwork(nad.m_strName); break;
+                    default: break;
+                }
+                if (!comAdapter.isOk())
+                {
+                    msgCenter().cannotChangeNetworkAdapterAttribute(comAdapter);
+                    fErrorHappened = true;
+                }
+                break;
+            }
             case MachineAttribute_USBControllerType:
             {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.h

@@ -39 +39 @@
     MachineAttribute_AudioHostDriverType,
     MachineAttribute_AudioControllerType,
+    MachineAttribute_NetworkAttachmentType,
     MachineAttribute_USBControllerType,
 };
+
+/** Contains short network adapter description. */
+struct UINetworkAdapterDescriptor
+{
+    /** Composes network adapter descriptor for certain @a iSlot, @a enmType and @a strName. */
+    UINetworkAdapterDescriptor(int iSlot = -1,
+                               KNetworkAttachmentType enmType = KNetworkAttachmentType_Null,
+                               const QString &strName = QString())
+        : m_iSlot(iSlot), m_enmType(enmType), m_strName(strName)
+    {}
+
+    /** Holds the slot of described network adapter. */
+    int                     m_iSlot;
+    /** Holds the attachment type of described network adapter. */
+    KNetworkAttachmentType  m_enmType;
+    /** Holds the adapter name of described network adapter. */
+    QString                 m_strName;
+};
+Q_DECLARE_METATYPE(UINetworkAdapterDescriptor);
 
 /** A set of USB controller types. */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -63 +63 @@
 #include "CNATEngine.h"
 #include "CNATNetwork.h"
+#include "CNetworkAdapter.h"
 #include "CRangedIntegerFormValue.h"
 #include "CSerialPort.h"
@@ -1247 +1248 @@
     error(pParent, MessageType_Error,
           tr("Failed to change audio adapter attribute."),
+          UIErrorString::formatErrorInfo(comAdapter));
+}
+
+void UIMessageCenter::cannotChangeNetworkAdapterAttribute(const CNetworkAdapter &comAdapter, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to change network adapter attribute."),
           UIErrorString::formatErrorInfo(comAdapter));
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -332 +332 @@
     void cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent = 0) const;
     void cannotChangeAudioAdapterAttribute(const CAudioAdapter &comAdapter, QWidget *pParent = 0) const;
+    void cannotChangeNetworkAdapterAttribute(const CNetworkAdapter &comAdapter, QWidget *pParent = 0) const;
 
     /* API: Virtual Medium Manager warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -44 +44 @@
 #include "UIMachineAttributeSetter.h"
 #include "UINameAndSystemEditor.h"
+#include "UINetworkAttachmentEditor.h"
 #include "UIVideoMemoryEditor.h"
 #include "UIVirtualBoxManager.h"
@@ -62 +63 @@
     AnchorRole_AudioHostDriverType,
     AnchorRole_AudioControllerType,
+    AnchorRole_NetworkAttachmentType,
     AnchorRole_USBControllerType,
 #ifndef VBOX_WS_MAC
@@ -179 +181 @@
     m_pTextPane->setAnchorRoleRestricted("#audio_host_driver_type", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#audio_controller_type", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#network_attachment_type", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#usb_controller_type", cal != ConfigurationAccessLevel_Full);
 #ifndef VBOX_WS_MAC
@@ -475 +478 @@
     roles["#audio_host_driver_type"] = AnchorRole_AudioHostDriverType;
     roles["#audio_controller_type"] = AnchorRole_AudioControllerType;
+    roles["#network_attachment_type"] = AnchorRole_NetworkAttachmentType;
     roles["#usb_controller_type"] = AnchorRole_USBControllerType;
 #ifndef VBOX_WS_MAC
@@ -755 +759 @@
                 if (pPopup->exec() == QDialog::Accepted)
                     setMachineAttribute(machine(), MachineAttribute_AudioControllerType, QVariant::fromValue(pEditor->value()));
+
+                /* Delete popup: */
+                delete pPopup;
+            }
+            break;
+        }
+        case AnchorRole_NetworkAttachmentType:
+        {
+            /* Prepare popup: */
+            QPointer<QIDialogContainer> pPopup = new QIDialogContainer(0, Qt::Tool);
+            if (pPopup)
+            {
+                /* Prepare editor: */
+                UINetworkAttachmentEditor *pEditor = new UINetworkAttachmentEditor(pPopup, true /* with label */);
+                if (pEditor)
+                {
+                    pEditor->setValueNames(KNetworkAttachmentType_Bridged, UINetworkAttachmentEditor::bridgedAdapters());
+                    pEditor->setValueNames(KNetworkAttachmentType_Internal, UINetworkAttachmentEditor::internalNetworks());
+                    pEditor->setValueNames(KNetworkAttachmentType_HostOnly, UINetworkAttachmentEditor::hostInterfaces());
+                    pEditor->setValueNames(KNetworkAttachmentType_Generic, UINetworkAttachmentEditor::genericDrivers());
+                    pEditor->setValueNames(KNetworkAttachmentType_NATNetwork, UINetworkAttachmentEditor::natNetworks());
+                    pEditor->setValueType(static_cast<KNetworkAttachmentType>(strData.section(',', 0, 0).section(';', 1, 1).toInt()));
+                    pEditor->setValueName(pEditor->valueType(), strData.section(',', 0, 0).section(';', 2, 2));
+                    connect(pEditor, &UINetworkAttachmentEditor::sigValidChanged,
+                            pPopup.data(), &QIDialogContainer::setOkButtonEnabled);
+                    pPopup->setWidget(pEditor);
+                }
+
+                /* Adjust popup geometry: */
+                pPopup->move(QCursor::pos());
+                pPopup->adjustSize();
+
+                // WORKAROUND:
+                // On Windows, Tool dialogs aren't activated by default by some reason.
+                // So we have created sltActivateWindow wrapping actual activateWindow
+                // to fix that annoying issue.
+                QMetaObject::invokeMethod(pPopup, "sltActivateWindow", Qt::QueuedConnection);
+                /* Execute popup, change machine name if confirmed: */
+                if (pPopup->exec() == QDialog::Accepted)
+                {
+                    UINetworkAdapterDescriptor nad(strData.section(',', 0, 0).section(';', 0, 0).toInt(),
+                                                   pEditor->valueType(), pEditor->valueName(pEditor->valueType()));
+                    setMachineAttribute(machine(), MachineAttribute_NetworkAttachmentType, QVariant::fromValue(nad));
+                }
 
                 /* Delete popup: */