WinGui:

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 4e3a73f..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
@@ -729,7 +729,7 @@ namespace Handbrake
                     if (overwrite == DialogResult.Yes)\r
                     {\r
                         if (encodeQueue.Count == 0)\r
-                            encodeQueue.AddJob(query, sourcePath, text_destination.Text);\r
+                            encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
 \r
                         queueWindow.setQueue();\r
                         if (encodeQueue.Count > 1)\r
@@ -764,11 +764,11 @@ namespace Handbrake
                     DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",\r
                   "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
                     if (result == DialogResult.Yes)\r
-                        encodeQueue.AddJob(query, sourcePath, text_destination.Text);\r
+                        encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
 \r
                 }\r
                 else\r
-                    encodeQueue.AddJob(query, sourcePath, text_destination.Text);\r
+                    encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
 \r
                 lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";\r
 \r
@@ -806,6 +806,8 @@ namespace Handbrake
             if (ActivityWindow == null)\r
                 ActivityWindow = new frmActivityWindow(file, encodeQueue, this);\r
 \r
+            ActivityWindow.SetLogView(!encodeQueue.isEncoding);\r
+\r
             ActivityWindow.Show();\r
         }\r
         #endregion\r
@@ -913,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
@@ -947,7 +949,8 @@ namespace Handbrake
                 Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");\r
                 Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
                 Subtitles.drp_subtitleTracks.SelectedIndex = 0;\r
-                Subtitles.setSubtitleTrackAuto();\r
+                Subtitles.Clear();\r
+                Subtitles.SetSubtitleTrackAuto();\r
             }\r
 \r
             // Run the autoName & chapterNaming functions\r
@@ -1122,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
@@ -1451,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