Changeset 46536 in vbox for trunk

Timestamp:

Jun 13, 2013 2:55:11 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM settings: Display page: Video tab: Multi-screen support.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (10 diffs)
• src/settings/machine/UIMachineSettingsDisplay.h (modified) (4 diffs)
• src/settings/machine/UIMachineSettingsDisplay.ui (modified) (3 diffs)
• src/widgets/UIFilmContainer.cpp (added)
• src/widgets/UIFilmContainer.h (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -388 +388 @@
         src/widgets/UINameAndSystemEditor.h \
         src/widgets/VBoxWarningPane.h \
+        src/widgets/UIFilmContainer.h \
         src/widgets/graphics/UIGraphicsButton.h \
         src/widgets/graphics/UIGraphicsRotatorButton.h \
@@ -635 +636 @@
         src/widgets/UINameAndSystemEditor.cpp \
         src/widgets/VBoxWarningPane.cpp \
+        src/widgets/UIFilmContainer.cpp \
         src/widgets/graphics/UIGraphicsButton.cpp \
         src/widgets/graphics/UIGraphicsRotatorButton.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -121 +121 @@
     displayData.m_iVideoCaptureFrameRate = m_machine.GetVideoCaptureFps();
     displayData.m_iVideoCaptureBitRate = m_machine.GetVideoCaptureRate();
+    displayData.m_screens = m_machine.GetVideoCaptureScreens();
 
     /* Initialize other variables: */
@@ -167 +168 @@
     m_pEditorVideoCaptureFrameRate->setValue(displayData.m_iVideoCaptureFrameRate);
     m_pEditorVideoCaptureBitRate->setValue(displayData.m_iVideoCaptureBitRate);
+    m_pScrollerVideoCaptureScreens->setValue(displayData.m_screens);
 
     /* Polish page finally: */
@@ -209 +211 @@
     displayData.m_iVideoCaptureFrameRate = m_pEditorVideoCaptureFrameRate->value();
     displayData.m_iVideoCaptureBitRate = m_pEditorVideoCaptureBitRate->value();
+    displayData.m_screens = m_pScrollerVideoCaptureScreens->value();
 
     /* Cache display data: */
@@ -254 +257 @@
 
         /* Store Video Capture data: */
-        m_machine.SetVideoCaptureEnabled(displayData.m_fVideoCaptureEnabled);
-        /* Make sure machine is 'offline': */
-        if (isMachineOffline()) // TODO: Ask about isMachineSaved()
+        if (isMachineOnline())
         {
+            /* If Video Capture is *enabled* now: */
+            if (m_cache.base().m_fVideoCaptureEnabled)
+            {
+                /* All we can do is to *disable* it: */
+                if (!displayData.m_fVideoCaptureEnabled)
+                    m_machine.SetVideoCaptureEnabled(displayData.m_fVideoCaptureEnabled);
+            }
+            /* If Video Capture is *disabled* now: */
+            else
+            {
+                /* We should save all the options *before* Video Capture activation: */
+                m_machine.SetVideoCaptureFile(displayData.m_strVideoCaptureFilePath);
+                m_machine.SetVideoCaptureWidth(displayData.m_iVideoCaptureFrameWidth);
+                m_machine.SetVideoCaptureHeight(displayData.m_iVideoCaptureFrameHeight);
+                m_machine.SetVideoCaptureFps(displayData.m_iVideoCaptureFrameRate);
+                m_machine.SetVideoCaptureRate(displayData.m_iVideoCaptureBitRate);
+                m_machine.SetVideoCaptureScreens(displayData.m_screens);
+                /* Finally we should *enable* Video Capture if necessary: */
+                if (displayData.m_fVideoCaptureEnabled)
+                    m_machine.SetVideoCaptureEnabled(displayData.m_fVideoCaptureEnabled);
+            }
+        }
+        else
+        {
+            /* For 'offline' and 'saved' states the order is irrelevant: */
+            m_machine.SetVideoCaptureEnabled(displayData.m_fVideoCaptureEnabled);
             m_machine.SetVideoCaptureFile(displayData.m_strVideoCaptureFilePath);
             m_machine.SetVideoCaptureWidth(displayData.m_iVideoCaptureFrameWidth);
@@ -263 +290 @@
             m_machine.SetVideoCaptureFps(displayData.m_iVideoCaptureFrameRate);
             m_machine.SetVideoCaptureRate(displayData.m_iVideoCaptureBitRate);
-            QVector<BOOL> screens(m_machine.GetMonitorCount(), true);
-            m_machine.SetVideoCaptureScreens(screens);
+            m_machine.SetVideoCaptureScreens(displayData.m_screens);
         }
     }
@@ -440 +466 @@
 
     /* Video Capture tab: */
