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

Timestamp:

Dec 7, 2018 1:52:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9012. Fix for r127272.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (1 diff)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -261 +261 @@
 template<> SHARED_LIBRARY_STUFF UIMediumFormat fromInternalString<UIMediumFormat>(const QString &strUIMediumFormat);
 template<> SHARED_LIBRARY_STUFF QString toString(const UISettingsDefs::RecordingMode &enmRecordingMode);
-template<> SHARED_LIBRARY_STUFF QString toInternalString(const UISettingsDefs::RecordingMode &enmRecordingMode);
-template<> SHARED_LIBRARY_STUFF UISettingsDefs::RecordingMode fromInternalString<UISettingsDefs::RecordingMode>(const QString &enmRecordingMode);
+template<> SHARED_LIBRARY_STUFF UISettingsDefs::RecordingMode fromString<UISettingsDefs::RecordingMode>(const QString &enmRecordingMode);
 
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -2522 +2522 @@
 }
 
-/* QString <= UISettingsDefs::RecordingMode: */
-template<> QString toInternalString(const UISettingsDefs::RecordingMode &enmRecordingMode)
-{
-    QString strResult;
-    switch (enmRecordingMode)
-    {
-        case UISettingsDefs::RecordingMode_VideoAudio: strResult = "Video/Audio"; break;
-        case UISettingsDefs::RecordingMode_VideoOnly:  strResult = "VideoOnly";   break;
-        case UISettingsDefs::RecordingMode_AudioOnly:  strResult = "AudioOnly";   break;
-        default:
-        {
-            AssertMsgFailed(("No text for recording mode=%d", enmRecordingMode));
-            break;
-        }
-    }
-    return strResult;
-}
-
 /* UISettingsDefs::RecordingMode <= QString: */
-template<> UISettingsDefs::RecordingMode fromInternalString<UISettingsDefs::RecordingMode>(const QString &strRecordingMode)
+template<> UISettingsDefs::RecordingMode fromString<UISettingsDefs::RecordingMode>(const QString &strRecordingMode)
 {
     /* Here we have some fancy stuff allowing us
@@ -2547 +2529 @@
     QStringList keys;       QList<UISettingsDefs::RecordingMode> values;
     keys << "Video/Audio";  values << UISettingsDefs::RecordingMode_VideoAudio;
-    keys << "VideoOnly";    values << UISettingsDefs::RecordingMode_VideoOnly;
-    keys << "AudioOnly";    values << UISettingsDefs::RecordingMode_AudioOnly;
-    /* VDI format for unknown words: */
+    keys << "Video Only";    values << UISettingsDefs::RecordingMode_VideoOnly;
+    keys << "Audio Only";    values << UISettingsDefs::RecordingMode_AudioOnly;
+    /* Video/Audio for unknown words: */
     if (!keys.contains(strRecordingMode, Qt::CaseInsensitive))
         return UISettingsDefs::RecordingMode_VideoAudio;

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

@@ -511 +511 @@
 
     /* Update recording options */
+    UISettingsDefs::RecordingMode enmRecordingMode =
+        gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
     QStringList optionValues;
-    optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_VideoAudio) ||
-                            m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_VideoOnly)) ? "true" : "false");
-    optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_VideoAudio) ||
-                            m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_AudioOnly)) ? "true" : "false");
+    /* Option value for video recording: */
+    optionValues.push_back((enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio) ||
+                           (enmRecordingMode == UISettingsDefs::RecordingMode_VideoOnly) ? "true" : "false");
+    /* Option value for audio recording: */
+    optionValues.push_back((enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio) ||
+                           (enmRecordingMode == UISettingsDefs::RecordingMode_AudioOnly) ? "true" : "false");
+
     if (m_pSliderAudioCaptureQuality->value() == 1)
         optionValues.push_back("low");
@@ -1727 +1732 @@
                                              (isMachineOnline() && !m_pCache->base().m_fRecordingEnabled && m_pCheckboxVideoCapture->isChecked());
 
-    const UISettingsDefs::RecordingMode enmRecordingMode =
-        static_cast<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentIndex());
+    UISettingsDefs::RecordingMode enmRecordingMode =
+        gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
 
     /* Video Capture Screens option should be enabled only if: