From c670e56a5ae06d7537e08b599a189f5771af1155 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 31 Oct 2009 16:36:20 +0000 Subject: WinGui: - Change enable libdvdnav option to disable libdvdnav option. (Since the CLI now uses libdvdnav by default) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2906 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Functions/QueryGenerator.cs | 6 +++--- win/C#/Parsing/Title.cs | 2 +- win/C#/Properties/Settings.Designer.cs | 10 +++++----- win/C#/Properties/Settings.settings | 4 ++-- win/C#/app.config | 4 ++-- win/C#/frmMain.cs | 6 +++--- win/C#/frmOptions.Designer.cs | 4 ++-- win/C#/frmOptions.cs | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index 0ba49171c..3b34cd577 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -35,7 +35,7 @@ namespace Handbrake.Functions query += " -t " + titleInfo[0]; } - if (Properties.Settings.Default.dvdnav) + if (!Properties.Settings.Default.noDvdNav) if (mainWindow.drop_angle.Items.Count != 0) query += " --angle " + mainWindow.drop_angle.SelectedItem; @@ -519,8 +519,8 @@ namespace Handbrake.Functions query += " -v " + Properties.Settings.Default.verboseLevel; - if (Properties.Settings.Default.dvdnav) - query += " --dvdnav"; + if (Properties.Settings.Default.noDvdNav) + query += " --no-dvdnav"; #endregion return query; diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs index 9c44330f1..1a98a58ed 100644 --- a/win/C#/Parsing/Title.cs +++ b/win/C#/Parsing/Title.cs @@ -146,7 +146,7 @@ namespace Handbrake.Parsing output.ReadLine(); - if (Properties.Settings.Default.dvdnav) + if (!Properties.Settings.Default.noDvdNav) { // Get the Angles for the title. m = Regex.Match(output.ReadLine(), @" \+ angle\(s\) ([0-9,])"); diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 333313cc4..af174ab57 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3082 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -301,13 +301,13 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool dvdnav { + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool noDvdNav { get { - return ((bool)(this["dvdnav"])); + return ((bool)(this["noDvdNav"])); } set { - this["dvdnav"] = value; + this["noDvdNav"] = value; } } diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index b4738a5fa..f1c02639e 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -71,8 +71,8 @@ 1 - - True + + False False diff --git a/win/C#/app.config b/win/C#/app.config index 5a447a3fa..6cd2d7e1b 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -76,8 +76,8 @@ 1 - - True + + False False diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index b8b7121e8..93c889937 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -915,7 +915,7 @@ namespace Handbrake // Populate the Angles dropdown drop_angle.Items.Clear(); - if (Properties.Settings.Default.dvdnav) + if (!Properties.Settings.Default.noDvdNav) { drop_angle.Visible = true; lbl_angle.Visible = true; @@ -1454,8 +1454,8 @@ namespace Handbrake File.Delete(dvdInfoPath); String dvdnav = string.Empty; - if (Properties.Settings.Default.dvdnav) - dvdnav = " --dvdnav"; + if (Properties.Settings.Default.noDvdNav) + dvdnav = " --no-dvdnav"; string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, sourcePath, dvdnav, dvdInfoPath); ProcessStartInfo hbParseDvd = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden }; diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index e91a0283d..5e9e23faa 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -929,9 +929,9 @@ namespace Handbrake this.tableLayoutPanel4.SetColumnSpan(this.check_dvdnav, 4); this.check_dvdnav.Location = new System.Drawing.Point(67, 208); this.check_dvdnav.Name = "check_dvdnav"; - this.check_dvdnav.Size = new System.Drawing.Size(250, 17); + this.check_dvdnav.Size = new System.Drawing.Size(276, 17); this.check_dvdnav.TabIndex = 90; - this.check_dvdnav.Text = "Use libdvdnav (instead of libdvdread) for DVDs"; + this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)"; this.check_dvdnav.UseVisualStyleBackColor = false; this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged); // diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 9b33b9030..77a7a58ce 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -175,7 +175,7 @@ namespace Handbrake } // Use Experimental dvdnav - if (Properties.Settings.Default.dvdnav) + if (Properties.Settings.Default.noDvdNav) check_dvdnav.CheckState = CheckState.Checked; // ############################# @@ -412,7 +412,7 @@ namespace Handbrake private void check_dvdnav_CheckedChanged(object sender, EventArgs e) { - Properties.Settings.Default.dvdnav = check_dvdnav.Checked; + Properties.Settings.Default.noDvdNav = check_dvdnav.Checked; } #endregion -- cgit v1.2.3