diff --git a/DICUI.Forms/Options.cs b/DICUI.Forms/Options.cs index aef39fa1..1d8af1ee 100644 --- a/DICUI.Forms/Options.cs +++ b/DICUI.Forms/Options.cs @@ -11,9 +11,9 @@ namespace DICUI public string DICPath { get; private set; } public string SubDumpPath { get; private set; } - public int preferredDumpSpeedCD { get; set; } - public int preferredDumpSpeedDVD { get; set; } - public int preferredDumpSpeedBD { get; set; } + public int PreferredDumpSpeedCD { get; set; } + public int PreferredDumpSpeedDVD { get; set; } + public int PreferredDumpSpeedBD { get; set; } public bool QuietMode { get; set; } public bool ParanoidMode { get; set; } @@ -49,9 +49,9 @@ namespace DICUI SubDumpPath = ConfigurationManager.AppSettings["SubDumpPath"] ?? "subdump.exe"; DefaultOutputPath = ConfigurationManager.AppSettings["DefaultOutputPath"] ?? "ISO"; - this.preferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72; - this.preferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24; - this.preferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16; + this.PreferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72; + this.PreferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24; + this.PreferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16; this.QuietMode = Boolean.TryParse(ConfigurationManager.AppSettings["QuietMode"], out bool quietMode) ? quietMode : false; this.ParanoidMode = Boolean.TryParse(ConfigurationManager.AppSettings["ParanoidMode"], out bool paranoidMode) ? paranoidMode : false; @@ -81,14 +81,14 @@ namespace DICUI { case MediaType.CDROM: case MediaType.GDROM: - return preferredDumpSpeedCD; + return PreferredDumpSpeedCD; case MediaType.DVD: case MediaType.HDDVD: case MediaType.NintendoGameCube: case MediaType.NintendoWiiOpticalDisc: - return preferredDumpSpeedDVD; + return PreferredDumpSpeedDVD; case MediaType.BluRay: - return preferredDumpSpeedBD; + return PreferredDumpSpeedBD; default: return 8; } diff --git a/DICUI.Forms/Windows/MainWindow.cs b/DICUI.Forms/Windows/MainWindow.cs index 03a7a2bf..9924fea7 100644 --- a/DICUI.Forms/Windows/MainWindow.cs +++ b/DICUI.Forms/Windows/MainWindow.cs @@ -591,19 +591,19 @@ namespace DICUI.Forms.Windows { case MediaType.CDROM: case MediaType.GDROM: - preferred = _options.preferredDumpSpeedCD; + preferred = _options.PreferredDumpSpeedCD; break; case MediaType.DVD: case MediaType.HDDVD: case MediaType.NintendoGameCube: case MediaType.NintendoWiiOpticalDisc: - preferred = _options.preferredDumpSpeedDVD; + preferred = _options.PreferredDumpSpeedDVD; break; case MediaType.BluRay: - preferred = _options.preferredDumpSpeedBD; + preferred = _options.PreferredDumpSpeedBD; break; default: - preferred = _options.preferredDumpSpeedCD; + preferred = _options.PreferredDumpSpeedCD; break; } diff --git a/DICUI.Forms/Windows/OptionsWindow.cs b/DICUI.Forms/Windows/OptionsWindow.cs index 5043d417..c1164356 100644 --- a/DICUI.Forms/Windows/OptionsWindow.cs +++ b/DICUI.Forms/Windows/OptionsWindow.cs @@ -29,9 +29,9 @@ namespace DICUI.Forms.Windows DumpSpeedBDSlider.Maximum = (int)Constants.SpeedsForBDAsCollection.Last(); // Select the current values - DumpSpeedCDSlider.Value = _options.preferredDumpSpeedCD; - DumpSpeedDVDSlider.Value = _options.preferredDumpSpeedDVD; - DumpSpeedBDSlider.Value = _options.preferredDumpSpeedBD; + DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD; + DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD; + DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD; // Create textbox outputs DumpSpeedCDTextBox.Text = DumpSpeedCDSlider.Value.ToString(); @@ -134,9 +134,9 @@ namespace DICUI.Forms.Windows { Array.ForEach(PathSettings(), setting => TextBoxForPathSetting(setting).Text = _options.Get(setting)); - DumpSpeedCDSlider.Value = _options.preferredDumpSpeedCD; - DumpSpeedDVDSlider.Value = _options.preferredDumpSpeedDVD; - DumpSpeedBDSlider.Value = _options.preferredDumpSpeedBD; + DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD; + DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD; + DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD; } #region Event Handlers @@ -152,9 +152,9 @@ namespace DICUI.Forms.Windows { Array.ForEach(PathSettings(), setting => _options.Set(setting, TextBoxForPathSetting(setting).Text)); - _options.preferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value); - _options.preferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value); - _options.preferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value); + _options.PreferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value); + _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value); + _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value); _options.QuietMode = QuietModeCheckBox.Checked; _options.ParanoidMode = ParanoidModeCheckBox.Checked; diff --git a/DICUI/Options.cs b/DICUI/Options.cs index aef39fa1..1d8af1ee 100644 --- a/DICUI/Options.cs +++ b/DICUI/Options.cs @@ -11,9 +11,9 @@ namespace DICUI public string DICPath { get; private set; } public string SubDumpPath { get; private set; } - public int preferredDumpSpeedCD { get; set; } - public int preferredDumpSpeedDVD { get; set; } - public int preferredDumpSpeedBD { get; set; } + public int PreferredDumpSpeedCD { get; set; } + public int PreferredDumpSpeedDVD { get; set; } + public int PreferredDumpSpeedBD { get; set; } public bool QuietMode { get; set; } public bool ParanoidMode { get; set; } @@ -49,9 +49,9 @@ namespace DICUI SubDumpPath = ConfigurationManager.AppSettings["SubDumpPath"] ?? "subdump.exe"; DefaultOutputPath = ConfigurationManager.AppSettings["DefaultOutputPath"] ?? "ISO"; - this.preferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72; - this.preferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24; - this.preferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16; + this.PreferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72; + this.PreferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24; + this.PreferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16; this.QuietMode = Boolean.TryParse(ConfigurationManager.AppSettings["QuietMode"], out bool quietMode) ? quietMode : false; this.ParanoidMode = Boolean.TryParse(ConfigurationManager.AppSettings["ParanoidMode"], out bool paranoidMode) ? paranoidMode : false; @@ -81,14 +81,14 @@ namespace DICUI { case MediaType.CDROM: case MediaType.GDROM: - return preferredDumpSpeedCD; + return PreferredDumpSpeedCD; case MediaType.DVD: case MediaType.HDDVD: case MediaType.NintendoGameCube: case MediaType.NintendoWiiOpticalDisc: - return preferredDumpSpeedDVD; + return PreferredDumpSpeedDVD; case MediaType.BluRay: - return preferredDumpSpeedBD; + return PreferredDumpSpeedBD; default: return 8; } diff --git a/DICUI/Windows/MainWindow.xaml.cs b/DICUI/Windows/MainWindow.xaml.cs index 42603713..0cf115b2 100644 --- a/DICUI/Windows/MainWindow.xaml.cs +++ b/DICUI/Windows/MainWindow.xaml.cs @@ -585,19 +585,19 @@ namespace DICUI.Windows { case MediaType.CDROM: case MediaType.GDROM: - preferred = _options.preferredDumpSpeedCD; + preferred = _options.PreferredDumpSpeedCD; break; case MediaType.DVD: case MediaType.HDDVD: case MediaType.NintendoGameCube: case MediaType.NintendoWiiOpticalDisc: - preferred = _options.preferredDumpSpeedDVD; + preferred = _options.PreferredDumpSpeedDVD; break; case MediaType.BluRay: - preferred = _options.preferredDumpSpeedBD; + preferred = _options.PreferredDumpSpeedBD; break; default: - preferred = _options.preferredDumpSpeedCD; + preferred = _options.PreferredDumpSpeedCD; break; } diff --git a/DICUI/Windows/OptionsWindow.xaml.cs b/DICUI/Windows/OptionsWindow.xaml.cs index afb393b9..f5f41ac6 100644 --- a/DICUI/Windows/OptionsWindow.xaml.cs +++ b/DICUI/Windows/OptionsWindow.xaml.cs @@ -100,9 +100,9 @@ namespace DICUI.Windows { Array.ForEach(PathSettings(), setting => TextBoxForPathSetting(setting).Text = _options.Get(setting)); - DumpSpeedCDSlider.Value = _options.preferredDumpSpeedCD; - DumpSpeedDVDSlider.Value = _options.preferredDumpSpeedDVD; - DumpSpeedBDSlider.Value = _options.preferredDumpSpeedBD; + DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD; + DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD; + DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD; } #region Event Handlers @@ -111,9 +111,9 @@ namespace DICUI.Windows { Array.ForEach(PathSettings(), setting => _options.Set(setting, TextBoxForPathSetting(setting).Text)); - _options.preferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value); - _options.preferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value); - _options.preferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value); + _options.PreferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value); + _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value); + _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value); _options.Save(); Hide();