Changeset 46542 in vbox

Timestamp:

Jun 13, 2013 4:49:48 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Video Capture toggle action with configurable shortcut, integrated into Devices menu.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• images/video_capture_16px.png (added)
• images/video_capture_disabled_16px.png (added)
• src/globals/UIMainEventListener.cpp (modified) (2 diffs)
• src/globals/UIMainEventListener.h (modified) (2 diffs)
• src/runtime/UIActionPoolRuntime.cpp (modified) (2 diffs)
• src/runtime/UIActionPoolRuntime.h (modified) (1 diff)
• src/runtime/UIConsoleEventHandler.cpp (modified) (3 diffs)
• src/runtime/UIConsoleEventHandler.h (modified) (2 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (3 diffs)
• src/runtime/UIMachineLogic.h (modified) (1 diff)
• src/runtime/UIMachineMenuBar.cpp (modified) (1 diff)
• src/runtime/UISession.cpp (modified) (3 diffs)
• src/runtime/UISession.h (modified) (2 diffs)

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

@@ -247 +247 @@
         <file alias="save_state_16px.png">images/save_state_16px.png</file>
         <file alias="save_state_disabled_16px.png">images/save_state_disabled_16px.png</file>
+        <file alias="video_capture_16px.png">images/video_capture_16px.png</file>
+        <file alias="video_capture_disabled_16px.png">images/video_capture_disabled_16px.png</file>
     </qresource>
 </RCC>

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -209 +209 @@
             break;
         }
+        case KVBoxEventType_OnVideoCaptureChanged:
+        {
+            emit sigVideoCaptureChange();
+            break;
+        }
         case KVBoxEventType_OnUSBControllerChanged:
         {

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -73 +73 @@
     void sigMediumChange(CMediumAttachment attachment);
     void sigVRDEChange();
+    void sigVideoCaptureChange();
     void sigUSBControllerChange();
     void sigUSBDeviceStateChange(CUSBDevice device, bool fAttached, CVirtualBoxErrorInfo error);

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

@@ -879 +879 @@
         setName(QApplication::translate("UIActionPool", "Enable R&emote Display"));
         setStatusTip(QApplication::translate("UIActionPool", "Enable remote desktop (RDP) connections to this machine"));
+    }
+};
+
+class UIActionToggleVideoCapture : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionToggleVideoCapture(UIActionPool *pParent)
+        : UIActionToggle(pParent,
+                         ":/video_capture_16px.png", ":/video_capture_disabled_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("VideoCapture");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "Enable &Video Capture"));
+        setStatusTip(QApplication::translate("UIActionPool", "Enable video capture"));
     }
 };
@@ -1145 +1172 @@
     m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new UIActionSimpleShowSharedFoldersDialog(this);
     m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new UIActionToggleVRDEServer(this);
+    m_pool[UIActionIndexRuntime_Toggle_VideoCapture] = new UIActionToggleVideoCapture(this);
     m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new UIActionSimplePerformInstallGuestTools(this);
 

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

@@ -65 +65 @@
     UIActionIndexRuntime_Simple_SharedFoldersDialog,
     UIActionIndexRuntime_Toggle_VRDEServer,
+    UIActionIndexRuntime_Toggle_VideoCapture,
     UIActionIndexRuntime_Simple_InstallGuestTools,
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -73 +73 @@
         << KVBoxEventType_OnVRDEServerChanged
         << KVBoxEventType_OnVRDEServerInfoChanged
+        << KVBoxEventType_OnVideoCaptureChanged
         << KVBoxEventType_OnUSBControllerChanged
         << KVBoxEventType_OnUSBDeviceStateChanged
@@ -116 +117 @@
     connect(pListener->getWrapped(), SIGNAL(sigVRDEChange()),
             this, SIGNAL(sigVRDEChange()),
+            Qt::QueuedConnection);
+
+    connect(pListener->getWrapped(), SIGNAL(sigVideoCaptureChange()),
+            this, SIGNAL(sigVideoCaptureChange()),
             Qt::QueuedConnection);
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48 +48 @@
     void sigMediumChange(CMediumAttachment attachment);
     void sigVRDEChange();
+    void sigVideoCaptureChange();
     void sigUSBControllerChange();
     void sigUSBDeviceStateChange(CUSBDevice device, bool fAttached, CVirtualBoxErrorInfo error);

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

@@ -747 +747 @@
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
 
@@ -808 +809 @@
     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
             this, SLOT(sltSwitchVrde(bool)));
+    connect(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture), SIGNAL(toggled(bool)),
+            this, SLOT(sltToggleVideoCapture(bool)));
     connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
             this, SLOT(sltInstallGuestAdditions()));
@@ -1890 +1893 @@
 }
 
+void UIMachineLogic::sltToggleVideoCapture(bool fEnabled)
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Make sure something had changed: */
+    CMachine machine = session().GetMachine();
+    if (machine.GetVideoCaptureEnabled() == fEnabled)
+        return;
+
+    /* Machine is OK? */
+    if (machine.isOk())
+    {
+        /* Update Video Capture state: */
+        machine.SetVideoCaptureEnabled(fEnabled);
+        /* Machine still OK? */
+        if (machine.isOk())
+        {
+            /* Save machine-settings: */
+            machine.SaveSettings();
+        }
+    }
+    /* Machine had failed on one of steps? */
+    if (!machine.isOk())
+        msgCenter().cannotSaveMachineSettings(machine, activeMachineWindow());
+}
+
 void UIMachineLogic::sltInstallGuestAdditions()
 {

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

@@ -206 +206 @@
     void sltChangeDragAndDropType(QAction *pAction);
     void sltSwitchVrde(bool fOn);
+    void sltToggleVideoCapture(bool fEnabled);
     void sltInstallGuestAdditions();
 

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

@@ -245 +245 @@
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
     pMenu->addSeparator();
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));

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

@@ -718 +718 @@
 {
     /* Get machine: */
-    const CMachine &machine = session().GetMachine();
+    const CMachine machine = session().GetMachine();
     /* Get VRDE server: */
     const CVRDEServer &server = machine.GetVRDEServer();
@@ -729 +729 @@
     /* Notify listeners about VRDE change: */
     emit sigVRDEChange();
+}
+
+void UISession::sltVideoCaptureChange()
+{
+    /* Get machine: */
+    const CMachine machine = session().GetMachine();
+    /* Check/Uncheck Video Capture action depending on feature status: */
+    gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture)->setChecked(machine.GetVideoCaptureEnabled());
+    /* Notify listeners about Video Capture change: */
+    emit sigVideoCaptureChange();
 }
 
@@ -806 +816 @@
     connect(gConsoleEvents, SIGNAL(sigVRDEChange()),
             this, SLOT(sltVRDEChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigVideoCaptureChange()),
+            this, SLOT(sltVideoCaptureChange()));
 
     connect(gConsoleEvents, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),

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

@@ -182 +182 @@
     void sigMediumChange(const CMediumAttachment &mediumAttachment);
     void sigVRDEChange();
+    void sigVideoCaptureChange();
     void sigUSBControllerChange();
     void sigUSBDeviceStateChange(const CUSBDevice &device, bool bIsAttached, const CVirtualBoxErrorInfo &error);
@@ -214 +215 @@
     void sltAdditionsChange();
     void sltVRDEChange();
+    void sltVideoCaptureChange();
     void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);