WinGui:

- Change enable libdvdnav option to disable libdvdnav option. (Since the CLI now uses libdvdnav by default)

git-svn-id: svn://localhost/HandBrake/trunk@2906 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 0ba4917..3b34cd5 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -35,7 +35,7 @@ namespace Handbrake.Functions
                 query += " -t " + titleInfo[0];\r
             }\r
 \r
-            if (Properties.Settings.Default.dvdnav)\r
+            if (!Properties.Settings.Default.noDvdNav)\r
                 if (mainWindow.drop_angle.Items.Count != 0)\r
                     query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
 \r
@@ -519,8 +519,8 @@ namespace Handbrake.Functions
 \r
             query += " -v " + Properties.Settings.Default.verboseLevel;\r
 \r
-            if (Properties.Settings.Default.dvdnav)\r
-                query += " --dvdnav";\r
+            if (Properties.Settings.Default.noDvdNav)\r
+                query += " --no-dvdnav";\r
             #endregion\r
 \r
             return query;\r

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index 9c44330..1a98a58 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -146,7 +146,7 @@ namespace Handbrake.Parsing
 \r
             output.ReadLine();\r
 \r
-            if (Properties.Settings.Default.dvdnav)\r
+            if (!Properties.Settings.Default.noDvdNav)\r
             {\r
                 // Get the Angles for the title.\r
                 m = Regex.Match(output.ReadLine(), @"  \+ angle\(s\) ([0-9,])");\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 333313c..af174ab 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:2.0.50727.3082\r
+//     Runtime Version:2.0.50727.4927\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -301,13 +301,13 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]\r
-        public bool dvdnav {\r
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]\r
+        public bool noDvdNav {\r
             get {\r
-                return ((bool)(this["dvdnav"]));\r
+                return ((bool)(this["noDvdNav"]));\r
             }\r
             set {\r
-                this["dvdnav"] = value;\r
+                this["noDvdNav"] = value;\r
             }\r
         }\r
         \r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index b4738a5..f1c0263 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -71,8 +71,8 @@
     <Setting Name="verboseLevel" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">1</Value>\r
     </Setting>\r
-    <Setting Name="dvdnav" Type="System.Boolean" Scope="User">\r
-      <Value Profile="(Default)">True</Value>\r
+    <Setting Name="noDvdNav" Type="System.Boolean" Scope="User">\r
+      <Value Profile="(Default)">False</Value>\r
     </Setting>\r
     <Setting Name="presetNotification" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">False</Value>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 5a447a3..6cd2d7e 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -76,8 +76,8 @@
             <setting name="verboseLevel" serializeAs="String">\r
                 <value>1</value>\r
             </setting>\r
-            <setting name="dvdnav" serializeAs="String">\r
-                <value>True</value>\r
+            <setting name="noDvdNav" serializeAs="String">\r
+                <value>False</value>\r
             </setting>\r
             <setting name="presetNotification" serializeAs="String">\r
                 <value>False</value>\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b8b7121..93c8899 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -915,7 +915,7 @@ namespace Handbrake
 \r
                 // Populate the Angles dropdown\r
                 drop_angle.Items.Clear();\r
-                if (Properties.Settings.Default.dvdnav)\r
+                if (!Properties.Settings.Default.noDvdNav)\r
                 {\r
                     drop_angle.Visible = true;\r
                     lbl_angle.Visible = true;\r
@@ -1454,8 +1454,8 @@ namespace Handbrake
                     File.Delete(dvdInfoPath);\r
 \r
                 String dvdnav = string.Empty;\r
-                if (Properties.Settings.Default.dvdnav)\r
-                    dvdnav = " --dvdnav";\r
+                if (Properties.Settings.Default.noDvdNav)\r
+                    dvdnav = " --no-dvdnav";\r
                 string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, sourcePath, dvdnav, dvdInfoPath);\r
 \r
                 ProcessStartInfo hbParseDvd = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden };\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index e91a028..5e9e23f 100644 (file)
--- 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);\r
             this.check_dvdnav.Location = new System.Drawing.Point(67, 208);\r
             this.check_dvdnav.Name = "check_dvdnav";\r
-            this.check_dvdnav.Size = new System.Drawing.Size(250, 17);\r
+            this.check_dvdnav.Size = new System.Drawing.Size(276, 17);\r
             this.check_dvdnav.TabIndex = 90;\r
-            this.check_dvdnav.Text = "Use libdvdnav (instead of libdvdread) for DVDs";\r
+            this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)";\r
             this.check_dvdnav.UseVisualStyleBackColor = false;\r
             this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);\r
             // \r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 9b33b90..77a7a58 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -175,7 +175,7 @@ namespace Handbrake
             }\r
 \r
             // Use Experimental dvdnav\r
-            if (Properties.Settings.Default.dvdnav)\r
+            if (Properties.Settings.Default.noDvdNav)\r
                 check_dvdnav.CheckState = CheckState.Checked;\r
 \r
             // #############################\r
@@ -412,7 +412,7 @@ namespace Handbrake
 \r
         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            Properties.Settings.Default.dvdnav = check_dvdnav.Checked;\r
+            Properties.Settings.Default.noDvdNav = check_dvdnav.Checked;\r
         }\r
         #endregion\r
 \r