Changeset 49333 in vbox

Timestamp:

Oct 30, 2013 1:42:57 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7037: Runtime UI: Extending *Devices* menu with *Webcams* menu.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• images/web_camera_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/usb_16px.png )
• images/web_camera_disabled_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/usb_disabled_16px.png )
• src/globals/UIMessageCenter.cpp (modified) (2 diffs)
• src/globals/UIMessageCenter.h (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• src/globals/VBoxGlobal.h (modified) (2 diffs)
• src/runtime/UIActionPoolRuntime.cpp (modified) (2 diffs)
• src/runtime/UIActionPoolRuntime.h (modified) (1 diff)
• src/runtime/UIMachineLogic.cpp (modified) (6 diffs)
• src/runtime/UIMachineLogic.h (modified) (1 diff)
• src/runtime/UIMachineMenuBar.cpp (modified) (1 diff)
• src/runtime/UISession.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -217 +217 @@
         <file alias="vrdp_warning_16px.png">images/vrdp_warning_16px.png</file>
         <file alias="reset_warnings_16px.png">images/reset_warnings_16px.png</file>
+        <file alias="web_camera_16px.png">images/web_camera_16px.png</file>
+        <file alias="web_camera_disabled_16px.png">images/web_camera_disabled_16px.png</file>
     </qresource>
 </RCC>

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

@@ -64 +64 @@
 #include "CHostNetworkInterface.h"
 #include "CVRDEServer.h"
+#include "CEmulatedUSB.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # include "CGuest.h"
@@ -1932 +1933 @@
              .arg(strDevice, strMachineName),
           formatErrorInfo(errorInfo));
+}
+
+void UIMessageCenter::cannotAttachWebCam(const CEmulatedUSB &dispatcher, const QString &strWebCamName, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
+          tr("Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.")
+             .arg(strWebCamName, strMachineName),
+          formatErrorInfo(dispatcher));
+}
+
+void UIMessageCenter::cannotDetachWebCam(const CEmulatedUSB &dispatcher, const QString &strWebCamName, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
+          tr("Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.")
+             .arg(strWebCamName, strMachineName),
+          formatErrorInfo(dispatcher));
 }
 

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

@@ -295 +295 @@
     void cannotDetachUSBDevice(const CConsole &console, const QString &strDevice) const;
     void cannotDetachUSBDevice(const CVirtualBoxErrorInfo &errorInfo, const QString &strDevice, const QString &strMachineName) const;
+    void cannotAttachWebCam(const CEmulatedUSB &dispatcher, const QString &strWebCamName, const QString &strMachineName) const;
+    void cannotDetachWebCam(const CEmulatedUSB &dispatcher, const QString &strWebCamName, const QString &strMachineName) const;
     void cannotToggleVRDEServer(const CVRDEServer &server, const QString &strMachineName, bool fEnable);
     void cannotToggleVideoCapture(const CMachine &machine, bool fEnable);

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

@@ -108 +108 @@
 #include "CUSBController.h"
 #include "CHostUSBDevice.h"
+#include "CHostVideoInputDevice.h"
 #include "CMediumFormat.h"
 #include "CSharedFolder.h"
@@ -1077 +1078 @@
 
     return tip;
+}
+
+/** Returns the multi-line description of the given CHostVideoInputDevice filter. */
+QString VBoxGlobal::toolTip(const CHostVideoInputDevice &webcam) const
+{
+    QStringList records;
+
+    QString strAlias = webcam.GetAlias();
+    if (!strAlias.isEmpty())
+        records << tr("<nobr>Alias: %1</nobr>", "webcam tooltip").arg(strAlias);
+
+    QString strName = webcam.GetName();
+    if (!strName.isEmpty())
+        records << tr("<nobr>Name: %1</nobr>", "webcam tooltip").arg(strName);
+
+    QString strPath = webcam.GetPath();
+    if (!strPath.isEmpty())
+        records << tr("<nobr>Path: %1</nobr>", "webcam tooltip").arg(strPath);
+
+    return records.join("<br>");
 }
 

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

@@ -50 +50 @@
 class CMedium;
 class CUSBDevice;
+class CHostVideoInputDevice;
 class QSpinBox;
 class UIMediumEnumerator;
@@ -232 +233 @@
     QString toolTip (const CUSBDevice &aDevice) const;
     QString toolTip (const CUSBDeviceFilter &aFilter) const;
+    QString toolTip(const CHostVideoInputDevice &webcam) const;
 
     QString detailsReport (const CMachine &aMachine, bool aWithLinks);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -727 +727 @@
     {
         setName(QApplication::translate("UIActionPool", "&USB Devices"));
+    }
+};
+
+class UIActionMenuWebCams : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionMenuWebCams(UIActionPool *pParent)
+        : UIActionMenu(pParent, ":/web_camera_16px.png", ":/web_camera_disabled_16px.png")
+    {
+        qobject_cast<UIMenu*>(menu())->setShowToolTips(true);
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Webcams"));
     }
 };
@@ -1277 +1298 @@
         delete m_pool[UIActionIndexRuntime_Menu_USBDevices];
     m_pool[UIActionIndexRuntime_Menu_USBDevices] = new UIActionMenuUSBDevices(this);
+    if (m_pool[UIActionIndexRuntime_Menu_WebCams])
+        delete m_pool[UIActionIndexRuntime_Menu_WebCams];
+    m_pool[UIActionIndexRuntime_Menu_WebCams] = new UIActionMenuWebCams(this);
     if (m_pool[UIActionIndexRuntime_Menu_SharedClipboard])
         delete m_pool[UIActionIndexRuntime_Menu_SharedClipboard];

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

@@ -58 +58 @@
     UIActionIndexRuntime_Menu_FloppyDevices,
     UIActionIndexRuntime_Menu_USBDevices,
+    UIActionIndexRuntime_Menu_WebCams,
     UIActionIndexRuntime_Menu_SharedClipboard,
     UIActionIndexRuntime_Menu_DragAndDrop,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -72 +72 @@
 #include "CVRDEServer.h"
 #include "CSystemProperties.h"
+#include "CHostVideoInputDevice.h"
+#include "CEmulatedUSB.h"
 #ifdef Q_WS_MAC
 # include "CGuest.h"
@@ -130 +132 @@
 };
 Q_DECLARE_METATYPE(USBTarget);
+
+/** Describes enumerated webcam item. */
+struct WebCamTarget
+{
+    WebCamTarget() : attach(false), name(QString()), path(QString()) {}
+    WebCamTarget(bool fAttach, const QString &strName, const QString &strPath)
+        : attach(fAttach), name(strName), path(strPath) {}
+    bool attach;
+    QString name;
+    QString path;
+};
+Q_DECLARE_METATYPE(WebCamTarget);
 
 /* static */
@@ -786 +800 @@
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices));
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices));
+    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_WebCams));
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard));
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop));
@@ -847 +862 @@
     connect(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->menu(), SIGNAL(aboutToShow()),
             this, SLOT(sltPrepareUSBMenu()));
+    connect(gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->menu(), SIGNAL(aboutToShow()),
+            this, SLOT(sltPrepareWebCamMenu()));
     connect(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu(), SIGNAL(aboutToShow()),
             this, SLOT(sltPrepareSharedClipboardMenu()));
@@ -1834 +1851 @@
 }
 
+/**
+ * Prepares menu content when user hovers <b>Webcam</b> submenu of the <b>Devices</b> menu.
+ * @note If host currently have no webcams attached there will be just one dummy action
+ *       called <i>No Webcams Connected</i>. Otherwise there will be actions corresponding
+ *       to existing webcams allowing user to attach/detach them within the guest.
+ * @note In order to enumerate webcams GUI assigns #WebCamTarget object as internal data
+ *       for each the enumerated webcam menu action. Corresponding #sltAttachWebCamDevice
+ *       slot will be called on action triggering. It will parse assigned #WebCamTarget data.
+ */
+void UIMachineLogic::sltPrepareWebCamMenu()
+{
+    /* Get and check the sender menu object: */
+    QMenu *pMenu = qobject_cast<QMenu*>(sender());
+    QMenu *pWebCamMenu = gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->menu();
+    AssertReturnVoid(pMenu == pWebCamMenu); Q_UNUSED(pWebCamMenu);
+
+    /* Clear menu initially: */
+    pMenu->clear();
+
+    /* Get current host: */
+    const CHost &host = vboxGlobal().host();
+
+    /* Get host webcams list: */
+    const CHostVideoInputDeviceVector &webcams = host.GetVideoInputDevices();
+
+    /* If webcam list is empty: */
+    if (webcams.isEmpty())
+    {
+        /* Add only one - "empty" action: */
+        QAction *pEmptyMenuAction = new QAction(pMenu);
+        pEmptyMenuAction->setEnabled(false);
+        pEmptyMenuAction->setText(tr("No Webcams Connected"));
+        pEmptyMenuAction->setToolTip(tr("No supported devices connected to the host PC"));
+        pEmptyMenuAction->setIcon(UIIconPool::iconSet(":/vm_delete_16px.png", ":/vm_delete_disabled_16px.png")); // TODO: Change icon!
+        pMenu->addAction(pEmptyMenuAction);
+    }
+    /* If webcam list is NOT empty: */
+    else
+    {
+        /* Populate menu with host webcams: */
+        const QVector<QString> &attachedWebcamPaths = session().GetConsole().GetEmulatedUSB().GetWebcams();
+        foreach (const CHostVideoInputDevice &webcam, webcams)
+        {
+            /* Get webcam data: */
+            const QString &strWebcamName = webcam.GetName();
+            const QString &strWebcamPath = webcam.GetPath();
+
+            /* Create/configure webcam action: */
+            QAction *pAttachWebcamAction = new QAction(strWebcamName, pMenu);
+            pAttachWebcamAction->setToolTip(vboxGlobal().toolTip(webcam));
+            pAttachWebcamAction->setCheckable(true);
+            pAttachWebcamAction->setChecked(attachedWebcamPaths.contains(strWebcamPath));
+            pAttachWebcamAction->setData(QVariant::fromValue(WebCamTarget(!pAttachWebcamAction->isChecked(), strWebcamName, strWebcamPath)));
+            connect(pAttachWebcamAction, SIGNAL(triggered(bool)), this, SLOT(sltAttachWebCamDevice()));
+            pMenu->addAction(pAttachWebcamAction);
+        }
+    }
+}
+
 void UIMachineLogic::sltAttachUSBDevice()
 {
@@ -1877 +1953 @@
             msgCenter().cannotDetachUSBDevice(console, vboxGlobal().details(device));
         }
