X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=93c889937fbd73cf451e18d264d3313b85b22b8d;hb=cfa1fb7010dc9324e15d257bad7a73af66e9eb10;hp=4e3a73ff9832724ddef330841119028a3839b1fa;hpb=a1dd979d389101216123ad54e2ac3195dc155c5b;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 4e3a73ff..93c88993 100644
--- 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)
                     {
                         DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +
-                            "does not match the current GUI settings. Because the manual query takes " +
+                            "does not match the current GUI settings.\n\nBecause the manual query takes " +
                             "priority over the GUI, your recently updated settings will not be taken " +
                             "into account when encoding this job." + Environment.NewLine + Environment.NewLine +
-                            "Do you want to replace the manual query with the GUI-generated query?",
+                            "Do you want to replace the manual query with the updated GUI-generated query?",
                             "Manual Query does not Match GUI",
                             MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,
                             MessageBoxDefaultButton.Button3);
@@ -718,7 +718,7 @@ namespace Handbrake
                     }
                     else
                     {
-                        query = generatedQuery;
+                        query = specifiedQuery;
                     }
 
                     DialogResult overwrite = DialogResult.Yes;
@@ -729,7 +729,7 @@ namespace Handbrake
                     if (overwrite == DialogResult.Yes)
                     {
                         if (encodeQueue.Count == 0)
-                            encodeQueue.AddJob(query, sourcePath, text_destination.Text);
+                            encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));
 
                         queueWindow.setQueue();
                         if (encodeQueue.Count > 1)
@@ -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?",
                   "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
                     if (result == DialogResult.Yes)
-                        encodeQueue.AddJob(query, sourcePath, text_destination.Text);
+                        encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));
 
                 }
                 else
-                    encodeQueue.AddJob(query, sourcePath, text_destination.Text);
+                    encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));
 
                 lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";
 
@@ -806,6 +806,8 @@ namespace Handbrake
             if (ActivityWindow == null)
                 ActivityWindow = new frmActivityWindow(file, encodeQueue, this);
 
+            ActivityWindow.SetLogView(!encodeQueue.isEncoding);
+
             ActivityWindow.Show();
         }
         #endregion
@@ -913,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;
@@ -947,7 +949,8 @@ namespace Handbrake
                 Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");
                 Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());
                 Subtitles.drp_subtitleTracks.SelectedIndex = 0;
-                Subtitles.setSubtitleTrackAuto();
+                Subtitles.Clear();
+                Subtitles.SetSubtitleTrackAuto();
             }
 
             // Run the autoName & chapterNaming functions
@@ -1122,7 +1125,7 @@ namespace Handbrake
             }
 
             AudioSettings.SetContainer(drop_format.Text);
-            Subtitles.setContainer(drop_format.SelectedIndex);
+            Subtitles.SetContainer(drop_format.SelectedIndex);
 
             if (drop_format.Text.Contains("MP4"))
             {
@@ -1451,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 };