WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index a377aca..93c8899 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -692,10 +692,10 @@ namespace Handbrake
                     if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && generatedQuery != specifiedQuery)\r
                     {\r
                         DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +\r
-                            "does not match the current GUI settings. Because the manual query takes " +\r
+                            "does not match the current GUI settings.\n\nBecause the manual query takes " +\r
                             "priority over the GUI, your recently updated settings will not be taken " +\r
                             "into account when encoding this job." + Environment.NewLine + Environment.NewLine +\r
-                            "Do you want to replace the manual query with the GUI-generated query?",\r
+                            "Do you want to replace the manual query with the updated GUI-generated query?",\r
                             "Manual Query does not Match GUI",\r
                             MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,\r
                             MessageBoxDefaultButton.Button3);\r
@@ -718,7 +718,7 @@ namespace Handbrake
                     }\r
                     else\r
                     {\r
-                        query = generatedQuery;\r
+                        query = specifiedQuery;\r
                     }\r
 \r
                     DialogResult overwrite = DialogResult.Yes;\r
@@ -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
@@ -950,7 +950,7 @@ namespace Handbrake
                 Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
                 Subtitles.drp_subtitleTracks.SelectedIndex = 0;\r
                 Subtitles.Clear();\r
-                Subtitles.setSubtitleTrackAuto();\r
+                Subtitles.SetSubtitleTrackAuto();\r
             }\r
 \r
             // Run the autoName & chapterNaming functions\r
@@ -1125,7 +1125,7 @@ namespace Handbrake
             }\r
 \r
             AudioSettings.SetContainer(drop_format.Text);\r
-            Subtitles.setContainer(drop_format.SelectedIndex);\r
+            Subtitles.SetContainer(drop_format.SelectedIndex);\r
 \r
             if (drop_format.Text.Contains("MP4"))\r
             {\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
@@ -1773,6 +1773,7 @@ namespace Handbrake
             VideoFile\r
         }\r
         #endregion\r
+\r
         // This is the END of the road ****************************************\r
     }\r
 }
\ No newline at end of file