Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 75291) @@ -609,7 +609,7 @@ case UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize: strResult = "GuestAutoresize"; break; case UIExtraDataMetaDefs::RuntimeMenuViewActionType_TakeScreenshot: strResult = "TakeScreenshot"; break; - case UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture: strResult = "VideoCapture"; break; - case UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings: strResult = "VideoCaptureSettings"; break; - case UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture: strResult = "StartVideoCapture"; break; + case UIExtraDataMetaDefs::RuntimeMenuViewActionType_Recording: strResult = "VideoCapture"; break; + case UIExtraDataMetaDefs::RuntimeMenuViewActionType_RecordingSettings: strResult = "VideoCaptureSettings"; break; + case UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartRecording: strResult = "StartVideoCapture"; break; case UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer: strResult = "VRDEServer"; break; case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBar: strResult = "MenuBar"; break; @@ -649,7 +649,7 @@ keys << "GuestAutoresize"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize; keys << "TakeScreenshot"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_TakeScreenshot; - keys << "VideoCapture"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture; - keys << "VideoCaptureSettings"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings; - keys << "StartVideoCapture"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture; + keys << "VideoCapture"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_Recording; + keys << "VideoCaptureSettings"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_RecordingSettings; + keys << "StartVideoCapture"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartRecording; keys << "VRDEServer"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer; keys << "MenuBar"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBar; @@ -1403,5 +1403,5 @@ case IndicatorType_SharedFolders: strResult = "SharedFolders"; break; case IndicatorType_Display: strResult = "Display"; break; - case IndicatorType_Capture: strResult = "VideoCapture"; break; + case IndicatorType_Recording: strResult = "VideoCapture"; break; case IndicatorType_Features: strResult = "Features"; break; case IndicatorType_Mouse: strResult = "Mouse"; break; @@ -1430,5 +1430,5 @@ keys << "SharedFolders"; values << IndicatorType_SharedFolders; keys << "Display"; values << IndicatorType_Display; - keys << "VideoCapture"; values << IndicatorType_Capture; + keys << "VideoCapture"; values << IndicatorType_Recording; keys << "Features"; values << IndicatorType_Features; keys << "Mouse"; values << IndicatorType_Mouse; @@ -1455,5 +1455,5 @@ case IndicatorType_SharedFolders: strResult = QApplication::translate("VBoxGlobal", "Shared Folders", "IndicatorType"); break; case IndicatorType_Display: strResult = QApplication::translate("VBoxGlobal", "Display", "IndicatorType"); break; - case IndicatorType_Capture: strResult = QApplication::translate("VBoxGlobal", "Video Capture", "IndicatorType"); break; + case IndicatorType_Recording: strResult = QApplication::translate("VBoxGlobal", "Video Capture", "IndicatorType"); break; case IndicatorType_Features: strResult = QApplication::translate("VBoxGlobal", "Features", "IndicatorType"); break; case IndicatorType_Mouse: strResult = QApplication::translate("VBoxGlobal", "Mouse", "IndicatorType"); break; @@ -1481,5 +1481,5 @@ case IndicatorType_SharedFolders: return UIIconPool::iconSet(":/sf_16px.png"); case IndicatorType_Display: return UIIconPool::iconSet(":/display_software_16px.png"); - case IndicatorType_Capture: return UIIconPool::iconSet(":/video_capture_16px.png"); + case IndicatorType_Recording: return UIIconPool::iconSet(":/video_capture_16px.png"); case IndicatorType_Features: return UIIconPool::iconSet(":/vtx_amdv_16px.png"); case IndicatorType_Mouse: return UIIconPool::iconSet(":/mouse_16px.png"); Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 75291) @@ -500,7 +500,7 @@ RuntimeMenuViewActionType_GuestAutoresize = RT_BIT(5), RuntimeMenuViewActionType_TakeScreenshot = RT_BIT(6), - RuntimeMenuViewActionType_VideoCapture = RT_BIT(7), - RuntimeMenuViewActionType_VideoCaptureSettings = RT_BIT(8), - RuntimeMenuViewActionType_StartVideoCapture = RT_BIT(9), + RuntimeMenuViewActionType_Recording = RT_BIT(7), + RuntimeMenuViewActionType_RecordingSettings = RT_BIT(8), + RuntimeMenuViewActionType_StartRecording = RT_BIT(9), RuntimeMenuViewActionType_VRDEServer = RT_BIT(10), RuntimeMenuViewActionType_MenuBar = RT_BIT(11), @@ -765,5 +765,5 @@ IndicatorType_SharedFolders, IndicatorType_Display, - IndicatorType_Capture, + IndicatorType_Recording, IndicatorType_Features, IndicatorType_Mouse, Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp (revision 75291) @@ -1051,12 +1051,12 @@ /** Menu action extension, used as 'View' menu class. */ -class UIActionMenuRuntimeVideoCapture : public UIActionMenu -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionMenuRuntimeVideoCapture(UIActionPool *pParent) +class UIActionMenuRuntimeRecording : public UIActionMenu +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuRuntimeRecording(UIActionPool *pParent) : UIActionMenu(pParent) {} @@ -1067,15 +1067,15 @@ virtual int extraDataID() const /* override */ { - return UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture; - } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const /* override */ - { - return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture); - } - /** Returns whether action is allowed. */ - virtual bool isAllowed() const /* override */ - { - return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture); + return UIExtraDataMetaDefs::RuntimeMenuViewActionType_Recording; + } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const /* override */ + { + return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Recording); + } + /** Returns whether action is allowed. */ + virtual bool isAllowed() const /* override */ + { + return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Recording); } @@ -1087,13 +1087,13 @@ }; -/** Simple action extension, used as 'Show Video Capture Settings' action class. */ -class UIActionSimpleRuntimeShowVideoCaptureSettings : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleRuntimeShowVideoCaptureSettings(UIActionPool *pParent) +/** Simple action extension, used as 'Show Recording Settings' action class. */ +class UIActionSimpleRuntimeShowRecordingSettings : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleRuntimeShowRecordingSettings(UIActionPool *pParent) : UIActionSimple(pParent, ":/video_capture_settings_16px.png", ":/video_capture_settings_16px.png", true) {} @@ -1104,15 +1104,15 @@ virtual int extraDataID() const /* override */ { - return UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings; - } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const /* override */ - { - return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings); - } - /** Returns whether action is allowed. */ - virtual bool isAllowed() const /* override */ - { - return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings); + return UIExtraDataMetaDefs::RuntimeMenuViewActionType_RecordingSettings; + } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const /* override */ + { + return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_RecordingSettings); + } + /** Returns whether action is allowed. */ + virtual bool isAllowed() const /* override */ + { + return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_RecordingSettings); } @@ -1131,13 +1131,13 @@ }; -/** Toggle action extension, used as 'Video Capture' action class. */ -class UIActionToggleRuntimeVideoCapture : public UIActionToggle -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionToggleRuntimeVideoCapture(UIActionPool *pParent) +/** Toggle action extension, used as 'Recording' action class. */ +class UIActionToggleRuntimeRecording : public UIActionToggle +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionToggleRuntimeRecording(UIActionPool *pParent) : UIActionToggle(pParent, ":/video_capture_on_16px.png", ":/video_capture_16px.png", @@ -1151,15 +1151,15 @@ virtual int extraDataID() const /* override */ { - return UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture; - } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const /* override */ - { - return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture); - } - /** Returns whether action is allowed. */ - virtual bool isAllowed() const /* override */ - { - return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture); + return UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartRecording; + } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const /* override */ + { + return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartRecording); + } + /** Returns whether action is allowed. */ + virtual bool isAllowed() const /* override */ + { + return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartRecording); } @@ -3306,7 +3306,7 @@ m_pool[UIActionIndexRT_M_View_T_GuestAutoresize] = new UIActionToggleRuntimeGuestAutoresize(this); m_pool[UIActionIndexRT_M_View_S_TakeScreenshot] = new UIActionSimpleRuntimePerformTakeScreenshot(this); - m_pool[UIActionIndexRT_M_View_M_VideoCapture] = new UIActionMenuRuntimeVideoCapture(this); - m_pool[UIActionIndexRT_M_View_M_Capture_S_Settings] = new UIActionSimpleRuntimeShowVideoCaptureSettings(this); - m_pool[UIActionIndexRT_M_View_M_Capture_T_Start] = new UIActionToggleRuntimeVideoCapture(this); + m_pool[UIActionIndexRT_M_View_M_Recording] = new UIActionMenuRuntimeRecording(this); + m_pool[UIActionIndexRT_M_View_M_Recording_S_Settings] = new UIActionSimpleRuntimeShowRecordingSettings(this); + m_pool[UIActionIndexRT_M_View_M_Recording_T_Start] = new UIActionToggleRuntimeRecording(this); m_pool[UIActionIndexRT_M_View_T_VRDEServer] = new UIActionToggleRuntimeVRDEServer(this); m_pool[UIActionIndexRT_M_View_M_MenuBar] = new UIActionMenuRuntimeMenuBar(this); @@ -3377,5 +3377,5 @@ m_menuUpdateHandlers[UIActionIndexRT_M_View].ptfr = &UIActionPoolRuntime::updateMenuView; m_menuUpdateHandlers[UIActionIndexRT_M_ViewPopup].ptfr = &UIActionPoolRuntime::updateMenuViewPopup; - m_menuUpdateHandlers[UIActionIndexRT_M_View_M_VideoCapture].ptfr = &UIActionPoolRuntime::updateMenuViewVideoCapture; + m_menuUpdateHandlers[UIActionIndexRT_M_View_M_Recording].ptfr = &UIActionPoolRuntime::updateMenuViewRecording; m_menuUpdateHandlers[UIActionIndexRT_M_View_M_MenuBar].ptfr = &UIActionPoolRuntime::updateMenuViewMenuBar; m_menuUpdateHandlers[UIActionIndexRT_M_View_M_StatusBar].ptfr = &UIActionPoolRuntime::updateMenuViewStatusBar; @@ -3452,5 +3452,5 @@ (m_restrictedActionsMenuMachine[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SettingsDialog); m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::RuntimeMenuViewActionType) - (m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings); + (m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuViewActionType_RecordingSettings); m_restrictedActionsMenuInput[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::RuntimeMenuInputActionType) (m_restrictedActionsMenuInput[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings); @@ -3658,9 +3658,9 @@ /* 'Take Screenshot' action: */ fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_S_TakeScreenshot)) || fSeparator; - /* 'Video Capture' submenu: */ - fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_VideoCapture), false) || fSeparator; - updateMenuViewVideoCapture(); - /* 'Video Capture Start' action: */ - fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Capture_T_Start)) || fSeparator; + /* 'Recording' submenu: */ + fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Recording), false) || fSeparator; + updateMenuViewRecording(); + /* 'Recording Start' action: */ + fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Recording_T_Start)) || fSeparator; /* 'VRDE Server' action: */ fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_T_VRDEServer)) || fSeparator; @@ -3765,8 +3765,8 @@ } -void UIActionPoolRuntime::updateMenuViewVideoCapture() +void UIActionPoolRuntime::updateMenuViewRecording() { /* Get corresponding menu: */ - UIMenu *pMenu = action(UIActionIndexRT_M_View_M_VideoCapture)->menu(); + UIMenu *pMenu = action(UIActionIndexRT_M_View_M_Recording)->menu(); AssertPtrReturnVoid(pMenu); /* Clear contents: */ @@ -3776,6 +3776,6 @@ bool fSeparator = false; - /* 'Video Capture Settings' action: */ - fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Capture_S_Settings)) || fSeparator; + /* 'Recording Settings' action: */ + fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Recording_S_Settings)) || fSeparator; /* Separator: */ @@ -3786,9 +3786,9 @@ } - /* 'Start Video Capture' action: */ - fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Capture_T_Start)) || fSeparator; + /* 'Start Recording' action: */ + fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_Recording_T_Start)) || fSeparator; /* Mark menu as valid: */ - m_invalidations.remove(UIActionIndexRT_M_View_M_VideoCapture); + m_invalidations.remove(UIActionIndexRT_M_View_M_Recording); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h (revision 75291) @@ -64,7 +64,7 @@ UIActionIndexRT_M_View_T_GuestAutoresize, UIActionIndexRT_M_View_S_TakeScreenshot, - UIActionIndexRT_M_View_M_VideoCapture, - UIActionIndexRT_M_View_M_Capture_S_Settings, - UIActionIndexRT_M_View_M_Capture_T_Start, + UIActionIndexRT_M_View_M_Recording, + UIActionIndexRT_M_View_M_Recording_S_Settings, + UIActionIndexRT_M_View_M_Recording_T_Start, UIActionIndexRT_M_View_T_VRDEServer, UIActionIndexRT_M_View_M_MenuBar, @@ -242,6 +242,6 @@ /** Updates 'View' : 'Popup' menu. */ void updateMenuViewPopup(); - /** Updates 'View' : 'Video Capture' menu. */ - void updateMenuViewVideoCapture(); + /** Updates 'View' : 'Recording' menu. */ + void updateMenuViewRecording(); /** Updates 'View' : 'Menu Bar' menu. */ void updateMenuViewMenuBar(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (revision 75291) @@ -377,5 +377,5 @@ case KVBoxEventType_OnCaptureChanged: { - emit sigCaptureChange(); + emit sigRecordingChange(); break; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h (revision 75291) @@ -125,5 +125,5 @@ void sigVRDEChange(); /** Notifies about capture state change. */ - void sigCaptureChange(); + void sigRecordingChange(); /** Notifies about USB controller state change. */ void sigUSBControllerChange(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp (revision 75291) @@ -570,5 +570,5 @@ } -void UIPopupCenter::cannotToggleCapture(QWidget *pParent, const CMachine &comMachine, bool fEnable) +void UIPopupCenter::cannotToggleRecording(QWidget *pParent, const CMachine &comMachine, bool fEnable) { /* Get machine-name preserving error-info: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.h (revision 75291) @@ -162,5 +162,5 @@ void cannotDetachWebCam(QWidget *pParent, const CEmulatedUSB &comDispatcher, const QString &strWebCamName, const QString &strMachineName); - void cannotToggleCapture(QWidget *pParent, const CMachine &comMachine, bool fEnable); + void cannotToggleRecording(QWidget *pParent, const CMachine &comMachine, bool fEnable); void cannotToggleVRDEServer(QWidget *pParent, const CVRDEServer &comServer, const QString &strMachineName, bool fEnable); Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp (revision 75291) @@ -449,5 +449,5 @@ } - /* Capture info: */ + /* Recording info: */ CCaptureSettings captureSettings = machine.GetCaptureSettings(); if (captureSettings.GetEnabled()) @@ -457,7 +457,7 @@ /** @todo r=andy Refine these texts (wrt audio and/or video). */ - table << UITextTableLine(QApplication::translate("UIDetails", "Video Capture File", "details (display/video capture)"), + table << UITextTableLine(QApplication::translate("UIDetails", "Recording File", "details (display/video capture)"), captureScreen0Settings.GetFileName()); - table << UITextTableLine(QApplication::translate("UIDetails", "Video Capture Attributes", "details (display/video capture)"), + table << UITextTableLine(QApplication::translate("UIDetails", "Recording Attributes", "details (display/video capture)"), QApplication::translate("UIDetails", "Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps") .arg(captureScreen0Settings.GetVideoWidth()).arg(captureScreen0Settings.GetVideoHeight()) @@ -467,5 +467,5 @@ { /** @todo r=andy Refine these texts (wrt audio and/or video). */ - table << UITextTableLine(QApplication::translate("UIDetails", "Video Capture", "details (display/video capture)"), + table << UITextTableLine(QApplication::translate("UIDetails", "Recording", "details (display/video capture)"), QApplication::translate("UIDetails", "Disabled", "details (display/video capture)")); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp (revision 75291) @@ -64,6 +64,6 @@ /** Notifies about VRDE device state change. */ void sigVRDEChange(); - /** Notifies about Video Capture device state change. */ - void sigVideoCaptureChange(); + /** Notifies about recording state change. */ + void sigRecordingChange(); /** Notifies about USB controller state change. */ void sigUSBControllerChange(); @@ -243,6 +243,6 @@ this, SIGNAL(sigVRDEChange()), Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigVideoCaptureChange()), - this, SIGNAL(sigVideoCaptureChange()), + connect(m_pQtListener->getWrapped(), SIGNAL(sigRecordingChange()), + this, SIGNAL(sigRecordingChange()), Qt::DirectConnection); connect(m_pQtListener->getWrapped(), SIGNAL(sigUSBControllerChange()), @@ -402,6 +402,6 @@ this, SIGNAL(sigVRDEChange()), Qt::QueuedConnection); - connect(m_pProxy, SIGNAL(sigVideoCaptureChange()), - this, SIGNAL(sigVideoCaptureChange()), + connect(m_pProxy, SIGNAL(sigRecordingChange()), + this, SIGNAL(sigRecordingChange()), Qt::QueuedConnection); connect(m_pProxy, SIGNAL(sigUSBControllerChange()), Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h (revision 75291) @@ -60,6 +60,6 @@ /** Notifies about VRDE device state change. */ void sigVRDEChange(); - /** Notifies about Video Capture device state change. */ - void sigVideoCaptureChange(); + /** Notifies about recording state change. */ + void sigRecordingChange(); /** Notifies about USB controller state change. */ void sigUSBControllerChange(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 75291) @@ -782,6 +782,6 @@ -/** UISessionStateStatusBarIndicator extension for Runtime UI: Video-capture indicator. */ -class UIIndicatorCapture : public UISessionStateStatusBarIndicator +/** UISessionStateStatusBarIndicator extension for Runtime UI: Recording indicator. */ +class UIIndicatorRecording : public UISessionStateStatusBarIndicator { Q_OBJECT; @@ -790,18 +790,18 @@ Q_PROPERTY(double rotationAngle READ rotationAngle WRITE setRotationAngle); - /** Capture states. */ - enum UIIndicatorStateCapture - { - UIIndicatorStateCapture_Disabled = 0, - UIIndicatorStateCapture_Enabled = 1, - UIIndicatorStateCapture_Paused = 2 + /** Recording states. */ + enum UIIndicatorStateRecording + { + UIIndicatorStateRecording_Disabled = 0, + UIIndicatorStateRecording_Enabled = 1, + UIIndicatorStateRecording_Paused = 2 }; - /** Capture modes. */ - enum UIIndicatorStateCaptureMode - { - UIIndicatorStateCaptureMode_None = RT_BIT(0), - UIIndicatorStateCaptureMode_Video = RT_BIT(1), - UIIndicatorStateCaptureMode_Audio = RT_BIT(2) + /** Recording modes. */ + enum UIIndicatorStateRecordingMode + { + UIIndicatorStateRecordingMode_None = RT_BIT(0), + UIIndicatorStateRecordingMode_Video = RT_BIT(1), + UIIndicatorStateRecordingMode_Audio = RT_BIT(2) }; @@ -809,14 +809,14 @@ /** Constructor, passes @a pSession to the UISessionStateStatusBarIndicator constructor. */ - UIIndicatorCapture(UISession *pSession) - : UISessionStateStatusBarIndicator(IndicatorType_Capture, pSession) + UIIndicatorRecording(UISession *pSession) + : UISessionStateStatusBarIndicator(IndicatorType_Recording, pSession) , m_pAnimation(0) , m_dRotationAngle(0) - , m_eCaptureMode(UIIndicatorStateCaptureMode_None) + , m_eRecordingMode(UIIndicatorStateRecordingMode_None) { /* Assign state-icons: */ - setStateIcon(UIIndicatorStateCapture_Disabled, UIIconPool::iconSet(":/video_capture_16px.png")); - setStateIcon(UIIndicatorStateCapture_Enabled, UIIconPool::iconSet(":/movie_reel_16px.png")); - setStateIcon(UIIndicatorStateCapture_Paused, UIIconPool::iconSet(":/movie_reel_16px.png")); + setStateIcon(UIIndicatorStateRecording_Disabled, UIIconPool::iconSet(":/video_capture_16px.png")); + setStateIcon(UIIndicatorStateRecording_Enabled, UIIconPool::iconSet(":/movie_reel_16px.png")); + setStateIcon(UIIndicatorStateRecording_Paused, UIIconPool::iconSet(":/movie_reel_16px.png")); /* Create *enabled* state animation: */ m_pAnimation = UIAnimationLoop::installAnimationLoop(this, "rotationAngle", @@ -835,12 +835,12 @@ switch (iState) { - case UIIndicatorStateCapture_Disabled: + case UIIndicatorStateRecording_Disabled: m_pAnimation->stop(); m_dRotationAngle = 0; break; - case UIIndicatorStateCapture_Enabled: + case UIIndicatorStateRecording_Enabled: m_pAnimation->start(); break; - case UIIndicatorStateCapture_Paused: + case UIIndicatorStateRecording_Paused: m_pAnimation->stop(); break; @@ -860,5 +860,5 @@ QPainter painter(this); /* Configure painter for *enabled* state: */ - if (state() == UIIndicatorStateCapture_Enabled) + if (state() == UIIndicatorStateRecording_Enabled) { /* Configure painter for smooth animation: */ @@ -885,14 +885,16 @@ /* Update indicator state early: */ CCaptureSettings captureSettings = machine.GetCaptureSettings(); + Assert(captureSettings.isOk()); /* For now all screens have the same config: */ CCaptureScreenSettings captureScreen0Settings = captureSettings.GetScreenSettings(0); + Assert(captureScreen0Settings.isOk()); if (!captureScreen0Settings.GetEnabled()) - setState(UIIndicatorStateCapture_Disabled); + setState(UIIndicatorStateRecording_Disabled); else if (!fMachinePaused) - setState(UIIndicatorStateCapture_Enabled); + setState(UIIndicatorStateRecording_Enabled); else - setState(UIIndicatorStateCapture_Paused); - - updateCaptureMode(); + setState(UIIndicatorStateRecording_Paused); + + updateRecordingMode(); /* Prepare tool-tip: */ @@ -900,5 +902,5 @@ switch (state()) { - case UIIndicatorStateCapture_Disabled: + case UIIndicatorStateRecording_Disabled: { strFullData += s_strTableRow1 /** @todo r=andy Refine this tooltip (audio and/or video). */ @@ -906,14 +908,14 @@ break; } - case UIIndicatorStateCapture_Enabled: - case UIIndicatorStateCapture_Paused: + case UIIndicatorStateRecording_Enabled: + case UIIndicatorStateRecording_Paused: { QString strToolTip; - if ( m_eCaptureMode & UIIndicatorStateCaptureMode_Audio && - m_eCaptureMode & UIIndicatorStateCaptureMode_Video) + if ( m_eRecordingMode & UIIndicatorStateRecordingMode_Audio && + m_eRecordingMode & UIIndicatorStateRecordingMode_Video) strToolTip = "Video/audio capture file"; - else if (m_eCaptureMode & UIIndicatorStateCaptureMode_Audio) + else if (m_eRecordingMode & UIIndicatorStateRecordingMode_Audio) strToolTip = "Audio capture file"; - else if (m_eCaptureMode & UIIndicatorStateCaptureMode_Video) + else if (m_eRecordingMode & UIIndicatorStateRecordingMode_Video) strToolTip = "Video capture file"; @@ -940,8 +942,8 @@ void setRotationAngle(double dRotationAngle) { m_dRotationAngle = dRotationAngle; update(); } - /* Parses CaptureScreenSettings::Options and updates m_eCaptureMode accordingly. */ - void updateCaptureMode() - { - m_eCaptureMode = UIIndicatorStateCaptureMode_None; + /* Parses CaptureScreenSettings::Options and updates m_eRecordingMode accordingly. */ + void updateRecordingMode() + { + m_eRecordingMode = UIIndicatorStateRecordingMode_None; /* Get machine: */ @@ -952,9 +954,9 @@ return; - CCaptureSettings captureSettings = machine.GetCaptureSettings(); + CCaptureSettings recordingSettings = machine.GetCaptureSettings(); /* For now all screens have the same config: */ - CCaptureScreenSettings captureScreen0Settings = captureSettings.GetScreenSettings(0); - - QStringList strOptionsPairList = captureScreen0Settings.GetOptions().split(",", QString::SkipEmptyParts); + CCaptureScreenSettings recordingScreen0Settings = recordingSettings.GetScreenSettings(0); + + QStringList strOptionsPairList = recordingScreen0Settings.GetOptions().split(",", QString::SkipEmptyParts); for (int i = 0; i < strOptionsPairList.size(); ++i) @@ -962,9 +964,9 @@ if (strOptionsPairList.at(i).contains("vc_enabled", Qt::CaseInsensitive) && strOptionsPairList.at(i).contains("true", Qt::CaseInsensitive)) - m_eCaptureMode = (UIIndicatorStateCaptureMode)((int)m_eCaptureMode | (int)UIIndicatorStateCaptureMode_Video); + m_eRecordingMode = (UIIndicatorStateRecordingMode)((int)m_eRecordingMode | (int)UIIndicatorStateRecordingMode_Video); if (strOptionsPairList.at(i).contains("ac_enabled", Qt::CaseInsensitive) && strOptionsPairList.at(i).contains("true", Qt::CaseInsensitive)) - m_eCaptureMode = (UIIndicatorStateCaptureMode)((int)m_eCaptureMode | (int)UIIndicatorStateCaptureMode_Audio); + m_eRecordingMode = (UIIndicatorStateRecordingMode)((int)m_eRecordingMode | (int)UIIndicatorStateRecordingMode_Audio); } } @@ -975,5 +977,5 @@ double m_dRotationAngle; - UIIndicatorStateCaptureMode m_eCaptureMode; + UIIndicatorStateRecordingMode m_eRecordingMode; }; @@ -1474,5 +1476,5 @@ case IndicatorType_SharedFolders: m_pool[indicatorType] = new UIIndicatorSharedFolders(m_pSession); break; case IndicatorType_Display: m_pool[indicatorType] = new UIIndicatorDisplay(m_pSession); break; - case IndicatorType_Capture: m_pool[indicatorType] = new UIIndicatorCapture(m_pSession); break; + case IndicatorType_Recording: m_pool[indicatorType] = new UIIndicatorRecording(m_pSession); break; case IndicatorType_Features: m_pool[indicatorType] = new UIIndicatorFeatures(m_pSession); break; case IndicatorType_Mouse: m_pool[indicatorType] = new UIIndicatorMouse(m_pSession); break; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h (revision 75291) @@ -36,5 +36,5 @@ UIVisualElement_SharedFolderStuff = RT_BIT(9), UIVisualElement_Display = RT_BIT(10), - UIVisualElement_VideoCapture = RT_BIT(11), + UIVisualElement_Recording = RT_BIT(11), UIVisualElement_FeaturesStuff = RT_BIT(12), #ifndef VBOX_WS_MAC Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 75291) @@ -1052,7 +1052,7 @@ m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow)); m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot)); - m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_VideoCapture)); - m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_Capture_S_Settings)); - m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_Capture_T_Start)); + m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_Recording)); + m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_Recording_S_Settings)); + m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start)); m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)); m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar)); @@ -1137,8 +1137,8 @@ connect(actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot), SIGNAL(triggered()), this, SLOT(sltTakeScreenshot())); - connect(actionPool()->action(UIActionIndexRT_M_View_M_Capture_S_Settings), SIGNAL(triggered()), - this, SLOT(sltOpenCaptureOptions())); - connect(actionPool()->action(UIActionIndexRT_M_View_M_Capture_T_Start), SIGNAL(toggled(bool)), - this, SLOT(sltToggleCapture(bool))); + connect(actionPool()->action(UIActionIndexRT_M_View_M_Recording_S_Settings), SIGNAL(triggered()), + this, SLOT(sltOpenRecordingOptions())); + connect(actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start), SIGNAL(toggled(bool)), + this, SLOT(sltToggleRecording(bool))); connect(actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer), SIGNAL(toggled(bool)), this, SLOT(sltToggleVRDE(bool))); @@ -2091,11 +2091,11 @@ } -void UIMachineLogic::sltOpenCaptureOptions() -{ - /* Open VM settings : Display page : Video Capture tab: */ +void UIMachineLogic::sltOpenRecordingOptions() +{ + /* Open VM settings : Display page : Recording tab: */ sltOpenVMSettingsDialog("#display", "m_pCheckboxVideoCapture"); } -void UIMachineLogic::sltToggleCapture(bool fEnabled) +void UIMachineLogic::sltToggleRecording(bool fEnabled) { /* Do not process if window(s) missed! */ @@ -2104,16 +2104,16 @@ /* Make sure something had changed: */ - CCaptureSettings captureSettings = machine().GetCaptureSettings(); - if (captureSettings.GetEnabled() == static_cast(fEnabled)) - return; - - /* Update Video Capture state: */ - captureSettings.SetEnabled(fEnabled); - if (!captureSettings.isOk()) + CCaptureSettings recordingSettings = machine().GetCaptureSettings(); + if (recordingSettings.GetEnabled() == static_cast(fEnabled)) + return; + + /* Update recording state: */ + recordingSettings.SetEnabled(fEnabled); + if (!recordingSettings.isOk()) { /* Make sure action is updated: */ - uisession()->updateStatusCapture(); + uisession()->updateStatusRecording(); /* Notify about the error: */ - return popupCenter().cannotToggleCapture(activeMachineWindow(), machine(), fEnabled); + return popupCenter().cannotToggleRecording(activeMachineWindow(), machine(), fEnabled); } @@ -2123,5 +2123,5 @@ { /* Make sure action is updated: */ - uisession()->updateStatusCapture(); + uisession()->updateStatusRecording(); /* Notify about the error: */ return msgCenter().cannotSaveMachineSettings(machine()); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h (revision 75291) @@ -291,6 +291,6 @@ void sltToggleGuestAutoresize(bool fEnabled); void sltTakeScreenshot(); - void sltOpenCaptureOptions(); - void sltToggleCapture(bool fEnabled); + void sltOpenRecordingOptions(); + void sltToggleRecording(bool fEnabled); void sltToggleVRDE(bool fEnabled); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 75291) @@ -722,15 +722,15 @@ } -void UISession::sltCaptureChange() +void UISession::sltRecordingChange() { CCaptureSettings captureSettings = machine().GetCaptureSettings(); /* Check/Uncheck Capture action depending on feature status: */ - actionPool()->action(UIActionIndexRT_M_View_M_Capture_T_Start)->blockSignals(true); - actionPool()->action(UIActionIndexRT_M_View_M_Capture_T_Start)->setChecked(captureSettings.GetEnabled()); - actionPool()->action(UIActionIndexRT_M_View_M_Capture_T_Start)->blockSignals(false); + actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start)->blockSignals(true); + actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start)->setChecked(captureSettings.GetEnabled()); + actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start)->blockSignals(false); /* Notify listeners about Capture change: */ - emit sigCaptureChange(); + emit sigRecordingChange(); } @@ -1133,6 +1133,6 @@ this, SLOT(sltVRDEChange())); - connect(gConsoleEvents, SIGNAL(sigVideoCaptureChange()), - this, SLOT(sltCaptureChange())); + connect(gConsoleEvents, SIGNAL(sigRecordingChange()), + this, SLOT(sltRecordingChange())); connect(gConsoleEvents, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)), Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 75291) @@ -259,5 +259,5 @@ void updateStatusVRDE() { sltVRDEChange(); } /** Updates Video Capture action state. */ - void updateStatusCapture() { sltCaptureChange(); } + void updateStatusRecording() { sltRecordingChange(); } /** Updates Audio output action state. */ void updateAudioOutput() { sltAudioAdapterChange(); } @@ -305,5 +305,5 @@ void sigMediumChange(const CMediumAttachment &mediumAttachment); void sigVRDEChange(); - void sigCaptureChange(); + void sigRecordingChange(); void sigUSBControllerChange(); void sigUSBDeviceStateChange(const CUSBDevice &device, bool bIsAttached, const CVirtualBoxErrorInfo &error); @@ -357,5 +357,5 @@ void sltAdditionsChange(); void sltVRDEChange(); - void sltCaptureChange(); + void sltRecordingChange(); void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo); /** Handles storage device change for @a attachment, which was @a fRemoved and it was @a fSilent for guest. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 75291) @@ -71,5 +71,5 @@ /* Update indicator-pool and virtualization stuff: */ - updateAppearanceOf(UIVisualElement_IndicatorPoolStuff | UIVisualElement_VideoCapture | UIVisualElement_FeaturesStuff); + updateAppearanceOf(UIVisualElement_IndicatorPoolStuff | UIVisualElement_Recording | UIVisualElement_FeaturesStuff); } @@ -116,8 +116,8 @@ } -void UIMachineWindowNormal::sltVideoCaptureChange() +void UIMachineWindowNormal::sltRecordingChange() { /* Update video-capture stuff: */ - updateAppearanceOf(UIVisualElement_VideoCapture); + updateAppearanceOf(UIVisualElement_Recording); } @@ -219,5 +219,5 @@ case IndicatorType_SharedFolders: pAction = actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders); break; case IndicatorType_Display: pAction = actionPool()->action(UIActionIndexRT_M_ViewPopup); break; - case IndicatorType_Capture: pAction = actionPool()->action(UIActionIndexRT_M_View_M_VideoCapture); break; + case IndicatorType_Recording: pAction = actionPool()->action(UIActionIndexRT_M_View_M_Recording); break; case IndicatorType_Mouse: pAction = actionPool()->action(UIActionIndexRT_M_Input_M_Mouse); break; case IndicatorType_Keyboard: pAction = actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard); break; @@ -255,6 +255,6 @@ connect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()), this, SLOT(sltSharedFolderChange())); - connect(machineLogic()->uisession(), SIGNAL(sigVideoCaptureChange()), - this, SLOT(sltVideoCaptureChange())); + connect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()), + this, SLOT(sltRecordingChange())); connect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()), this, SLOT(sltCPUExecutionCapChange())); @@ -464,6 +464,6 @@ disconnect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()), this, SLOT(sltSharedFolderChange())); - disconnect(machineLogic()->uisession(), SIGNAL(sigVideoCaptureChange()), - this, SLOT(sltVideoCaptureChange())); + disconnect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()), + this, SLOT(sltRecordingChange())); disconnect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()), this, SLOT(sltCPUExecutionCapChange())); @@ -639,6 +639,6 @@ if (uisession()->isRunning() || uisession()->isPaused()) { - if (iElement & UIVisualElement_VideoCapture) - m_pIndicatorsPool->updateAppearance(IndicatorType_Capture); + if (iElement & UIVisualElement_Recording) + m_pIndicatorsPool->updateAppearance(IndicatorType_Recording); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h (revision 75291) @@ -59,6 +59,6 @@ /** Handles shared folder change event. */ void sltSharedFolderChange(); - /** Handles video capture change event. */ - void sltVideoCaptureChange(); + /** Handles recording change event. */ + void sltRecordingChange(); /** Handles CPU execution cap change event. */ void sltCPUExecutionCapChange(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 75291) @@ -59,12 +59,12 @@ , m_uRemoteDisplayTimeout(0) , m_fRemoteDisplayMultiConnAllowed(false) - , m_fVideoCaptureEnabled(false) - , m_strVideoCaptureFolder(QString()) - , m_strVideoCaptureFilePath(QString()) - , m_iVideoCaptureFrameWidth(0) - , m_iVideoCaptureFrameHeight(0) - , m_iVideoCaptureFrameRate(0) - , m_iVideoCaptureBitRate(0) - , m_strVideoCaptureOptions(QString()) + , m_fRecordingEnabled(false) + , m_strRecordingFolder(QString()) + , m_strRecordingFilePath(QString()) + , m_iRecordingVideoFrameWidth(0) + , m_iRecordingVideoFrameHeight(0) + , m_iRecordingVideoFrameRate(0) + , m_iRecordingVideoBitRate(0) + , m_strRecordingVideoOptions(QString()) {} @@ -86,12 +86,12 @@ && (m_uRemoteDisplayTimeout == other.m_uRemoteDisplayTimeout) && (m_fRemoteDisplayMultiConnAllowed == other.m_fRemoteDisplayMultiConnAllowed) - && (m_fVideoCaptureEnabled == other.m_fVideoCaptureEnabled) - && (m_strVideoCaptureFilePath == other.m_strVideoCaptureFilePath) - && (m_iVideoCaptureFrameWidth == other.m_iVideoCaptureFrameWidth) - && (m_iVideoCaptureFrameHeight == other.m_iVideoCaptureFrameHeight) - && (m_iVideoCaptureFrameRate == other.m_iVideoCaptureFrameRate) - && (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate) - && (m_screens == other.m_screens) - && (m_strVideoCaptureOptions == other.m_strVideoCaptureOptions) + && (m_fRecordingEnabled == other.m_fRecordingEnabled) + && (m_strRecordingFilePath == other.m_strRecordingFilePath) + && (m_iRecordingVideoFrameWidth == other.m_iRecordingVideoFrameWidth) + && (m_iRecordingVideoFrameHeight == other.m_iRecordingVideoFrameHeight) + && (m_iRecordingVideoFrameRate == other.m_iRecordingVideoFrameRate) + && (m_iRecordingVideoBitRate == other.m_iRecordingVideoBitRate) + && (m_vecRecordingScreens == other.m_vecRecordingScreens) + && (m_strRecordingVideoOptions == other.m_strRecordingVideoOptions) ; } @@ -102,48 +102,48 @@ bool operator!=(const UIDataSettingsMachineDisplay &other) const { return !equal(other); } - /** Video Capture Options. */ - enum VideoCaptureOption - { - VideoCaptureOption_Unknown, - VideoCaptureOption_AC, - VideoCaptureOption_VC, - VideoCaptureOption_AC_Profile + /** Recording options. */ + enum RecordingOption + { + RecordingOption_Unknown, + RecordingOption_AC, + RecordingOption_VC, + RecordingOption_AC_Profile }; - enum CaptureMode - { - CaptureMode_VideoAudio, - CaptureMode_VideoOnly, - CaptureMode_AudioOnly + enum RecordingMode + { + RecordingMode_VideoAudio, + RecordingMode_VideoOnly, + RecordingMode_AudioOnly }; /** Returns enum value corresponding to passed @a strKey. */ - static VideoCaptureOption toVideoCaptureOptionKey(const QString &strKey) + static RecordingOption toRecordingOptionKey(const QString &strKey) { /* Compare case-sensitive: */ - QMap keys; - keys["ac_enabled"] = VideoCaptureOption_AC; - keys["vc_enabled"] = VideoCaptureOption_VC; - keys["ac_profile"] = VideoCaptureOption_AC_Profile; - /* Return known value or VideoCaptureOption_Unknown otherwise: */ - return keys.value(strKey, VideoCaptureOption_Unknown); + QMap keys; + keys["ac_enabled"] = RecordingOption_AC; + keys["vc_enabled"] = RecordingOption_VC; + keys["ac_profile"] = RecordingOption_AC_Profile; + /* Return known value or RecordingOption_Unknown otherwise: */ + return keys.value(strKey, RecordingOption_Unknown); } /** Returns string representation for passed enum @a enmKey. */ - static QString fromVideoCaptureOptionKey(VideoCaptureOption enmKey) + static QString fromRecordingOptionKey(RecordingOption enmKey) { /* Compare case-sensitive: */ - QMap values; - values[VideoCaptureOption_AC] = "ac_enabled"; - values[VideoCaptureOption_VC] = "vc_enabled"; - values[VideoCaptureOption_AC_Profile] = "ac_profile"; + QMap values; + values[RecordingOption_AC] = "ac_enabled"; + values[RecordingOption_VC] = "vc_enabled"; + values[RecordingOption_AC_Profile] = "ac_profile"; /* Return known value or QString() otherwise: */ return values.value(enmKey); } - /** Parses Video Capture Options. */ - static void parseVideoCaptureOptions(const QString &strOptions, - QList &outKeys, - QStringList &outValues) + /** Parses recording options. */ + static void parseRecordingOptions(const QString &strOptions, + QList &outKeys, + QStringList &outValues) { outKeys.clear(); @@ -155,6 +155,6 @@ if (aPair.size() != 2) continue; - const VideoCaptureOption enmKey = toVideoCaptureOptionKey(aPair.value(0)); - if (enmKey == VideoCaptureOption_Unknown) + const RecordingOption enmKey = toRecordingOptionKey(aPair.value(0)); + if (enmKey == RecordingOption_Unknown) continue; outKeys << enmKey; @@ -163,8 +163,8 @@ } - /** Serializes Video Capture Options. */ - static void serializeVideoCaptureOptions(const QList &inKeys, - const QStringList &inValues, - QString &strOptions) + /** Serializes recording options. */ + static void serializeRecordingOptions(const QList &inKeys, + const QStringList &inValues, + QString &strOptions) { QStringList aPairs; @@ -172,5 +172,5 @@ { QStringList aPair; - aPair << fromVideoCaptureOptionKey(inKeys.value(i)); + aPair << fromRecordingOptionKey(inKeys.value(i)); aPair << inValues.value(i); aPairs << aPair.join('='); @@ -179,11 +179,11 @@ } - /** Returns whether passed Video Capture @a enmOption is enabled. */ - static bool isVideoCaptureOptionEnabled(const QString &strOptions, - VideoCaptureOption enmOption) - { - QList aKeys; + /** Returns whether passed Recording @a enmOption is enabled. */ + static bool isRecordingOptionEnabled(const QString &strOptions, + RecordingOption enmOption) + { + QList aKeys; QStringList aValues; - parseVideoCaptureOptions(strOptions, aKeys, aValues); + parseRecordingOptions(strOptions, aKeys, aValues); int iIndex = aKeys.indexOf(enmOption); if (iIndex == -1) @@ -198,8 +198,8 @@ static int getAudioQualityFromOptions(const QString &strOptions) { - QList aKeys; + QList aKeys; QStringList aValues; - parseVideoCaptureOptions(strOptions, aKeys, aValues); - int iIndex = aKeys.indexOf(VideoCaptureOption_AC_Profile); + parseRecordingOptions(strOptions, aKeys, aValues); + int iIndex = aKeys.indexOf(RecordingOption_AC_Profile); if (iIndex == -1) return 2; @@ -211,14 +211,14 @@ } - /** Sets the video capture options for @a enmOptions to @a values. */ - static QString setVideoCaptureOptions(const QString &strOptions, - const QVector &enmOptions, - const QStringList &values) + /** Sets the video recording options for @a enmOptions to @a values. */ + static QString setRecordingOptions(const QString &strOptions, + const QVector &enmOptions, + const QStringList &values) { if (enmOptions.size() != values.size()) return QString(); - QList aKeys; + QList aKeys; QStringList aValues; - parseVideoCaptureOptions(strOptions, aKeys, aValues); + parseRecordingOptions(strOptions, aKeys, aValues); for(int i = 0; i < values.size(); ++i) { @@ -236,5 +236,5 @@ } QString strResult; - serializeVideoCaptureOptions(aKeys, aValues, strResult); + serializeRecordingOptions(aKeys, aValues, strResult); return strResult; } @@ -266,22 +266,22 @@ bool m_fRemoteDisplayMultiConnAllowed; - /** Holds whether the video capture is enabled. */ - bool m_fVideoCaptureEnabled; - /** Holds the video capture folder. */ - QString m_strVideoCaptureFolder; - /** Holds the video capture file path. */ - QString m_strVideoCaptureFilePath; - /** Holds the video capture frame width. */ - int m_iVideoCaptureFrameWidth; - /** Holds the video capture frame height. */ - int m_iVideoCaptureFrameHeight; - /** Holds the video capture frame rate. */ - int m_iVideoCaptureFrameRate; - /** Holds the video capture bit rate. */ - int m_iVideoCaptureBitRate; - /** Holds which of the guest screens should be captured. */ - QVector m_screens; - /** Holds the video capture options. */ - QString m_strVideoCaptureOptions; + /** Holds whether recording is enabled. */ + bool m_fRecordingEnabled; + /** Holds the recording folder. */ + QString m_strRecordingFolder; + /** Holds the recording file path. */ + QString m_strRecordingFilePath; + /** Holds the recording frame width. */ + int m_iRecordingVideoFrameWidth; + /** Holds the recording frame height. */ + int m_iRecordingVideoFrameHeight; + /** Holds the recording frame rate. */ + int m_iRecordingVideoFrameRate; + /** Holds the recording bit rate. */ + int m_iRecordingVideoBitRate; + /** Holds which of the guest screens should be recorded. */ + QVector m_vecRecordingScreens; + /** Holds the video recording options. */ + QString m_strRecordingVideoOptions; }; @@ -382,26 +382,26 @@ } - /* Gather old 'Capture' data: */ - CCaptureSettings captureSettings = m_machine.GetCaptureSettings(); - oldDisplayData.m_fVideoCaptureEnabled = captureSettings.GetEnabled(); + /* Gather old 'Recording' data: */ + CCaptureSettings recordingSettings = m_machine.GetCaptureSettings(); + oldDisplayData.m_fRecordingEnabled = recordingSettings.GetEnabled(); /* For now we're using the same settings for all screens; so get settings from screen 0 and work with that. */ - CCaptureScreenSettings captureScreen0Settings = captureSettings.GetScreenSettings(0); - if (!captureScreen0Settings.isNull()) - { - oldDisplayData.m_strVideoCaptureFolder = QFileInfo(m_machine.GetSettingsFilePath()).absolutePath(); - oldDisplayData.m_strVideoCaptureFilePath = captureScreen0Settings.GetFileName(); - oldDisplayData.m_iVideoCaptureFrameWidth = captureScreen0Settings.GetVideoWidth(); - oldDisplayData.m_iVideoCaptureFrameHeight = captureScreen0Settings.GetVideoHeight(); - oldDisplayData.m_iVideoCaptureFrameRate = captureScreen0Settings.GetVideoFPS(); - oldDisplayData.m_iVideoCaptureBitRate = captureScreen0Settings.GetVideoRate(); - oldDisplayData.m_strVideoCaptureOptions = captureScreen0Settings.GetOptions(); - } - - CCaptureScreenSettingsVector captureScreenSettingsVector = captureSettings.GetScreens(); - for (int iScreenIndex = 0; iScreenIndex < captureScreenSettingsVector.size(); ++iScreenIndex) - { - CCaptureScreenSettings captureScreenSettings = captureScreenSettingsVector.at(iScreenIndex); - oldDisplayData.m_screens[iScreenIndex] = captureScreenSettings.GetEnabled(); + CCaptureScreenSettings recordingScreen0Settings = recordingSettings.GetScreenSettings(0); + if (!recordingScreen0Settings.isNull()) + { + oldDisplayData.m_strRecordingFolder = QFileInfo(m_machine.GetSettingsFilePath()).absolutePath(); + oldDisplayData.m_strRecordingFilePath = recordingScreen0Settings.GetFileName(); + oldDisplayData.m_iRecordingVideoFrameWidth = recordingScreen0Settings.GetVideoWidth(); + oldDisplayData.m_iRecordingVideoFrameHeight = recordingScreen0Settings.GetVideoHeight(); + oldDisplayData.m_iRecordingVideoFrameRate = recordingScreen0Settings.GetVideoFPS(); + oldDisplayData.m_iRecordingVideoBitRate = recordingScreen0Settings.GetVideoRate(); + oldDisplayData.m_strRecordingVideoOptions = recordingScreen0Settings.GetOptions(); + } + + CCaptureScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens(); + for (int iScreenIndex = 0; iScreenIndex < recordingScreenSettingsVector.size(); ++iScreenIndex) + { + CCaptureScreenSettings captureScreenSettings = recordingScreenSettingsVector.at(iScreenIndex); + oldDisplayData.m_vecRecordingScreens[iScreenIndex] = captureScreenSettings.GetEnabled(); } @@ -443,27 +443,27 @@ } - /* Load old 'Video Capture' data from the cache: */ - m_pCheckboxVideoCapture->setChecked(oldDisplayData.m_fVideoCaptureEnabled); - m_pEditorVideoCapturePath->setHomeDir(oldDisplayData.m_strVideoCaptureFolder); - m_pEditorVideoCapturePath->setPath(oldDisplayData.m_strVideoCaptureFilePath); - m_pEditorVideoCaptureWidth->setValue(oldDisplayData.m_iVideoCaptureFrameWidth); - m_pEditorVideoCaptureHeight->setValue(oldDisplayData.m_iVideoCaptureFrameHeight); - m_pEditorVideoCaptureFrameRate->setValue(oldDisplayData.m_iVideoCaptureFrameRate); - m_pEditorVideoCaptureBitRate->setValue(oldDisplayData.m_iVideoCaptureBitRate); - m_pScrollerVideoCaptureScreens->setValue(oldDisplayData.m_screens); - - /* Load data from old 'Video Capture Option': */ - bool fAudioCapture = UIDataSettingsMachineDisplay::isVideoCaptureOptionEnabled(oldDisplayData.m_strVideoCaptureOptions, - UIDataSettingsMachineDisplay::VideoCaptureOption_AC); - bool fVideoCapture = UIDataSettingsMachineDisplay::isVideoCaptureOptionEnabled(oldDisplayData.m_strVideoCaptureOptions, - UIDataSettingsMachineDisplay::VideoCaptureOption_VC); - if (fAudioCapture && fVideoCapture) - m_pComboBoxCaptureMode->setCurrentIndex(static_cast(UIDataSettingsMachineDisplay::CaptureMode_VideoAudio)); - else if (fAudioCapture && !fVideoCapture) - m_pComboBoxCaptureMode->setCurrentIndex(static_cast(UIDataSettingsMachineDisplay::CaptureMode_AudioOnly)); + /* Load old 'Recording' data from the cache: */ + m_pCheckboxVideoCapture->setChecked(oldDisplayData.m_fRecordingEnabled); + m_pEditorVideoCapturePath->setHomeDir(oldDisplayData.m_strRecordingFolder); + m_pEditorVideoCapturePath->setPath(oldDisplayData.m_strRecordingFilePath); + m_pEditorVideoCaptureWidth->setValue(oldDisplayData.m_iRecordingVideoFrameWidth); + m_pEditorVideoCaptureHeight->setValue(oldDisplayData.m_iRecordingVideoFrameHeight); + m_pEditorVideoCaptureFrameRate->setValue(oldDisplayData.m_iRecordingVideoFrameRate); + m_pEditorVideoCaptureBitRate->setValue(oldDisplayData.m_iRecordingVideoBitRate); + m_pScrollerVideoCaptureScreens->setValue(oldDisplayData.m_vecRecordingScreens); + + /* Load data from old 'Recording option': */ + bool fRecordAudio = UIDataSettingsMachineDisplay::isRecordingOptionEnabled(oldDisplayData.m_strRecordingVideoOptions, + UIDataSettingsMachineDisplay::RecordingOption_AC); + bool fRecordVideo = UIDataSettingsMachineDisplay::isRecordingOptionEnabled(oldDisplayData.m_strRecordingVideoOptions, + UIDataSettingsMachineDisplay::RecordingOption_VC); + if (fRecordAudio && fRecordVideo) + m_pComboBoxCaptureMode->setCurrentIndex(static_cast(UIDataSettingsMachineDisplay::RecordingMode_VideoAudio)); + else if (fRecordAudio && !fRecordVideo) + m_pComboBoxCaptureMode->setCurrentIndex(static_cast(UIDataSettingsMachineDisplay::RecordingMode_AudioOnly)); else - m_pComboBoxCaptureMode->setCurrentIndex(static_cast(UIDataSettingsMachineDisplay::CaptureMode_VideoOnly)); - - m_pSliderAudioCaptureQuality->setValue(UIDataSettingsMachineDisplay::getAudioQualityFromOptions(oldDisplayData.m_strVideoCaptureOptions)); + m_pComboBoxCaptureMode->setCurrentIndex(static_cast(UIDataSettingsMachineDisplay::RecordingMode_VideoOnly)); + + m_pSliderAudioCaptureQuality->setValue(UIDataSettingsMachineDisplay::getAudioQualityFromOptions(oldDisplayData.m_strRecordingVideoOptions)); /* Polish page finally: */ @@ -500,20 +500,20 @@ } - /* Gather new 'Video Capture' data: */ - newDisplayData.m_fVideoCaptureEnabled = m_pCheckboxVideoCapture->isChecked(); - newDisplayData.m_strVideoCaptureFolder = m_pCache->base().m_strVideoCaptureFolder; - newDisplayData.m_strVideoCaptureFilePath = m_pEditorVideoCapturePath->path(); - newDisplayData.m_iVideoCaptureFrameWidth = m_pEditorVideoCaptureWidth->value(); - newDisplayData.m_iVideoCaptureFrameHeight = m_pEditorVideoCaptureHeight->value(); - newDisplayData.m_iVideoCaptureFrameRate = m_pEditorVideoCaptureFrameRate->value(); - newDisplayData.m_iVideoCaptureBitRate = m_pEditorVideoCaptureBitRate->value(); - newDisplayData.m_screens = m_pScrollerVideoCaptureScreens->value(); - - /* Update video capture options */ + /* Gather new 'Recording' data: */ + newDisplayData.m_fRecordingEnabled = m_pCheckboxVideoCapture->isChecked(); + newDisplayData.m_strRecordingFolder = m_pCache->base().m_strRecordingFolder; + newDisplayData.m_strRecordingFilePath = m_pEditorVideoCapturePath->path(); + newDisplayData.m_iRecordingVideoFrameWidth = m_pEditorVideoCaptureWidth->value(); + newDisplayData.m_iRecordingVideoFrameHeight = m_pEditorVideoCaptureHeight->value(); + newDisplayData.m_iRecordingVideoFrameRate = m_pEditorVideoCaptureFrameRate->value(); + newDisplayData.m_iRecordingVideoBitRate = m_pEditorVideoCaptureBitRate->value(); + newDisplayData.m_vecRecordingScreens = m_pScrollerVideoCaptureScreens->value(); + + /* Update recording options */ QStringList optionValues; - optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::CaptureMode_VideoAudio) || - m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::CaptureMode_VideoOnly)) ? "true" : "false"); - optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::CaptureMode_VideoAudio) || - m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::CaptureMode_AudioOnly)) ? "true" : "false"); + optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::RecordingMode_VideoAudio) || + m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::RecordingMode_VideoOnly)) ? "true" : "false"); + optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::RecordingMode_VideoAudio) || + m_pComboBoxCaptureMode->currentIndex() == static_cast(UIDataSettingsMachineDisplay::RecordingMode_AudioOnly)) ? "true" : "false"); if (m_pSliderAudioCaptureQuality->value() == 1) optionValues.push_back("low"); @@ -523,11 +523,11 @@ optionValues.push_back("high"); - QVector videoCaptureOptionVector; - videoCaptureOptionVector.push_back(UIDataSettingsMachineDisplay::VideoCaptureOption_VC); - videoCaptureOptionVector.push_back(UIDataSettingsMachineDisplay::VideoCaptureOption_AC); - videoCaptureOptionVector.push_back(UIDataSettingsMachineDisplay::VideoCaptureOption_AC_Profile); - - newDisplayData.m_strVideoCaptureOptions = UIDataSettingsMachineDisplay::setVideoCaptureOptions(m_pCache->base().m_strVideoCaptureOptions, - videoCaptureOptionVector, + QVector recordingOptionsVector; + recordingOptionsVector.push_back(UIDataSettingsMachineDisplay::RecordingOption_VC); + recordingOptionsVector.push_back(UIDataSettingsMachineDisplay::RecordingOption_AC); + recordingOptionsVector.push_back(UIDataSettingsMachineDisplay::RecordingOption_AC_Profile); + + newDisplayData.m_strRecordingVideoOptions = UIDataSettingsMachineDisplay::setRecordingOptions(m_pCache->base().m_strRecordingVideoOptions, + recordingOptionsVector, optionValues); @@ -688,5 +688,5 @@ setTabOrder(m_pEditorRemoteDisplayTimeout, m_pCheckboxMultipleConn); - /* Video Capture tab-order: */ + /* Recording tab-order: */ setTabOrder(m_pCheckboxMultipleConn, m_pCheckboxVideoCapture); setTabOrder(m_pCheckboxVideoCapture, m_pEditorVideoCapturePath); @@ -718,5 +718,5 @@ m_pComboRemoteDisplayAuthMethod->setItemText(2, gpConverter->toString(KAuthType_Guest)); - /* Video Capture stuff: */ + /* Recording stuff: */ m_pEditorVideoCaptureFrameRate->setSuffix(QString(" %1").arg(tr("fps"))); m_pEditorVideoCaptureBitRate->setSuffix(QString(" %1").arg(tr("kbps"))); @@ -730,5 +730,5 @@ m_pLabelAudioCaptureQualityMed->setText(tr("medium", "quality")); m_pLabelAudioCaptureQualityMax->setText(tr("high", "quality")); - updateVideoCaptureFileSizeHint(); + updateRecordingFileSizeHint(); } @@ -765,7 +765,7 @@ m_pCheckboxMultipleConn->setEnabled(isMachineOffline() || isMachineSaved()); - /* Polish 'Video Capture' availability: */ + /* Polish 'Recording' availability: */ m_pContainerVideoCapture->setEnabled(isMachineInValidMode()); - sltHandleVideoCaptureCheckboxToggle(); + sltHandleRecordingCheckboxToggle(); } @@ -802,5 +802,5 @@ checkVRAMRequirements(); - /* Update Video Capture tab screen count: */ + /* Update recording tab screen count: */ updateGuestScreenCount(); @@ -819,5 +819,5 @@ checkVRAMRequirements(); - /* Update Video Capture tab screen count: */ + /* Update recording tab screen count: */ updateGuestScreenCount(); @@ -826,22 +826,22 @@ } -void UIMachineSettingsDisplay::sltHandleVideoCaptureCheckboxToggle() -{ - /* Video Capture options should be enabled only if: +void UIMachineSettingsDisplay::sltHandleRecordingCheckboxToggle() +{ + /* Recording options should be enabled only if: * 1. Machine is in 'offline' or 'saved' state and check-box is checked, * 2. Machine is in 'online' state, check-box is checked, and video recording is *disabled* currently. */ - const bool fIsVideoCaptureOptionsEnabled = ((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) || - (isMachineOnline() && !m_pCache->base().m_fVideoCaptureEnabled && m_pCheckboxVideoCapture->isChecked()); - - m_pLabelCaptureMode->setEnabled(fIsVideoCaptureOptionsEnabled); - m_pComboBoxCaptureMode->setEnabled(fIsVideoCaptureOptionsEnabled); - - m_pLabelVideoCapturePath->setEnabled(fIsVideoCaptureOptionsEnabled); - m_pEditorVideoCapturePath->setEnabled(fIsVideoCaptureOptionsEnabled); - - enableDisableCaptureWidgets(); -} - -void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameSizeComboboxChange() + const bool fIsRecordingOptionsEnabled = ((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) || + (isMachineOnline() && !m_pCache->base().m_fRecordingEnabled && m_pCheckboxVideoCapture->isChecked()); + + m_pLabelCaptureMode->setEnabled(fIsRecordingOptionsEnabled); + m_pComboBoxCaptureMode->setEnabled(fIsRecordingOptionsEnabled); + + m_pLabelVideoCapturePath->setEnabled(fIsRecordingOptionsEnabled); + m_pEditorVideoCapturePath->setEnabled(fIsRecordingOptionsEnabled); + + enableDisableRecordingWidgets(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingVideoFrameSizeComboboxChange() { /* Get the proposed size: */ @@ -858,21 +858,21 @@ } -void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameWidthEditorChange() +void UIMachineSettingsDisplay::sltHandleRecordingVideoFrameWidthEditorChange() { /* Look for preset: */ lookForCorrespondingFrameSizePreset(); /* Update quality and bit-rate: */ - sltHandleVideoCaptureQualitySliderChange(); -} - -void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameHeightEditorChange() + sltHandleRecordingVideoQualitySliderChange(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingVideoFrameHeightEditorChange() { /* Look for preset: */ lookForCorrespondingFrameSizePreset(); /* Update quality and bit-rate: */ - sltHandleVideoCaptureQualitySliderChange(); -} - -void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameRateSliderChange() + sltHandleRecordingVideoQualitySliderChange(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingVideoFrameRateSliderChange() { /* Apply proposed frame-rate: */ @@ -881,8 +881,8 @@ m_pEditorVideoCaptureFrameRate->blockSignals(false); /* Update quality and bit-rate: */ - sltHandleVideoCaptureQualitySliderChange(); -} - -void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameRateEditorChange() + sltHandleRecordingVideoQualitySliderChange(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingVideoFrameRateEditorChange() { /* Apply proposed frame-rate: */ @@ -891,8 +891,8 @@ m_pSliderVideoCaptureFrameRate->blockSignals(false); /* Update quality and bit-rate: */ - sltHandleVideoCaptureQualitySliderChange(); -} - -void UIMachineSettingsDisplay::sltHandleVideoCaptureQualitySliderChange() + sltHandleRecordingVideoQualitySliderChange(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingVideoQualitySliderChange() { /* Calculate/apply proposed bit-rate: */ @@ -903,8 +903,8 @@ m_pSliderVideoCaptureQuality->value())); m_pEditorVideoCaptureBitRate->blockSignals(false); - updateVideoCaptureFileSizeHint(); -} - -void UIMachineSettingsDisplay::sltHandleVideoCaptureBitRateEditorChange() + updateRecordingFileSizeHint(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingVideoBitRateEditorChange() { /* Calculate/apply proposed quality: */ @@ -915,10 +915,10 @@ m_pEditorVideoCaptureBitRate->value())); m_pSliderVideoCaptureQuality->blockSignals(false); - updateVideoCaptureFileSizeHint(); -} - -void UIMachineSettingsDisplay::sltHandleCaptureComboBoxChange() -{ - enableDisableCaptureWidgets(); + updateRecordingFileSizeHint(); +} + +void UIMachineSettingsDisplay::sltHandleRecordingComboBoxChange() +{ + enableDisableRecordingWidgets(); } @@ -938,6 +938,6 @@ /* Prepare 'Remote Display' tab: */ prepareTabRemoteDisplay(); - /* Prepare 'Video Capture' tab: */ - prepareTabVideoCapture(); + /* Prepare 'Recording' tab: */ + prepareTabRecording(); /* Prepare connections: */ prepareConnections(); @@ -1045,5 +1045,5 @@ } -void UIMachineSettingsDisplay::prepareTabVideoCapture() +void UIMachineSettingsDisplay::prepareTabRecording() { /* Tab and it's layout created in the .ui file. */ @@ -1052,7 +1052,7 @@ AssertPtrReturnVoid(m_pComboBoxCaptureMode); { - m_pComboBoxCaptureMode->insertItem(UIDataSettingsMachineDisplay::CaptureMode_VideoAudio, "Video/Audio"); - m_pComboBoxCaptureMode->insertItem(UIDataSettingsMachineDisplay::CaptureMode_VideoOnly, "Video Only"); - m_pComboBoxCaptureMode->insertItem(UIDataSettingsMachineDisplay::CaptureMode_AudioOnly, "Audio Only"); + m_pComboBoxCaptureMode->insertItem(UIDataSettingsMachineDisplay::RecordingMode_VideoAudio, "Video/Audio"); + m_pComboBoxCaptureMode->insertItem(UIDataSettingsMachineDisplay::RecordingMode_VideoOnly, "Video Only"); + m_pComboBoxCaptureMode->insertItem(UIDataSettingsMachineDisplay::RecordingMode_AudioOnly, "Audio Only"); } @@ -1195,16 +1195,16 @@ connect(m_pEditorRemoteDisplayTimeout, SIGNAL(textChanged(const QString &)), this, SLOT(revalidate())); - /* Configure 'Video Capture' connections: */ - connect(m_pCheckboxVideoCapture, SIGNAL(toggled(bool)), this, SLOT(sltHandleVideoCaptureCheckboxToggle())); - connect(m_pComboVideoCaptureSize, SIGNAL(currentIndexChanged(int)), this, SLOT(sltHandleVideoCaptureFrameSizeComboboxChange())); - connect(m_pEditorVideoCaptureWidth, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameWidthEditorChange())); - connect(m_pEditorVideoCaptureHeight, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameHeightEditorChange())); - connect(m_pSliderVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameRateSliderChange())); - connect(m_pEditorVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameRateEditorChange())); - connect(m_pSliderVideoCaptureQuality, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureQualitySliderChange())); - connect(m_pEditorVideoCaptureBitRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureBitRateEditorChange())); + /* Configure 'Recording' connections: */ + connect(m_pCheckboxVideoCapture, SIGNAL(toggled(bool)), this, SLOT(sltHandleRecordingCheckboxToggle())); + connect(m_pComboVideoCaptureSize, SIGNAL(currentIndexChanged(int)), this, SLOT(sltHandleRecordingVideoFrameSizeComboboxChange())); + connect(m_pEditorVideoCaptureWidth, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameWidthEditorChange())); + connect(m_pEditorVideoCaptureHeight, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameHeightEditorChange())); + connect(m_pSliderVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameRateSliderChange())); + connect(m_pEditorVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoFrameRateEditorChange())); + connect(m_pSliderVideoCaptureQuality, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoQualitySliderChange())); + connect(m_pEditorVideoCaptureBitRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleRecordingVideoBitRateEditorChange())); connect(m_pComboBoxCaptureMode, static_cast(&QComboBox::currentIndexChanged), - this, &UIMachineSettingsDisplay::sltHandleCaptureComboBoxChange); + this, &UIMachineSettingsDisplay::sltHandleRecordingComboBoxChange); } @@ -1305,5 +1305,5 @@ { /* Update copy of the cached item to get the desired result: */ - QVector screens = m_pCache->base().m_screens; + QVector screens = m_pCache->base().m_vecRecordingScreens; screens.resize(m_pEditorVideoScreenCount->value()); m_pScrollerVideoCaptureScreens->setValue(screens); @@ -1311,5 +1311,5 @@ } -void UIMachineSettingsDisplay::updateVideoCaptureFileSizeHint() +void UIMachineSettingsDisplay::updateRecordingFileSizeHint() { m_pLabelVideoCaptureSizeHint->setText(tr("About %1MB per 5 minute video").arg(m_pEditorVideoCaptureBitRate->value() * 300 / 8 / 1024)); @@ -1366,5 +1366,5 @@ /* Save 'Video Capture' data from the cache: */ if (fSuccess) - fSuccess = saveVideoCaptureData(); + fSuccess = saveRecordingData(); } /* Return result: */ @@ -1496,9 +1496,9 @@ } -bool UIMachineSettingsDisplay::saveVideoCaptureData() +bool UIMachineSettingsDisplay::saveRecordingData() { /* Prepare result: */ bool fSuccess = true; - /* Save 'Video Capture' data from the cache: */ + /* Save 'Recording' data from the cache: */ if (fSuccess) { @@ -1508,151 +1508,151 @@ const UIDataSettingsMachineDisplay &newDisplayData = m_pCache->data(); - CCaptureSettings captureSettings = m_machine.GetCaptureSettings(); - - /* Save new 'Video Capture' data for online case: */ + CCaptureSettings recordingSettings = m_machine.GetCaptureSettings(); + + /* Save new 'Recording' data for online case: */ if (isMachineOnline()) { - /* If 'Video Capture' was *enabled*: */ - if (oldDisplayData.m_fVideoCaptureEnabled) + /* If 'Recording' was *enabled*: */ + if (oldDisplayData.m_fRecordingEnabled) { - /* Save whether capture is enabled: */ - if (fSuccess && newDisplayData.m_fVideoCaptureEnabled != oldDisplayData.m_fVideoCaptureEnabled) + /* Save whether recording is enabled: */ + if (fSuccess && newDisplayData.m_fRecordingEnabled != oldDisplayData.m_fRecordingEnabled) { - captureSettings.SetEnabled(newDisplayData.m_fVideoCaptureEnabled); - fSuccess = captureSettings.isOk(); + recordingSettings.SetEnabled(newDisplayData.m_fRecordingEnabled); + fSuccess = recordingSettings.isOk(); } // We can still save the *screens* option. - /* Save video capture screens: */ - if (fSuccess && newDisplayData.m_screens != oldDisplayData.m_screens) + /* Save recording screens: */ + if (fSuccess && newDisplayData.m_vecRecordingScreens != oldDisplayData.m_vecRecordingScreens) { - CCaptureScreenSettingsVector captureScreenSettingsVector = captureSettings.GetScreens(); + CCaptureScreenSettingsVector captureScreenSettingsVector = recordingSettings.GetScreens(); for (int iScreenIndex = 0; fSuccess && iScreenIndex < captureScreenSettingsVector.size(); ++iScreenIndex) { - CCaptureScreenSettings captureScreenSettings = captureScreenSettingsVector.at(iScreenIndex); - captureScreenSettings.SetEnabled(newDisplayData.m_screens[iScreenIndex]); - fSuccess = captureScreenSettings.isOk(); + CCaptureScreenSettings recordingScreenSettings = captureScreenSettingsVector.at(iScreenIndex); + recordingScreenSettings.SetEnabled(newDisplayData.m_vecRecordingScreens[iScreenIndex]); + fSuccess = recordingScreenSettings.isOk(); } } } - /* If 'Video Capture' was *disabled*: */ + /* If 'Recording' was *disabled*: */ else { - /* Save whether capture is enabled: */ - if (fSuccess && newDisplayData.m_fVideoCaptureEnabled != oldDisplayData.m_fVideoCaptureEnabled) + /* Save whether recording is enabled: */ + if (fSuccess && newDisplayData.m_fRecordingEnabled != oldDisplayData.m_fRecordingEnabled) { - captureSettings.SetEnabled(newDisplayData.m_fVideoCaptureEnabled); - fSuccess = captureSettings.isOk(); + recordingSettings.SetEnabled(newDisplayData.m_fRecordingEnabled); + fSuccess = recordingSettings.isOk(); } - CCaptureScreenSettingsVector captureScreenSettingsVector = captureSettings.GetScreens(); - for (int iScreenIndex = 0; fSuccess && iScreenIndex < captureScreenSettingsVector.size(); ++iScreenIndex) + CCaptureScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens(); + for (int iScreenIndex = 0; fSuccess && iScreenIndex < recordingScreenSettingsVector.size(); ++iScreenIndex) { - CCaptureScreenSettings captureScreenSettings = captureScreenSettingsVector.at(iScreenIndex); - - // We should save all the options *before* 'Video Capture' activation. - // And finally we should *enable* Video Capture if necessary. - /* Save video capture file path: */ - if (fSuccess && newDisplayData.m_strVideoCaptureFilePath != oldDisplayData.m_strVideoCaptureFilePath) + CCaptureScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex); + + // We should save all the options *before* 'Recording' activation. + // And finally we should *enable* Recording if necessary. + /* Save recording file path: */ + if (fSuccess && newDisplayData.m_strRecordingFilePath != oldDisplayData.m_strRecordingFilePath) { - captureScreenSettings.SetFileName(newDisplayData.m_strVideoCaptureFilePath); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetFileName(newDisplayData.m_strRecordingFilePath); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame width: */ - if (fSuccess && newDisplayData.m_iVideoCaptureFrameWidth != oldDisplayData.m_iVideoCaptureFrameWidth) + /* Save recording frame width: */ + if (fSuccess && newDisplayData.m_iRecordingVideoFrameWidth != oldDisplayData.m_iRecordingVideoFrameWidth) { - captureScreenSettings.SetVideoWidth(newDisplayData.m_iVideoCaptureFrameWidth); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoWidth(newDisplayData.m_iRecordingVideoFrameWidth); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame height: */ - if (fSuccess && newDisplayData.m_iVideoCaptureFrameHeight != oldDisplayData.m_iVideoCaptureFrameHeight) + /* Save recording frame height: */ + if (fSuccess && newDisplayData.m_iRecordingVideoFrameHeight != oldDisplayData.m_iRecordingVideoFrameHeight) { - captureScreenSettings.SetVideoHeight(newDisplayData.m_iVideoCaptureFrameHeight); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoHeight(newDisplayData.m_iRecordingVideoFrameHeight); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame rate: */ - if (fSuccess && newDisplayData.m_iVideoCaptureFrameRate != oldDisplayData.m_iVideoCaptureFrameRate) + /* Save recording frame rate: */ + if (fSuccess && newDisplayData.m_iRecordingVideoFrameRate != oldDisplayData.m_iRecordingVideoFrameRate) { - captureScreenSettings.SetVideoFPS(newDisplayData.m_iVideoCaptureFrameRate); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoFPS(newDisplayData.m_iRecordingVideoFrameRate); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame bit rate: */ - if (fSuccess && newDisplayData.m_iVideoCaptureBitRate != oldDisplayData.m_iVideoCaptureBitRate) + /* Save recording frame bit rate: */ + if (fSuccess && newDisplayData.m_iRecordingVideoBitRate != oldDisplayData.m_iRecordingVideoBitRate) { - captureScreenSettings.SetVideoRate(newDisplayData.m_iVideoCaptureBitRate); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoRate(newDisplayData.m_iRecordingVideoBitRate); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture screens: */ - if (fSuccess && newDisplayData.m_screens != oldDisplayData.m_screens) + /* Save recording screens: */ + if (fSuccess && newDisplayData.m_vecRecordingScreens != oldDisplayData.m_vecRecordingScreens) { - captureScreenSettings.SetEnabled(newDisplayData.m_screens[iScreenIndex]); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetEnabled(newDisplayData.m_vecRecordingScreens[iScreenIndex]); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture options: */ - if (fSuccess && newDisplayData.m_strVideoCaptureOptions != oldDisplayData.m_strVideoCaptureOptions) + /* Save recording options: */ + if (fSuccess && newDisplayData.m_strRecordingVideoOptions != oldDisplayData.m_strRecordingVideoOptions) { - captureScreenSettings.SetOptions(newDisplayData.m_strVideoCaptureOptions); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetOptions(newDisplayData.m_strRecordingVideoOptions); + fSuccess = recordingScreenSettings.isOk(); } } } } - /* Save new 'Video Capture' data for offline case: */ + /* Save new 'Recording' data for offline case: */ else { // For 'offline', 'powered off' and 'saved' states the order is irrelevant. - /* Save whether video capture is enabled: */ - if (fSuccess && newDisplayData.m_fVideoCaptureEnabled != oldDisplayData.m_fVideoCaptureEnabled) + /* Save whether recording is enabled: */ + if (fSuccess && newDisplayData.m_fRecordingEnabled != oldDisplayData.m_fRecordingEnabled) { - captureSettings.SetEnabled(newDisplayData.m_fVideoCaptureEnabled); - fSuccess = captureSettings.isOk(); + recordingSettings.SetEnabled(newDisplayData.m_fRecordingEnabled); + fSuccess = recordingSettings.isOk(); } - CCaptureScreenSettingsVector captureScreenSettingsVector = captureSettings.GetScreens(); - for (int iScreenIndex = 0; fSuccess && iScreenIndex < captureScreenSettingsVector.size(); ++iScreenIndex) + CCaptureScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens(); + for (int iScreenIndex = 0; fSuccess && iScreenIndex < recordingScreenSettingsVector.size(); ++iScreenIndex) { - CCaptureScreenSettings captureScreenSettings = captureScreenSettingsVector.at(iScreenIndex); - - /* Save video capture file path: */ - if (fSuccess && newDisplayData.m_strVideoCaptureFilePath != oldDisplayData.m_strVideoCaptureFilePath) + CCaptureScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex); + + /* Save recording file path: */ + if (fSuccess && newDisplayData.m_strRecordingFilePath != oldDisplayData.m_strRecordingFilePath) { - captureScreenSettings.SetFileName(newDisplayData.m_strVideoCaptureFilePath); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetFileName(newDisplayData.m_strRecordingFilePath); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame width: */ - if (fSuccess && newDisplayData.m_iVideoCaptureFrameWidth != oldDisplayData.m_iVideoCaptureFrameWidth) + /* Save recording frame width: */ + if (fSuccess && newDisplayData.m_iRecordingVideoFrameWidth != oldDisplayData.m_iRecordingVideoFrameWidth) { - captureScreenSettings.SetVideoWidth(newDisplayData.m_iVideoCaptureFrameWidth); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoWidth(newDisplayData.m_iRecordingVideoFrameWidth); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame height: */ - if (fSuccess && newDisplayData.m_iVideoCaptureFrameHeight != oldDisplayData.m_iVideoCaptureFrameHeight) + /* Save recording frame height: */ + if (fSuccess && newDisplayData.m_iRecordingVideoFrameHeight != oldDisplayData.m_iRecordingVideoFrameHeight) { - captureScreenSettings.SetVideoHeight(newDisplayData.m_iVideoCaptureFrameHeight); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoHeight(newDisplayData.m_iRecordingVideoFrameHeight); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame rate: */ - if (fSuccess && newDisplayData.m_iVideoCaptureFrameRate != oldDisplayData.m_iVideoCaptureFrameRate) + /* Save recording frame rate: */ + if (fSuccess && newDisplayData.m_iRecordingVideoFrameRate != oldDisplayData.m_iRecordingVideoFrameRate) { - captureScreenSettings.SetVideoFPS(newDisplayData.m_iVideoCaptureFrameRate); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoFPS(newDisplayData.m_iRecordingVideoFrameRate); + fSuccess = recordingScreenSettings.isOk(); } - /* Save video capture frame bit rate: */ - if (fSuccess && newDisplayData.m_iVideoCaptureBitRate != oldDisplayData.m_iVideoCaptureBitRate) + /* Save recording frame bit rate: */ + if (fSuccess && newDisplayData.m_iRecordingVideoBitRate != oldDisplayData.m_iRecordingVideoBitRate) { - captureScreenSettings.SetVideoRate(newDisplayData.m_iVideoCaptureBitRate); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetVideoRate(newDisplayData.m_iRecordingVideoBitRate); + fSuccess = recordingScreenSettings.isOk(); } /* Save capture options: */ - if (fSuccess && newDisplayData.m_strVideoCaptureOptions != oldDisplayData.m_strVideoCaptureOptions) + if (fSuccess && newDisplayData.m_strRecordingVideoOptions != oldDisplayData.m_strRecordingVideoOptions) { - captureScreenSettings.SetOptions(newDisplayData.m_strVideoCaptureOptions); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetOptions(newDisplayData.m_strRecordingVideoOptions); + fSuccess = recordingScreenSettings.isOk(); } /* Save screen enabled state: */ - if (fSuccess && newDisplayData.m_screens != oldDisplayData.m_screens) + if (fSuccess && newDisplayData.m_vecRecordingScreens != oldDisplayData.m_vecRecordingScreens) { - captureScreenSettings.SetEnabled(newDisplayData.m_screens[iScreenIndex]); - fSuccess = captureScreenSettings.isOk(); + recordingScreenSettings.SetEnabled(newDisplayData.m_vecRecordingScreens[iScreenIndex]); + fSuccess = recordingScreenSettings.isOk(); } } @@ -1667,14 +1667,14 @@ } -void UIMachineSettingsDisplay::enableDisableCaptureWidgets() -{ - /* Video Capture options should be enabled only if: +void UIMachineSettingsDisplay::enableDisableRecordingWidgets() +{ + /* Recording options should be enabled only if: * 1. Machine is in 'offline' or 'saved' state and check-box is checked, * 2. Machine is in 'online' state, check-box is checked, and video recording is *disabled* currently. */ - const bool fIsVideoCaptureOptionsEnabled = ((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) || - (isMachineOnline() && !m_pCache->base().m_fVideoCaptureEnabled && m_pCheckboxVideoCapture->isChecked()); - - const UIDataSettingsMachineDisplay::CaptureMode enmCaptureMode = - static_cast(m_pComboBoxCaptureMode->currentIndex()); + const bool fIsRecordingOptionsEnabled = ((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) || + (isMachineOnline() && !m_pCache->base().m_fRecordingEnabled && m_pCheckboxVideoCapture->isChecked()); + + const UIDataSettingsMachineDisplay::RecordingMode enmRecordingMode = + static_cast(m_pComboBoxCaptureMode->currentIndex()); /* Video Capture Screens option should be enabled only if: @@ -1682,27 +1682,27 @@ const bool fIsVideoCaptureScreenOptionEnabled = isMachineInValidMode() && m_pCheckboxVideoCapture->isChecked(); - bool fVideoCapture = enmCaptureMode == UIDataSettingsMachineDisplay::CaptureMode_VideoOnly || - enmCaptureMode == UIDataSettingsMachineDisplay::CaptureMode_VideoAudio; - bool fAudioCapture = enmCaptureMode == UIDataSettingsMachineDisplay::CaptureMode_AudioOnly || - enmCaptureMode == UIDataSettingsMachineDisplay::CaptureMode_VideoAudio; - - m_pLabelVideoCaptureSize->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pComboVideoCaptureSize->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pEditorVideoCaptureWidth->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pEditorVideoCaptureHeight->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - - m_pLabelVideoCaptureFrameRate->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pContainerSliderVideoCaptureFrameRate->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pEditorVideoCaptureFrameRate->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - - m_pLabelVideoCaptureRate->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pContainerSliderVideoCaptureQuality->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pEditorVideoCaptureBitRate->setEnabled(fIsVideoCaptureOptionsEnabled && fVideoCapture); - m_pScrollerVideoCaptureScreens->setEnabled(fIsVideoCaptureScreenOptionEnabled && fVideoCapture); - - m_pAudioCaptureQualityLabel->setEnabled(fIsVideoCaptureOptionsEnabled && fAudioCapture); - m_pContainerSliderAudioCaptureQuality->setEnabled(fIsVideoCaptureOptionsEnabled && fAudioCapture); - - m_pLabelVideoCaptureScreens->setEnabled(fIsVideoCaptureScreenOptionEnabled && fVideoCapture); - m_pLabelVideoCaptureSizeHint->setEnabled(fIsVideoCaptureScreenOptionEnabled && fVideoCapture); -} + bool fRecordVideo = enmRecordingMode == UIDataSettingsMachineDisplay::RecordingMode_VideoOnly || + enmRecordingMode == UIDataSettingsMachineDisplay::RecordingMode_VideoAudio; + bool fRecordAudio = enmRecordingMode == UIDataSettingsMachineDisplay::RecordingMode_AudioOnly || + enmRecordingMode == UIDataSettingsMachineDisplay::RecordingMode_VideoAudio; + + m_pLabelVideoCaptureSize->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pComboVideoCaptureSize->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pEditorVideoCaptureWidth->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pEditorVideoCaptureHeight->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + + m_pLabelVideoCaptureFrameRate->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pContainerSliderVideoCaptureFrameRate->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pEditorVideoCaptureFrameRate->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + + m_pLabelVideoCaptureRate->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pContainerSliderVideoCaptureQuality->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pEditorVideoCaptureBitRate->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo); + m_pScrollerVideoCaptureScreens->setEnabled(fIsVideoCaptureScreenOptionEnabled && fRecordVideo); + + m_pAudioCaptureQualityLabel->setEnabled(fIsRecordingOptionsEnabled && fRecordAudio); + m_pContainerSliderAudioCaptureQuality->setEnabled(fIsRecordingOptionsEnabled && fRecordAudio); + + m_pLabelVideoCaptureScreens->setEnabled(fIsVideoCaptureScreenOptionEnabled && fRecordVideo); + m_pLabelVideoCaptureSizeHint->setEnabled(fIsVideoCaptureScreenOptionEnabled && fRecordVideo); +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h (revision 75291) @@ -94,21 +94,21 @@ void sltHandleGuestScreenCountEditorChange(); - /** Handles Video Capture toggle. */ - void sltHandleVideoCaptureCheckboxToggle(); - /** Handles Video Capture frame size change. */ - void sltHandleVideoCaptureFrameSizeComboboxChange(); - /** Handles Video Capture frame width change. */ - void sltHandleVideoCaptureFrameWidthEditorChange(); - /** Handles Video Capture frame height change. */ - void sltHandleVideoCaptureFrameHeightEditorChange(); - /** Handles Video Capture frame rate slider change. */ - void sltHandleVideoCaptureFrameRateSliderChange(); - /** Handles Video Capture frame rate editor change. */ - void sltHandleVideoCaptureFrameRateEditorChange(); - /** Handles Video Capture quality slider change. */ - void sltHandleVideoCaptureQualitySliderChange(); - /** Handles Video Capture bit-rate editor change. */ - void sltHandleVideoCaptureBitRateEditorChange(); - void sltHandleCaptureComboBoxChange(); + /** Handles recording toggle. */ + void sltHandleRecordingCheckboxToggle(); + /** Handles recording frame size change. */ + void sltHandleRecordingVideoFrameSizeComboboxChange(); + /** Handles recording frame width change. */ + void sltHandleRecordingVideoFrameWidthEditorChange(); + /** Handles recording frame height change. */ + void sltHandleRecordingVideoFrameHeightEditorChange(); + /** Handles recording frame rate slider change. */ + void sltHandleRecordingVideoFrameRateSliderChange(); + /** Handles recording frame rate editor change. */ + void sltHandleRecordingVideoFrameRateEditorChange(); + /** Handles recording quality slider change. */ + void sltHandleRecordingVideoQualitySliderChange(); + /** Handles recording bit-rate editor change. */ + void sltHandleRecordingVideoBitRateEditorChange(); + void sltHandleRecordingComboBoxChange(); private: @@ -120,6 +120,6 @@ /** Prepares 'Remote Display' tab. */ void prepareTabRemoteDisplay(); - /** Prepares 'Video Capture' tab. */ - void prepareTabVideoCapture(); + /** Prepares 'Recording' tab. */ + void prepareTabRecording(); /** Prepares connections. */ void prepareConnections(); @@ -138,11 +138,11 @@ /** Updates guest-screen count. */ void updateGuestScreenCount(); - /** Updates video capture file size hint. */ - void updateVideoCaptureFileSizeHint(); + /** Updates recording file size hint. */ + void updateRecordingFileSizeHint(); /** Searches for the @a data field in corresponding @a pComboBox. */ static void lookForCorrespondingPreset(QComboBox *pComboBox, const QVariant &data); - /** Calculates Video Capture bit-rate for passed @a iFrameWidth, @a iFrameHeight, @a iFrameRate and @a iQuality. */ + /** Calculates recording video bit-rate for passed @a iFrameWidth, @a iFrameHeight, @a iFrameRate and @a iQuality. */ static int calculateBitRate(int iFrameWidth, int iFrameHeight, int iFrameRate, int iQuality); - /** Calculates Video Capture quality for passed @a iFrameWidth, @a iFrameHeight, @a iFrameRate and @a iBitRate. */ + /** Calculates recording video quality for passed @a iFrameWidth, @a iFrameHeight, @a iFrameRate and @a iBitRate. */ static int calculateQuality(int iFrameWidth, int iFrameHeight, int iFrameRate, int iBitRate); /** Saves existing display data from the cache. */ @@ -152,8 +152,8 @@ /** Saves existing 'Remote Display' data from the cache. */ bool saveRemoteDisplayData(); - /** Saves existing 'Video Capture' data from the cache. */ - bool saveVideoCaptureData(); - /** Decide which of the capture related widgets are to be disabled/enabled. */ - void enableDisableCaptureWidgets(); + /** Saves existing 'Recording' data from the cache. */ + bool saveRecordingData(); + /** Decide which of the recording related widgets are to be disabled/enabled. */ + void enableDisableRecordingWidgets(); /** Holds the guest OS type ID. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp (revision 75291) @@ -1371,21 +1371,21 @@ } - /* Video Capture: */ - QStringList aVideoCaptureReport = videoCaptureReport(comMachine); - QStringList aVideoCaptureReportOld = videoCaptureReport(comMachineOld); - if (!aVideoCaptureReport.isEmpty()) - { - ++iRowCount; - strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Video Capture File", "details (display/video capture)"), - empReport(aVideoCaptureReport.value(0), aVideoCaptureReportOld.value(0))); - ++iRowCount; - strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Video Capture Attributes", "details (display/video capture)"), - empReport(aVideoCaptureReport.value(1), aVideoCaptureReportOld.value(1))); + /* Recording: */ + QStringList aRecordingReport = recordingReport(comMachine); + QStringList aRecordingReportOld = recordingReport(comMachineOld); + if (!aRecordingReport.isEmpty()) + { + ++iRowCount; + strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Recording File", "details (display/video capture)"), + empReport(aRecordingReport.value(0), aRecordingReportOld.value(0))); + ++iRowCount; + strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Recording Attributes", "details (display/video capture)"), + empReport(aRecordingReport.value(1), aRecordingReportOld.value(1))); } else { ++iRowCount; - strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Video Capture", "details (display/video capture)"), - empReport(QApplication::translate("UIGDetails", "Disabled", "details (display/video capture)"), aVideoCaptureReportOld.isEmpty())); + strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Recording", "details (display/video capture)"), + empReport(QApplication::translate("UIGDetails", "Disabled", "details (display/video capture)"), aRecordingReportOld.isEmpty())); } @@ -1743,22 +1743,22 @@ /* static */ -QStringList UISnapshotDetailsWidget::videoCaptureReport(CMachine comMachine) +QStringList UISnapshotDetailsWidget::recordingReport(CMachine comMachine) { /* Prepare report: */ QStringList aReport; - /* Acquire capture status: */ - CCaptureSettings captureSettings = comMachine.GetCaptureSettings(); + /* Acquire recording status: */ + CCaptureSettings recordingSettings = comMachine.GetCaptureSettings(); /* For now all screens have the same config: */ - CCaptureScreenSettings captureScreen0Settings = captureSettings.GetScreenSettings(0); - if (captureScreen0Settings.GetEnabled()) - { - /* Video Capture File: */ - aReport << captureScreen0Settings.GetFileName(); - /* Video Capture Attributes: */ + CCaptureScreenSettings recordingScreen0Settings = recordingSettings.GetScreenSettings(0); + if (recordingScreen0Settings.GetEnabled()) + { + /* Recording ile: */ + aReport << recordingScreen0Settings.GetFileName(); + /* Recording attributes: */ aReport << QApplication::translate("UIGDetails", "Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps") - .arg(captureScreen0Settings.GetVideoWidth()) - .arg(captureScreen0Settings.GetVideoHeight()) - .arg(captureScreen0Settings.GetVideoFPS()) - .arg(captureScreen0Settings.GetVideoRate()); + .arg(recordingScreen0Settings.GetVideoWidth()) + .arg(recordingScreen0Settings.GetVideoHeight()) + .arg(recordingScreen0Settings.GetVideoFPS()) + .arg(recordingScreen0Settings.GetVideoRate()); } /* Return report: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.h (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.h (revision 75291) @@ -162,6 +162,6 @@ /** Acquires @a comMachine VRDE server report. */ static QStringList vrdeServerReport(CMachine comMachine); - /** Acquires @a comMachine video capture report. */ - static QStringList videoCaptureReport(CMachine comMachine); + /** Acquires @a comMachine recording report. */ + static QStringList recordingReport(CMachine comMachine); /** Acquires @a comMachine storage report. */ static QPair > > storageReport(CMachine comMachine); Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp (revision 75290) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp (revision 75291) @@ -1304,5 +1304,5 @@ pMenu->addSeparator(); prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot)); - prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_M_Capture_T_Start)); + prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start)); prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)); pMenu->addSeparator();