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

Timestamp:

Aug 5, 2019 6:21:53 PM (6 years ago)

Author:

vboxsync

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

132580

Message:

FE/Qt: bugref:7720: VirtualBox Manager: Details pane: Possibility to edit VM USB controller type on-the-fly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (3 diffs)
• globals/UIMachineAttributeSetter.cpp (modified) (2 diffs)
• globals/UIMachineAttributeSetter.h (modified) (1 diff)
• manager/details/UIDetailsElement.cpp (modified) (4 diffs)

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

@@ -726 +726 @@
     if (!comFilterObject.isNull() && comMachine.GetUSBProxyAvailable())
     {
+        const QString strAnchorType = QString("usb_controller_type");
         const CUSBControllerVector controllers = comMachine.GetUSBControllers();
         if (!controllers.isEmpty())
@@ -732 +733 @@
             if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeUsb_Controller)
             {
+                QStringList controllerInternal;
                 QStringList controllersReadable;
                 foreach (const CUSBController &comController, controllers)
-                    controllersReadable << gpConverter->toString(comController.GetType());
+                {
+                    const KUSBControllerType enmType = comController.GetType();
+                    controllerInternal << QString::number((int)enmType);
+                    controllersReadable << gpConverter->toString(enmType);
+                }
                 table << UITextTableLine(QApplication::translate("UIDetails", "USB Controller", "details (usb)"),
-                                         controllersReadable.join(", "));
+                                         QString("<a href=#%1,%2>%3</a>")
+                                             .arg(strAnchorType)
+                                             .arg(controllerInternal.join(';'))
+                                             .arg(controllersReadable.join(", ")));
             }
 
@@ -752 +761 @@
         }
         else
-            table << UITextTableLine(QApplication::translate("UIDetails", "Disabled", "details (usb)"), QString());
+            table << UITextTableLine(QString("<a href=#%1,%2>%3</a>")
+                                         .arg(strAnchorType)
+                                         .arg(QString::number((int)KUSBControllerType_Null))
+                                         .arg(QApplication::translate("UIDetails", "Disabled", "details (usb)")),
+                                     QString());
     }
     else

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

@@ -27 +27 @@
 /* COM includes: */
 #include "CAudioAdapter.h"
-
+#include "CUSBController.h"
+
+
+void removeUSBControllers(CMachine &comMachine, const UIUSBControllerTypeSet &controllerSet = UIUSBControllerTypeSet())
+{
+    /* Get controllers for further activities: */
+    const CUSBControllerVector &controllers = comMachine.GetUSBControllers();
+    if (!comMachine.isOk())
+        return;
+
+    /* For each controller: */
+    foreach (const CUSBController &comController, controllers)
+    {
+        /* Get controller type&name for further activities: */
+        const KUSBControllerType enmType = comController.GetType();
+        const QString strName = comController.GetName();
+
+        /* Pass only if requested types were not defined or contains the one we found: */
+        if (!controllerSet.isEmpty() && !controllerSet.contains(enmType))
+            continue;
+
+        /* Remove controller: */
+        comMachine.RemoveUSBController(strName);
+        if (!comMachine.isOk())
+            break;
+    }
+}
+
+void createUSBControllers(CMachine &comMachine, const UIUSBControllerTypeSet &controllerSet)
+{
+    /* For each requested USB controller type: */
+    foreach (const KUSBControllerType &enmType, controllerSet)
+    {
+        switch (enmType)
+        {
+            case KUSBControllerType_OHCI: comMachine.AddUSBController("OHCI", KUSBControllerType_OHCI); break;
+            case KUSBControllerType_EHCI: comMachine.AddUSBController("EHCI", KUSBControllerType_EHCI); break;
+            case KUSBControllerType_XHCI: comMachine.AddUSBController("xHCI", KUSBControllerType_XHCI); break;
+            default: break;
+        }
+    }
+}
 
 void UIMachineAttributeSetter::setMachineAttribute(const CMachine &comConstMachine,
@@ -174 +215 @@
                 break;
             }
+            case MachineAttribute_USBControllerType:
+            {
+                /* Remove all existing controller first of all: */
+                removeUSBControllers(comMachine);
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                    fErrorHappened = true;
+                    break;
+                }
+                /* Add new controllers afterwards: */
+                const UIUSBControllerTypeSet controllerSet = guiAttribute.value<UIUSBControllerTypeSet>();
+                if (!controllerSet.contains(KUSBControllerType_Null))
+                {
+                    createUSBControllers(comMachine, controllerSet);
+                    if (!comMachine.isOk())
+                    {
+                        msgCenter().cannotChangeMachineAttribute(comMachine);
+                        fErrorHappened = true;
+                    }
+                }
+                break;
+            }
             default:
                 break;

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

@@ -39 +39 @@
     MachineAttribute_AudioHostDriverType,
     MachineAttribute_AudioControllerType,
+    MachineAttribute_USBControllerType,
 };
+
+/** A set of USB controller types. */
+typedef QSet<KUSBControllerType> UIUSBControllerTypeSet;
+Q_DECLARE_METATYPE(UIUSBControllerTypeSet);
 
 /** Namespace used to assign CMachine attributes on more convenient basis. */

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

@@ -62 +62 @@
     AnchorRole_AudioHostDriverType,
     AnchorRole_AudioControllerType,
+    AnchorRole_USBControllerType,
 #ifndef VBOX_WS_MAC
     AnchorRole_MenuBar,
@@ -178 +179 @@
     m_pTextPane->setAnchorRoleRestricted("#audio_host_driver_type", cal != ConfigurationAccessLevel_Full);
     m_pTextPane->setAnchorRoleRestricted("#audio_controller_type", cal != ConfigurationAccessLevel_Full);
+    m_pTextPane->setAnchorRoleRestricted("#usb_controller_type", cal != ConfigurationAccessLevel_Full);
 #ifndef VBOX_WS_MAC
     m_pTextPane->setAnchorRoleRestricted("#menu_bar", cal == ConfigurationAccessLevel_Null);
@@ -473 +475 @@
     roles["#audio_host_driver_type"] = AnchorRole_AudioHostDriverType;
     roles["#audio_controller_type"] = AnchorRole_AudioControllerType;
+    roles["#usb_controller_type"] = AnchorRole_USBControllerType;
 #ifndef VBOX_WS_MAC
     roles["#menu_bar"] = AnchorRole_MenuBar;
@@ -758 +761 @@
             break;
         }
+        case AnchorRole_USBControllerType:
+        {
+            /* Parse controller type list: */
+            UIUSBControllerTypeSet controllerSet;
+            const QStringList controllerInternals = strData.section(',', 0, 0).split(';');
+            foreach (const QString &strControllerType, controllerInternals)
+            {
+                /* Parse each internal controller description: */
+                bool fParsed = false;
+                KUSBControllerType enmType = static_cast<KUSBControllerType>(strControllerType.toInt(&fParsed));
+                if (!fParsed)
+                    enmType = KUSBControllerType_Null;
+                controllerSet << enmType;
+            }
+
+            /* Prepare existing controller sets: */
+            QMap<int, UIUSBControllerTypeSet> controllerSets;
+            controllerSets[0] = UIUSBControllerTypeSet();
+            controllerSets[1] = UIUSBControllerTypeSet() << KUSBControllerType_OHCI;
+            controllerSets[2] = UIUSBControllerTypeSet() << KUSBControllerType_OHCI << KUSBControllerType_EHCI;
+            controllerSets[3] = UIUSBControllerTypeSet() << KUSBControllerType_XHCI;
+
+            /* Fill menu with actions: */
+            UIMenu menu;
+            QActionGroup group(&menu);
+            QMap<int, QAction*> actions;
+            actions[0] = menu.addAction(QApplication::translate("UIDetails", "Disabled", "details (usb)"));
+            group.addAction(actions.value(0));
+            actions.value(0)->setCheckable(true);
+            actions[1] = menu.addAction(QApplication::translate("UIDetails", "USB 1.1 (OHCI) Controller", "details (usb)"));
+            group.addAction(actions.value(1));
+            actions.value(1)->setCheckable(true);
+            actions[2] = menu.addAction(QApplication::translate("UIDetails", "USB 2.0 (OHCI + EHCI) Controller", "details (usb)"));
+            group.addAction(actions.value(2));
+            actions.value(2)->setCheckable(true);
+            actions[3] = menu.addAction(QApplication::translate("UIDetails", "USB 3.0 (xHCI) Controller", "details (usb)"));
+            group.addAction(actions.value(3));
+            actions.value(3)->setCheckable(true);
+
+            /* Mark current one: */
+            for (int i = 0; i <= 3; ++i)
+                actions.value(i)->setChecked(controllerSets.key(controllerSet) == i);
+
+            /* Execute menu, look for result: */
+            QAction *pTriggeredAction = menu.exec(QCursor::pos());
+            if (pTriggeredAction)
+            {
+                const int iTriggeredIndex = actions.key(pTriggeredAction);
+                if (controllerSets.key(controllerSet) != iTriggeredIndex)
+                    setMachineAttribute(machine(), MachineAttribute_USBControllerType, QVariant::fromValue(controllerSets.value(iTriggeredIndex)));
+            }
+            break;
+        }
 #ifndef VBOX_WS_MAC
         case AnchorRole_MenuBar: