Updated for 1.04b

* Add SubIntention (SecuROM) field

* Fix issue with internationalization

App.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <add key="dicPath" value="Programs\\DiscImageCreator.exe"/>
+    <add key="dicPath" value="Programs\DiscImageCreator.exe"/>
     <add key="psxt001zPath" value="psxt001z.exe"/>
     <add key="sgRawPath" value="sg_raw.exe"/>
     <add key="defaultOutputPath" value="ISO"/>

Constants.cs

@@ -82,6 +82,7 @@
         public const string DATField = "DAT";
         public const string ErrorCountField = "Error Count";
         public const string CuesheetField = "Cuesheet";
+        public const string SubIntentionField = "SubIntention (SecuROM)";
         public const string WriteOffsetField = "WriteOffset";
         public const string LayerbreakField = "Layerbreak";
         public const string PlaystationEXEDateField = "EXE Date"; // TODO: Not automatic yet

MainWindow.xaml.cs

@@ -73,8 +73,8 @@ namespace DICUI
 
         private void cmb_DiscType_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            EnsureDiscInformation();
             GetOutputNames();
+            EnsureDiscInformation();
         }
 
         private void cmb_DriveLetter_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -391,6 +391,7 @@ namespace DICUI
                 btn_OutputDirectoryBrowse.IsEnabled = false;
                 cmb_DriveLetter.IsEnabled = false;
                 cmb_DriveSpeed.IsEnabled = false;
+                btn_StartStop.IsEnabled = true;
                 lbl_Status.Content = "User input mode";
             }
             else
@@ -410,7 +411,7 @@ namespace DICUI
                     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)) + "\" "
+                        + " \"" + Path.Combine(txt_OutputDirectory.Text, txt_OutputFilename.Text) + "\" "
                         + (selected.Item3 != DiscType.BD25 && selected.Item3 != DiscType.BD50 ? (int)cmb_DriveSpeed.SelectedItem + " " : "")
                         + string.Join(" ", defaultParams);
                 }
@@ -503,8 +504,9 @@ namespace DICUI
                 HorizontalAlignment = HorizontalAlignment.Stretch,
                 VerticalAlignment = VerticalAlignment.Stretch,
             };
-            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = (GridLength)(new GridLengthConverter().ConvertFromString("1.2*")) });
-            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = (GridLength)(new GridLengthConverter().ConvertFromString("2.5*")) });
+
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = (GridLength)(new GridLengthConverter().ConvertFromString(String.Format("{0:n1}*", 1.2))) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = (GridLength)(new GridLengthConverter().ConvertFromString(String.Format("{0:n1}*", 2.5))) });
             grid.RowDefinitions.Add(new RowDefinition());
             grid.RowDefinitions.Add(new RowDefinition());
             grid.RowDefinitions.Add(new RowDefinition());

README.md

@@ -25,6 +25,17 @@ Dizzzy - Concept/Ideas/Beta tester
 2018-06-13
 --------------------------------------------------------------------------
 
+Version 1.04b released:
+
+- Added subIntention reading
+- Fixed extra extensions being appended
+- Fixed internationalization error (number formatting)
+- Fixed "Custom Input" not working
+
+--------------------------------------------------------------------------
+2018-06-13
+--------------------------------------------------------------------------
+
 Version 1.04a released:
 
 - Fixed issue with empty trays

Utilities.cs

@@ -775,7 +775,7 @@ namespace DICUI
                     mappings[Template.ErrorCountField] = GetErrorCount(combinedBase + ".img_EdcEcc.txt",
                         combinedBase + "_c2Error.txt",
                         combinedBase + "_mainError.txt").ToString();
-                    mappings[Template.CuesheetField] = GetCuesheet(combinedBase + ".cue");
+                    mappings[Template.CuesheetField] = GetFullFile(combinedBase + ".cue");
                     mappings[Template.WriteOffsetField] = GetWriteOffset(combinedBase + "_disc.txt");
 
                     // System-specific options
@@ -816,6 +816,14 @@ namespace DICUI
                         case KnownSystem.IBMPCCompatible:
                             mappings[Template.ISBNField] = Template.OptionalValue;
                             mappings[Template.CopyProtectionField] = Template.RequiredIfExistsValue;
+                            if (File.Exists(combinedBase + "_subIntention.txt"))
+                            {
+                                FileInfo fi = new FileInfo(combinedBase + "_subIntention.txt");
+                                if (fi.Length > 0)
+                                {
+                                    mappings[Template.SubIntentionField] = GetFullFile(combinedBase + "_subIntention.txt");
+                                }
+                            }
                             break;
                         case KnownSystem.SonyPlayStation2:
                             mappings[Template.PlaystationEXEDateField] = Template.RequiredValue; // GetPlaysStationEXEDate(combinedBase + "_mainInfo.txt");
@@ -853,19 +861,19 @@ namespace DICUI
         }
 
         /// <summary>
-        /// Get the proper cuesheet from the input file, if possible
+        /// Get the full lines from the input file, if possible
         /// </summary>
-        /// <param name="cue">.cue file location</param>
-        /// <returns>Full text of cuesheet, null on error</returns>
-        private static string GetCuesheet(string cue)
+        /// <param name="filename">file location</param>
+        /// <returns>Full text of the file, null on error</returns>
+        private static string GetFullFile(string filename)
         {
             // If the file doesn't exist, we can't get info from it
-            if (!File.Exists(cue))
+            if (!File.Exists(filename))
             {
                 return null;
             }
 
-            return string.Join("\n", File.ReadAllLines(cue));
+            return string.Join("\n", File.ReadAllLines(filename));
         }
 
         /// <summary>
@@ -1195,9 +1203,14 @@ namespace DICUI
                     case KnownSystem.AppleMacintosh:
                     case KnownSystem.IBMPCCompatible:
                         output.Add(Template.CopyProtectionField + ": " + info[Template.CopyProtectionField]); output.Add("");
+
+                        if (info.ContainsKey(Template.SubIntentionField))
+                        {
+                            output.Add(Template.SubIntentionField + ":"); output.Add("");
+                            output.AddRange(info[Template.SubIntentionField].Split('\n'));
+                        }
                         break;
                 }
-                // TODO: Add SecuROM data here for relevant things
                 switch (type)
                 {
                     case DiscType.CD: