From 3f802e85484064c0ace3fc20acadfba77f3562d3 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 12 Jun 2018 15:15:41 -0700
Subject: [PATCH 1/2] Consistent UI states

---
 MainWindow.xaml.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 1e4335dd..fd8cea1d 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -77,6 +77,8 @@ namespace DICUI
             cmb_DiscType.DisplayMemberPath = "Item1";
             cmb_DiscType.SelectedIndex = 0;
             cmb_DiscType_SelectionChanged(null, null);
+
+            btn_Start.IsEnabled = false;
         }
 
         /// <summary>
@@ -181,7 +183,7 @@ namespace DICUI
                     if (!File.Exists(sgRawPath))
                     {
                         lbl_Status.Content = "Error! Could not find sg-raw!";
-                        return;
+                        break;
                     }
 
                     Process sgraw = new Process()
@@ -199,7 +201,7 @@ namespace DICUI
                     if (!File.Exists(psxtPath))
                     {
                         lbl_Status.Content = "Error! Could not find psxt001z!";
-                        return;
+                        break;
                     }
 
                     // Invoke the program with all 3 configurations
@@ -273,17 +275,21 @@ namespace DICUI
             {
                 case DiscType.NONE:
                     lbl_Status.Content = "Please select a valid disc type";
+                    btn_Start.IsEnabled = false;
                     break;
                 case DiscType.GameCubeGameDisc:
                 case DiscType.GDROM:
                     lbl_Status.Content = string.Format("{0} discs are partially supported by DIC", Utilities.DiscTypeToString(tuple.Item3));
+                    btn_Start.IsEnabled = true;
                     break;
                 case DiscType.HDDVD:
                 case DiscType.UMD:
                     lbl_Status.Content = string.Format("{0} discs are not currently supported by DIC", Utilities.DiscTypeToString(tuple.Item3));
+                    btn_Start.IsEnabled = true;
                     break;
                 default:
                     lbl_Status.Content = string.Format("{0} ready to dump", Utilities.DiscTypeToString(tuple.Item3));
+                    btn_Start.IsEnabled = true;
                     break;
             }
 

From ed67522675765b8a3e13eae81028f4b21fbb9d3c Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 12 Jun 2018 16:49:33 -0700
Subject: [PATCH 2/2] Add custom parameter support

---
 MainWindow.xaml    | 19 ++++++++---------
 MainWindow.xaml.cs | 52 +++++++++++++++++++++++++++++++++++++---------
 Utilities.cs       |  3 +++
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index a2002525..5b9481dc 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -30,28 +30,30 @@
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
-
+                <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
 
             <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">Disc Type</Label>
-            <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Output Filename</Label>
-            <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Output Directory</Label>
-            <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Drive Letter</Label>
-            <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center">Drive Speed</Label>
-
             <ComboBox x:Name="cmb_DiscType" Grid.Row="0" Grid.Column="1" Height="22" SelectionChanged="cmb_DiscType_SelectionChanged" />
 
+            <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Output Filename</Label>
             <TextBox x:Name="txt_OutputFilename" Grid.Row="1" Grid.Column="1" Height="22"></TextBox>
 
+            <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Output Directory</Label>
             <TextBox x:Name="txt_OutputDirectory" Grid.Row="2" Grid.Column="1" Height="22" Width="345" HorizontalAlignment="left" Text="ISO" />
             <Button x:Name="btn_OutputDirectoryBrowse" Grid.Row="2" Grid.Column="1" Height="22" Width="50" HorizontalAlignment="Right" Content="Browse" Click="btn_OutputDirectoryBrowse_Click"/>
 
+            <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Drive Letter</Label>
             <ComboBox x:Name="cmb_DriveLetter" Grid.Row="3" Grid.Column="1" Height="22" Width="397" HorizontalAlignment="left" SelectionChanged="cmb_DriveLetter_SelectionChanged"/>
 
-            <ComboBox x:Name="cmb_DriveSpeed" Grid.Row="4" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="left"/>
+            <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center">Drive Speed</Label>
+            <ComboBox x:Name="cmb_DriveSpeed" Grid.Row="4" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="left" SelectionChanged="cmb_DriveSpeed_SelectionChanged"/>
+
+            <Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center">Custom Parameters</Label>
+            <TextBox x:Name="txt_CustomParameters" Grid.Row="5" Grid.Column="1" Height="22" Width="397" HorizontalAlignment="left" IsEnabled="False" />
         </Grid>
 
         <Grid Grid.Row="1" Grid.Column="0" Margin="15,19.6,15.2,9.8" Grid.ColumnSpan="2">