-    m_pContainerVideoCapture->setEnabled(isMachineOffline()); // TODO: Ask about isMachineSaved()
-    m_pContainerVideoCaptureOptions->setEnabled(m_pCheckboxVideoCapture->isChecked());
+    m_pContainerVideoCapture->setEnabled(isMachineInValidMode());
+    sltHandleVideoCaptureCheckboxToggle();
 }
 
@@ -478 +504 @@
     checkVRAMRequirements();
 
+    /* Update Video Capture tab screen count: */
+    updateVideoCaptureScreenCount();
+
     /* Revalidate if possible: */
     if (m_pValidator)
@@ -493 +522 @@
     checkVRAMRequirements();
 
+    /* Update Video Capture tab screen count: */
+    updateVideoCaptureScreenCount();
+
     /* Revalidate if possible: */
     if (m_pValidator)
         m_pValidator->revalidate();
+}
+
+void UIMachineSettingsDisplay::sltHandleVideoCaptureCheckboxToggle()
+{
+    /* Video Capture 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. */
+    m_pContainerVideoCaptureOptions->setEnabled(((isMachineOffline() || isMachineSaved()) && m_pCheckboxVideoCapture->isChecked()) ||
+                                                (isMachineOnline()  && !m_cache.base().m_fVideoCaptureEnabled && m_pCheckboxVideoCapture->isChecked()));
 }
 
@@ -651 +692 @@
 void UIMachineSettingsDisplay::prepareVideoCaptureTab()
 {
+    /* Prepare Video Capture checkbox: */
+    connect(m_pCheckboxVideoCapture, SIGNAL(toggled(bool)), this, SLOT(sltHandleVideoCaptureCheckboxToggle()));
+
     /* Prepare filepath selector: */
     m_pEditorVideoCapturePath->setMode(VBoxFilePathSelectorWidget::Mode_File_Save);
@@ -809 +853 @@
 }
 
+void UIMachineSettingsDisplay::updateVideoCaptureScreenCount()
+{
+    /* Update copy of the cached item to get the desired result: */
+    QVector<BOOL> screens = m_cache.base().m_screens;
+    screens.resize(m_pEditorVideoScreenCount->value());
+    m_pScrollerVideoCaptureScreens->setValue(screens);
+}
+
 /* static */
 void UIMachineSettingsDisplay::lookForCorrespondingPreset(QComboBox *pWhere, const QVariant &whichData)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

@@ -73 +73 @@
                (m_iVideoCaptureFrameHeight == other.m_iVideoCaptureFrameHeight) &&
                (m_iVideoCaptureFrameRate == other.m_iVideoCaptureFrameRate) &&
-               (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate);
+               (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate) &&
+               (m_screens == other.m_screens);
     }
 
@@ -104 +105 @@
     int m_iVideoCaptureFrameRate;
     int m_iVideoCaptureBitRate;
+    QVector<BOOL> m_screens;
 };
 typedef UISettingsCache<UIDataSettingsMachineDisplay> UICacheSettingsMachineDisplay;
@@ -167 +169 @@
 
     /* Handlers: Video Capture stuff: */
+    void sltHandleVideoCaptureCheckboxToggle();
     void sltHandleVideoCaptureFrameSizeComboboxChange();
     void sltHandleVideoCaptureFrameWidthEditorChange();
@@ -190 +193 @@
     /* Helpers: Video Capture stuff: */
     void lookForCorrespondingSizePreset();
+    void updateVideoCaptureScreenCount();
     static void lookForCorrespondingPreset(QComboBox *pWhere, const QVariant &whichData);
     static int calculateBitRate(int iFrameWidth, int iFrameHeight, int iFrameRate, int iQuality);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui

@@ -596 +596 @@
              <item row="4" column="3">
               <widget class="QLabel" name="m_pLabelVideoCaptureBitRateUnits"/>
+             </item>
+             <item row="6" column="0">
+              <widget class="QLabel" name="m_pLabelVideoCaptureScreens">
+               <property name="text">
+                <string>&amp;Screens:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignTop</set>
+               </property>
+               <property name="buddy">
+                <cstring>m_pScrollerVideoCaptureScreens</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="6" column="1" colspan="3">
+              <widget class="UIFilmContainer" name="m_pScrollerVideoCaptureScreens">
+               <property name="whatsThis">
+                <string></string>
+               </property>
+              </widget>
              </item>
             </layout>
@@ -639 +659 @@
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>UIFilmContainer</class>
+   <extends>QWidget</extends>
+   <header>UIFilmContainer.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
@@ -648 +673 @@
    <slot>setEnabled(bool)</slot>
   </connection>
-  <connection>
-   <sender>m_pCheckboxVideoCapture</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_pContainerVideoCaptureOptions</receiver>
-   <slot>setEnabled(bool)</slot>
-  </connection>
  </connections>
 </ui>