Changeset 46461 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 10, 2013 12:03:03 PM (12 years ago)

Author:

vboxsync

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

86304

Message:

FE/Qt: Machine settings: Display page: Video Capture tab: Little cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsDisplay.cpp (modified) (8 diffs)
• UIMachineSettingsDisplay.h (modified) (1 diff)

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

@@ -465 +465 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleVideoCaptureSizeChange(int iCurrentIndex)
+void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameSizeComboboxChange()
 {
     /* Get the proposed size: */
+    int iCurrentIndex = m_pComboVideoCaptureSize->currentIndex();
     QSize videoCaptureSize = m_pComboVideoCaptureSize->itemData(iCurrentIndex).toSize();
 
@@ -479 +480 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameRateChange(int iFrameRate)
-{
-    /* Apply proposed frame-rate: */
-    m_pEditorVideoCaptureFrameRate->setValue(iFrameRate);
-}
-
-void UIMachineSettingsDisplay::sltHandleVideoCaptureWidthChange()
+void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameWidthSpinboxChange()
 {
     /* Look for preset: */
@@ -493 +488 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleVideoCaptureHeightChange()
+void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameHeightSpinboxChange()
 {
     /* Look for preset: */
@@ -501 +496 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameRateChange()
+void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameRateSliderChange()
 {
     /* Apply proposed frame-rate: */
+    m_pEditorVideoCaptureFrameRate->blockSignals(true);
+    m_pEditorVideoCaptureFrameRate->setValue(m_pSliderVideoCaptureFrameRate->value());
+    m_pEditorVideoCaptureFrameRate->blockSignals(false);
+    /* Update quality and bit-rate: */
+    sltHandleVideoCaptureQualitySliderChange();
+}
+
+void UIMachineSettingsDisplay::sltHandleVideoCaptureFrameRateSpinboxChange()
+{
+    /* Apply proposed frame-rate: */
+    m_pSliderVideoCaptureFrameRate->blockSignals(true);
     m_pSliderVideoCaptureFrameRate->setValue(m_pEditorVideoCaptureFrameRate->value());
+    m_pSliderVideoCaptureFrameRate->blockSignals(false);
     /* Update quality and bit-rate: */
     sltHandleVideoCaptureQualitySliderChange();
@@ -633 +640 @@
     m_pComboVideoCaptureSize->addItem("1920 x 1080 (16:9)",  QVariant(QSize(1920, 1080)));
     m_pComboVideoCaptureSize->addItem("1920 x 1200 (16:10)", QVariant(QSize(1920, 1200)));
-    connect(m_pComboVideoCaptureSize, SIGNAL(currentIndexChanged(int)), this, SLOT(sltHandleVideoCaptureSizeChange(int)));
+    connect(m_pComboVideoCaptureSize, SIGNAL(currentIndexChanged(int)), this, SLOT(sltHandleVideoCaptureFrameSizeComboboxChange()));
 
     /* Prepare frame-width/height spin-boxes: */
@@ -642 +649 @@
     m_pEditorVideoCaptureHeight->setMinimum(16);
     m_pEditorVideoCaptureHeight->setMaximum(1200);
-    connect(m_pEditorVideoCaptureWidth, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureWidthChange()));
-    connect(m_pEditorVideoCaptureHeight, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureHeightChange()));
+    connect(m_pEditorVideoCaptureWidth, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameWidthSpinboxChange()));
+    connect(m_pEditorVideoCaptureHeight, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameHeightSpinboxChange()));
 
     /* Prepare frame-rate slider: */
@@ -654 +661 @@
     m_pSliderVideoCaptureFrameRate->setOptimalHint(1, 25);
     m_pSliderVideoCaptureFrameRate->setWarningHint(25, 30);
-    connect(m_pSliderVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameRateChange(int)));
+    connect(m_pSliderVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameRateSliderChange()));
 
     /* Prepare frame-rate spin-box: */
@@ -660 +667 @@
     m_pEditorVideoCaptureFrameRate->setMinimum(1);
     m_pEditorVideoCaptureFrameRate->setMaximum(30);
-    connect(m_pEditorVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameRateChange()));
+    connect(m_pEditorVideoCaptureFrameRate, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoCaptureFrameRateSpinboxChange()));
 
     /* Prepare quality combo-box: */

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

@@ -167 +167 @@
 
     /* Handlers: Video Capture stuff: */
-    void sltHandleVideoCaptureSizeChange(int iCurrentIndex);
-    void sltHandleVideoCaptureFrameRateChange(int iFrameRate);
-    void sltHandleVideoCaptureWidthChange();
-    void sltHandleVideoCaptureHeightChange();
-    void sltHandleVideoCaptureFrameRateChange();
+    void sltHandleVideoCaptureFrameSizeComboboxChange();
+    void sltHandleVideoCaptureFrameWidthSpinboxChange();
+    void sltHandleVideoCaptureFrameHeightSpinboxChange();
+    void sltHandleVideoCaptureFrameRateSliderChange();
+    void sltHandleVideoCaptureFrameRateSpinboxChange();
     void sltHandleVideoCaptureQualitySliderChange();
     void sltHandleVideoCaptureBitRateSpinboxChange();