From 308fad3ed2dc64e8ab0a9d6b3e3838d2db72dd03 Mon Sep 17 00:00:00 2001 From: Jacopo Santoni Date: Mon, 18 Jun 2018 21:43:07 +0200 Subject: [PATCH] Separated of System and Disc Type (#56) * Split type combobox into system combobox and disc type combobox * corrected indentation for xaml file * fixed merge with head * fixed format * fixed issues for PR, added KnownSystem.CUSTOM * removed Updater.cs which ended by error in commit * fixed GetOuptutName() for new drive/system combobox --- Constants.cs | 2 +- Enumerations.cs | 2 + MainWindow.xaml | 7 +- MainWindow.xaml.cs | 189 ++++++++++++++++++++++------------- Utilities/Converters.cs | 5 +- Utilities/DumpInformation.cs | 6 +- Utilities/Validation.cs | 55 +++++----- 7 files changed, 158 insertions(+), 108 deletions(-) diff --git a/Constants.cs b/Constants.cs index cb4dec62..73220e85 100644 --- a/Constants.cs +++ b/Constants.cs @@ -116,4 +116,4 @@ public const string OptionalValue = "(OPTIONAL)"; public const string YesNoValue = "Yes/No"; } -} +} \ No newline at end of file diff --git a/Enumerations.cs b/Enumerations.cs index cb699a05..46bcecc6 100644 --- a/Enumerations.cs +++ b/Enumerations.cs @@ -151,5 +151,7 @@ VideoCD, #endregion + + Custom = -1 } } diff --git a/MainWindow.xaml b/MainWindow.xaml index 9f8e491d..6b10954a 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -42,8 +42,9 @@ - - +