+    }
+}
+
+/**
+ * Attaches/detaches webcam within the guest.
+ * @note In order to attach/detach webcams #sltPrepareWebCamMenu assigns #WebCamTarget object
+ *       as internal data for each the enumerated webcam menu action. Corresponding data
+ *       will be parsed here resulting in device attaching/detaching.
+ */
+void UIMachineLogic::sltAttachWebCamDevice()
+{
+    /* Get and check sender action object: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertReturnVoid(pAction);
+
+    /* Get operation target: */
+    WebCamTarget target = pAction->data().value<WebCamTarget>();
+
+    /* Get current emulated USB: */
+    const CConsole &console = session().GetConsole();
+    CEmulatedUSB dispatcher = console.GetEmulatedUSB();
+
+    /* Attach webcam device: */
+    if (target.attach)
+    {
+        /* Try to attach corresponding device: */
+        dispatcher.WebcamAttach(target.path, "");
+        /* Check if dispatcher is OK: */
+        if (!dispatcher.isOk())
+            msgCenter().cannotAttachWebCam(dispatcher, target.name, console.GetMachine().GetName());
+    }
+    /* Detach webcam device: */
+    else
+    {
+        /* Try to detach corresponding device: */
+        dispatcher.WebcamDetach(target.path);
+        /* Check if dispatcher is OK: */
+        if (!dispatcher.isOk())
+            msgCenter().cannotDetachWebCam(dispatcher, target.name, console.GetMachine().GetName());
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -204 +204 @@
     void sltMountRecentStorageMedium();
     void sltPrepareUSBMenu();
+    void sltPrepareWebCamMenu();
     void sltAttachUSBDevice();
+    void sltAttachWebCamDevice();
     void sltPrepareSharedClipboardMenu();
     void sltChangeSharedClipboardType(QAction *pAction);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -256 +256 @@
     pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->menu());
     pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->menu());
+    pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->menu());
     pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu());
     pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->menu());

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -76 +76 @@
 #include "CUSBController.h"
 #include "CUSBDeviceFilters.h"
+#include "CHostVideoInputDevice.h"
 #include "CSnapshot.h"
 #include "CMedium.h"
@@ -1410 +1411 @@
 void UISession::reinitMenuPool()
 {
+    /* Get host: */
+    const CHost &host = vboxGlobal().host();
+
     /* Get uisession machine: */
     const CMachine &machine = session().GetConsole().GetMachine();
@@ -1448 +1452 @@
             }
         }
+
         /* Show/Hide Network Adapters action depending on overall adapters activity status: */
         gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setVisible(fAtLeastOneAdapterActive);
@@ -1454 +1459 @@
     /* USB stuff: */
     {
-        /*
-         * Check whether there is at least one OHCI USB controllers with
-         * an available proxy.
-         */
+        /* Check whether there is at least one OHCI USB controllers with an available proxy. */
         const CUSBDeviceFilters &filters = machine.GetUSBDeviceFilters();
         ULONG cOhciCtls = machine.GetUSBControllerCountByType(KUSBControllerType_OHCI);
@@ -1464 +1466 @@
         /* Show/Hide USB menu depending on controller availability, activity and USB-proxy presence: */
         gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->setVisible(fUSBEnabled);
+    }
+
+    /* WebCams stuff: */
+    {
+        /* Check whether there is an accessible video input devices pool: */
+        const CHostVideoInputDeviceVector &webcams = host.GetVideoInputDevices();
+        bool fWebCamsEnabled = host.isOk(); Q_UNUSED(webcams);
+
+        /* Show/Hide WebCams menu depending on ExtPack availability: */
+        gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->setVisible(fWebCamsEnabled);
     }
 }