From 4fa1273111d4e5dd5085994bac82582996ea0c7c Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 18 Jul 2025 13:15:40 -0400
Subject: [PATCH] Remove media type from Check Dump UI

---
 CHANGELIST.md                                 |  4 +
 MPF.Frontend/ViewModels/CheckDumpViewModel.cs | 89 +------------------
 MPF.UI/Windows/CheckDumpWindow.xaml           |  5 +-
 MPF.UI/Windows/CheckDumpWindow.xaml.cs        | 11 ---
 4 files changed, 7 insertions(+), 102 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 89ccdb6e..322a8d22 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -1,3 +1,7 @@
+### WIP (xxxx-xx-xx)
+
+- Remove media type from Check Dump UI
+
 ### 3.3.3 (2025-07-18)
 
 - Handle layers for PS3CFW
diff --git a/MPF.Frontend/ViewModels/CheckDumpViewModel.cs b/MPF.Frontend/ViewModels/CheckDumpViewModel.cs
index ee38965b..66273f6c 100644
--- a/MPF.Frontend/ViewModels/CheckDumpViewModel.cs
+++ b/MPF.Frontend/ViewModels/CheckDumpViewModel.cs
@@ -66,34 +66,6 @@ namespace MPF.Frontend.ViewModels
         }
         private bool _systemTypeComboBoxEnabled;
 
-        /// <summary>
-        /// Currently selected media type value
-        /// </summary>
-        public MediaType? CurrentMediaType
-        {
-            get => _currentMediaType;
-            set
-            {
-                _currentMediaType = value;
-                TriggerPropertyChanged(nameof(CurrentMediaType));
-            }
-        }
-        private MediaType? _currentMediaType;
-
-        /// <summary>
-        /// Indicates the status of the media type combo box
-        /// </summary>
-        public bool MediaTypeComboBoxEnabled
-        {
-            get => _mediaTypeComboBoxEnabled;
-            set
-            {
-                _mediaTypeComboBoxEnabled = value;
-                TriggerPropertyChanged(nameof(MediaTypeComboBoxEnabled));
-            }
-        }
-        private bool _mediaTypeComboBoxEnabled;
-
         /// <summary>
         /// Currently provided input path
         /// </summary>
@@ -229,20 +201,6 @@ namespace MPF.Frontend.ViewModels
 
         #region List Properties
 
-        /// <summary>
-        /// Current list of supported media types
-        /// </summary>
-        public List<Element<MediaType>>? MediaTypes
-        {
-            get => _mediaTypes;
-            set
-            {
-                _mediaTypes = value;
-                TriggerPropertyChanged(nameof(MediaTypes));
-            }
-        }
-        private List<Element<MediaType>>? _mediaTypes;
-
         /// <summary>
         /// Current list of supported system profiles
         /// </summary>
@@ -287,16 +245,13 @@ namespace MPF.Frontend.ViewModels
             SystemTypeComboBoxEnabled = true;
             InputPathTextBoxEnabled = true;
             InputPathBrowseButtonEnabled = true;
-            MediaTypeComboBoxEnabled = true;
             DumpingProgramComboBoxEnabled = true;
             CheckDumpButtonEnabled = false;
             CancelButtonEnabled = true;
 
-            MediaTypes = [];
             Systems = RedumpSystemComboBoxItem.GenerateElements();
             InternalPrograms = [];
 
-            PopulateMediaType();
             PopulateInternalPrograms();
             EnableEventHandlers();
         }
@@ -327,15 +282,6 @@ namespace MPF.Frontend.ViewModels
         /// Change the currently selected system
         /// </summary>
         public void ChangeSystem()
-        {
-            PopulateMediaType();
-            CheckDumpButtonEnabled = ShouldEnableCheckDumpButton();
-        }
-
-        /// <summary>
-        /// Change the currently selected media type
-        /// </summary>
-        public void ChangeMediaType()
         {
             CheckDumpButtonEnabled = ShouldEnableCheckDumpButton();
         }
@@ -369,7 +315,6 @@ namespace MPF.Frontend.ViewModels
             InputPathTextBoxEnabled = true;
             InputPathBrowseButtonEnabled = true;
             DumpingProgramComboBoxEnabled = true;
-            PopulateMediaType();
             CheckDumpButtonEnabled = ShouldEnableCheckDumpButton();
             CancelButtonEnabled = true;
         }
@@ -382,7 +327,6 @@ namespace MPF.Frontend.ViewModels
             SystemTypeComboBoxEnabled = false;
             InputPathTextBoxEnabled = false;
             InputPathBrowseButtonEnabled = false;
-            MediaTypeComboBoxEnabled = false;
             DumpingProgramComboBoxEnabled = false;
             CheckDumpButtonEnabled = false;
             CancelButtonEnabled = false;
@@ -392,35 +336,6 @@ namespace MPF.Frontend.ViewModels
 
         #region Population
 
-        /// <summary>
-        /// Populate media type according to system type
-        /// </summary>
-        private void PopulateMediaType()
-        {
-            // Disable other UI updates
-            bool cachedCanExecuteSelectionChanged = CanExecuteSelectionChanged;
-            DisableEventHandlers();
-
-            if (CurrentSystem != null)
-            {
-                var mediaTypeValues = CurrentSystem.MediaTypes();
-                int index = mediaTypeValues.FindIndex(m => m == CurrentMediaType);
-
-                MediaTypes = mediaTypeValues.ConvertAll(m => new Element<MediaType>(m ?? MediaType.NONE));
-                MediaTypeComboBoxEnabled = MediaTypes.Count > 1;
-                CurrentMediaType = (index > -1 ? MediaTypes[index] : MediaTypes[0]);
-            }
-            else
-            {
-                MediaTypeComboBoxEnabled = false;
-                MediaTypes = null;
-                CurrentMediaType = null;
-            }
-
-            // Reenable event handlers, if necessary
-            if (cachedCanExecuteSelectionChanged) EnableEventHandlers();
-        }
-
         /// <summary>
         /// Populate media type according to system type
         /// </summary>
@@ -451,7 +366,7 @@ namespace MPF.Frontend.ViewModels
 
         private bool ShouldEnableCheckDumpButton()
         {
-            return CurrentSystem != null && CurrentMediaType != null && !string.IsNullOrEmpty(InputPath);
+            return CurrentSystem != null && !string.IsNullOrEmpty(InputPath);
         }
 
         /// <summary>
@@ -507,7 +422,7 @@ namespace MPF.Frontend.ViewModels
 
             // Finally, attempt to do the output dance
             var result = await env.VerifyAndSaveDumpOutput(
-                mediaType: CurrentMediaType,
+                mediaType: null,
                 resultProgress: resultProgress,
                 protectionProgress: protectionProgress,
                 processUserInfo: processUserInfo);
diff --git a/MPF.UI/Windows/CheckDumpWindow.xaml b/MPF.UI/Windows/CheckDumpWindow.xaml
index 5606d2af..c5a1250d 100644
--- a/MPF.UI/Windows/CheckDumpWindow.xaml
+++ b/MPF.UI/Windows/CheckDumpWindow.xaml
@@ -85,7 +85,7 @@
                     <Button x:Name="InputPathBrowseButton" Grid.Row="0" Grid.Column="1" Height="22" Width="50" HorizontalAlignment="Right" Content="Browse"
                 IsEnabled="{Binding InputPathBrowseButtonEnabled}" Style="{DynamicResource CustomButtonStyle}"/>
 
-                    <Label x:Name="SystemMediaTypeLabel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="System/Media Type" />
+                    <Label x:Name="SystemTypeLabel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="System Type" />
                     <ComboBox x:Name="SystemTypeComboBox" Grid.Row="1" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left"
                   ItemsSource="{Binding Systems}" SelectedItem="{Binding Path=CurrentSystem, Converter={StaticResource ElementConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                   IsEnabled="{Binding SystemTypeComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}">
@@ -99,9 +99,6 @@
                             </Style>
                         </ComboBox.ItemContainerStyle>
                     </ComboBox>
-                    <ComboBox x:Name="MediaTypeComboBox" Grid.Row="1" Grid.Column="1" Height="22" Width="140" HorizontalAlignment="Right"
-                  ItemsSource="{Binding MediaTypes}" SelectedItem="{Binding Path=CurrentMediaType, Converter={StaticResource ElementConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                  IsEnabled="{Binding MediaTypeComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}" />
 
                     <Label x:Name="DumpingProgramLabel" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="Dumping Program"/>
                     <ComboBox x:Name="DumpingProgramComboBox" Grid.Row="2" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left"
diff --git a/MPF.UI/Windows/CheckDumpWindow.xaml.cs b/MPF.UI/Windows/CheckDumpWindow.xaml.cs
index 38d3b21a..915aafa0 100644
--- a/MPF.UI/Windows/CheckDumpWindow.xaml.cs
+++ b/MPF.UI/Windows/CheckDumpWindow.xaml.cs
@@ -29,7 +29,6 @@ namespace MPF.UI.Windows
         private ComboBox? DumpingProgramComboBox => ItemHelper.FindChild<ComboBox>(this, "DumpingProgramComboBox");
         private Button? InputPathBrowseButton => ItemHelper.FindChild<Button>(this, "InputPathBrowseButton");
         private TextBox? InputPathTextBox => ItemHelper.FindChild<TextBox>(this, "InputPathTextBox");
-        private ComboBox? MediaTypeComboBox => ItemHelper.FindChild<ComboBox>(this, "MediaTypeComboBox");
         private ComboBox? SystemTypeComboBox => ItemHelper.FindChild<ComboBox>(this, "SystemTypeComboBox");
 
         #endregion
@@ -89,7 +88,6 @@ namespace MPF.UI.Windows
 
             // User Area SelectionChanged
             SystemTypeComboBox!.SelectionChanged += SystemTypeComboBoxSelectionChanged;
-            MediaTypeComboBox!.SelectionChanged += MediaTypeComboBoxSelectionChanged;
             DumpingProgramComboBox!.SelectionChanged += DumpingProgramComboBoxSelectionChanged;
 
             // User Area TextChanged
@@ -211,15 +209,6 @@ namespace MPF.UI.Windows
                 CheckDumpViewModel.ChangeInputPath();
         }
 
-        /// <summary>
-        /// Handler for MediaTypeComboBox SelectionChanged event
-        /// </summary>
-        public void MediaTypeComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (CheckDumpViewModel.CanExecuteSelectionChanged)
-                CheckDumpViewModel.ChangeMediaType();
-        }
-
         /// <summary>
         /// Handler for SystemTypeComboBox SelectionChanged event
         /// </summary>