@@ -76,9 +78,6 @@
             </Grid.RowDefinitions>
 
             <Label x:Name="lbl_Status" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Waiting for CD or DVD..." />
-
         </Grid>
-
     </Grid>
-    
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index fd8cea1d..b6f3ba04 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -63,6 +63,11 @@ namespace DICUI
             GetOutputNames();
         }
 
+        private void cmb_DriveSpeed_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            EnsureDiscInformation();
+        }
+
         #endregion
 
         #region Helpers
@@ -138,16 +143,13 @@ namespace DICUI
             string driveLetter = cmb_DriveLetter.Text;
             string outputDirectory = txt_OutputDirectory.Text;
             string outputFilename = txt_OutputFilename.Text;
-            int driveSpeed = (int)cmb_DriveSpeed.SelectedItem;
             btn_Start.IsEnabled = false;
 
-            // Get the discType and processArguments from a given system and disc combo
+            // Get the currently selected item
             var selected = cmb_DiscType.SelectedValue as Tuple<string, KnownSystem?, DiscType?>;
-            string discType = Utilities.GetBaseCommand(selected.Item3);
-            List<string> defaultParams = Utilities.GetDefaultParameters(selected.Item2, selected.Item3);
 
             // Validate that everything is good
-            if (discType == null || defaultParams == null)
+            if (string.IsNullOrWhiteSpace(txt_CustomParameters.Text))
             {
                 lbl_Status.Content = "Error! Current configuration is not supported!";
                 return;
@@ -166,11 +168,7 @@ namespace DICUI
                 {
                     Process process = new Process();
                     process.StartInfo.FileName = dicPath;
-                    process.StartInfo.Arguments = discType
-                        + " " + driveLetter
-                        + " \"" + Path.Combine(outputDirectory, outputFilename) + "\" "
-                        + (selected.Item3 != DiscType.BD25 && selected.Item3 != DiscType.BD50 ? driveSpeed + " " : "")
-                        + string.Join(" ", defaultParams);
+                    process.StartInfo.Arguments = txt_CustomParameters.Text;
                     process.Start();
                     process.WaitForExit();
                 });
@@ -304,6 +302,40 @@ namespace DICUI
                     cmb_DriveSpeed.IsEnabled = true;
                     break;
             }
+
+            // Special case for Custom input
+            if (tuple.Item1 == "Custom Input" && tuple.Item2 == KnownSystem.NONE && tuple.Item3 == DiscType.NONE)
+            {
+                txt_CustomParameters.IsEnabled = true;
+                txt_OutputFilename.IsEnabled = false;
+                txt_OutputDirectory.IsEnabled = false;
+                btn_OutputDirectoryBrowse.IsEnabled = false;
+                cmb_DriveLetter.IsEnabled = false;
+                cmb_DriveSpeed.IsEnabled = false;
+                lbl_Status.Content = "User input mode";
+            }
+            else
+            {
+                txt_CustomParameters.IsEnabled = false;
+                txt_OutputFilename.IsEnabled = true;
+                txt_OutputDirectory.IsEnabled = true;
+                btn_OutputDirectoryBrowse.IsEnabled = true;
+                cmb_DriveLetter.IsEnabled = true;
+                cmb_DriveSpeed.IsEnabled = true;
+
+                // Populate with the correct params for inputs (if we're not on the default option)
+                if (cmb_DiscType.SelectedIndex > 0)
+                {
+                    var selected = cmb_DiscType.SelectedValue as Tuple<string, KnownSystem?, DiscType?>;
+                    string discType = Utilities.GetBaseCommand(selected.Item3);
+                    List<string> defaultParams = Utilities.GetDefaultParameters(selected.Item2, selected.Item3);
+                    txt_CustomParameters.Text = discType
+                        + " " + cmb_DriveLetter.Text
+                        + " \"" + Path.Combine(txt_OutputDirectory.Text, txt_OutputFilename.Text + Utilities.GetDefaultExtension(selected.Item3)) + "\" "
+                        + (selected.Item3 != DiscType.BD25 && selected.Item3 != DiscType.BD50 ? (int)cmb_DriveSpeed.SelectedItem + " " : "")
+                        + string.Join(" ", defaultParams);
+                }
+            }
         }
 
         /// <summary>
diff --git a/Utilities.cs b/Utilities.cs
index 41d0eefc..475cceb8 100644
--- a/Utilities.cs
+++ b/Utilities.cs
@@ -603,6 +603,9 @@ namespace DICUI
                 }
             }
 
+            // Add final mapping for "Custom"
+            mapping.Add(new Tuple<string, KnownSystem?, DiscType?>("Custom Input", KnownSystem.NONE, DiscType.NONE));
+
             return mapping;
         }