WinGui:

- Set use m4v option enabled by default.
- Fix some issues with auto setting m4v when use m4v is disabled.

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

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index fae48ee..f0ac81c 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -47,9 +47,19 @@ namespace Handbrake.Functions
             if (presetQuery.Format != null)\r
             {\r
                 if (presetQuery.Format == "mp4" || presetQuery.Format == "m4v")\r
-                    mainWindow.drop_format.SelectedIndex = 0;\r
+                {\r
+                    if (mainWindow.drop_format.SelectedIndex == 0)\r
+                        mainWindow.SetExtension(".mp4");\r
+                    else \r
+                        mainWindow.drop_format.SelectedIndex = 0;\r
+                }\r
                 else if (presetQuery.Format == "mkv")\r
-                    mainWindow.drop_format.SelectedIndex = 1;\r
+                {\r
+                    if(mainWindow.drop_format.SelectedIndex == 1)\r
+                        mainWindow.SetExtension(".mkv");\r
+                    else\r
+                        mainWindow.drop_format.SelectedIndex = 1;\r
+                }\r
             }\r
 \r
             mainWindow.check_iPodAtom.CheckState = presetQuery.IpodAtom ? CheckState.Checked : CheckState.Unchecked;\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 4d00334..15dfc0f 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -21,7 +21,7 @@ namespace Handbrake.Functions
         /// <param name="duration"></param>\r
         /// <param name="preview"></param>\r
         /// <returns></returns>\r
-        public string generateCLIQuery(frmMain mainWindow, int duration, string preview)\r
+        public string GenerateCLIQuery(frmMain mainWindow, int duration, string preview)\r
         {\r
             string query = "";\r
 \r
@@ -61,7 +61,7 @@ namespace Handbrake.Functions
                     query += " -o " + '"' + mainWindow.text_destination.Text + '"';\r
             }\r
 \r
-            query += generateTabbedComponentsQuery(mainWindow);\r
+            query += GenerateTabbedComponentsQuery(mainWindow);\r
 \r
             return query;\r
         }\r
@@ -71,7 +71,7 @@ namespace Handbrake.Functions
         /// </summary>\r
         /// <param name="mainWindow"></param>\r
         /// <returns></returns>\r
-        public static string generateTabbedComponentsQuery(frmMain mainWindow)\r
+        public static string GenerateTabbedComponentsQuery(frmMain mainWindow)\r
         {\r
             string query = "";\r
 \r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 86c2c76..bf243e7 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -396,7 +396,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]\r
         public bool useM4v {\r
             get {\r
                 return ((bool)(this["useM4v"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index f88c3e3..360089f 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -96,7 +96,7 @@
       <Value Profile="(Default)">7</Value>\r
     </Setting>\r
     <Setting Name="useM4v" Type="System.Boolean" Scope="User">\r
-      <Value Profile="(Default)">False</Value>\r
+      <Value Profile="(Default)">True</Value>\r
     </Setting>\r
     <Setting Name="PromptOnUnmatchingQueries" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">True</Value>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index e87b032..12068df 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -101,7 +101,7 @@
                 <value>7</value>\r
             </setting>\r
             <setting name="useM4v" serializeAs="String">\r
-                <value>False</value>\r
+                <value>True</value>\r
             </setting>\r
             <setting name="PromptOnUnmatchingQueries" serializeAs="String">\r
                 <value>True</value>\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index cbacdc7..9730765 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -69,12 +69,12 @@ namespace Handbrake
                 DateTime lastCheck = Properties.Settings.Default.lastUpdateCheckDate;\r
                 TimeSpan elapsed = now.Subtract(lastCheck);\r
                 if (elapsed.TotalDays > Properties.Settings.Default.daysBetweenUpdateCheck)\r
-               {\r
+                {\r
                     lblStatus.Text = "Checking for updates ...";\r
                     Application.DoEvents();\r
 \r
                     Main.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false);\r
-               }\r
+                }\r
             }\r
 \r
             // Setup the GUI components\r
@@ -103,7 +103,7 @@ namespace Handbrake
                         // Send the query from the file to the Query Parser class, then load the preset\r
                         QueryParser presetQuery = QueryParser.Parse(query);\r
                         PresetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
-                     \r
+\r
                         // The x264 widgets will need updated, so do this now:\r
                         x264Panel.X264_StandardizeOptString();\r
                         x264Panel.X264_SetCurrentSettingsInPanel();\r
@@ -375,7 +375,7 @@ namespace Handbrake
         }\r
         private void btn_new_preset_Click(object sender, EventArgs e)\r
         {\r
-            Form preset = new frmAddPreset(this, queryGen.generateCLIQuery(this, 0, null), presetHandler);\r
+            Form preset = new frmAddPreset(this, queryGen.GenerateCLIQuery(this, 0, null), presetHandler);\r
             preset.ShowDialog();\r
         }\r
         #endregion\r
@@ -455,9 +455,9 @@ namespace Handbrake
         {\r
             DialogResult result = MessageBox.Show("Do you wish to include picture settings when updating the preset: " + treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);\r
             if (result == DialogResult.Yes)\r
-                presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), true);\r
+                presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), true);\r
             else if (result == DialogResult.No)\r
-                presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), false);\r
+                presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), false);\r
         }\r
         private void pmnu_delete_click(object sender, EventArgs e)\r
         {\r
@@ -484,7 +484,7 @@ namespace Handbrake
         // Presets Management\r
         private void btn_addPreset_Click(object sender, EventArgs e)\r
         {\r
-            Form preset = new frmAddPreset(this, QueryGenerator.generateTabbedComponentsQuery(this), presetHandler);\r
+            Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler);\r
             preset.ShowDialog();\r
         }\r
         private void btn_removePreset_Click(object sender, EventArgs e)\r
@@ -617,16 +617,16 @@ namespace Handbrake
                     if (result == DialogResult.Yes)\r
                     {\r
                         PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
-                        presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null),\r
+                        presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null),\r
                                                    parsed.UsesPictureSettings);\r
                     }\r
                 }\r
                 else\r
                 {\r
                     PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
-                    presetHandler.addPreset(parsed.PresetName, queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
+                    presetHandler.addPreset(parsed.PresetName, queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
 \r
-                    if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
+                    if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
                     {\r
                         TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
                         treeView_presets.Nodes.Add(preset_treeview);\r
@@ -671,8 +671,8 @@ namespace Handbrake
             {\r
                 if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))\r
                 {\r
-                    string generatedQuery = queryGen.generateCLIQuery(this, 0, null);\r
-                    string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateCLIQuery(this, 0, null);\r
+                    string generatedQuery = queryGen.GenerateCLIQuery(this, 0, null);\r
+                    string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.GenerateCLIQuery(this, 0, null);\r
                     string query = string.Empty;\r
 \r
                     // Check to make sure the generated query matches the GUI settings\r
@@ -740,7 +740,7 @@ namespace Handbrake
                 MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
-                String query = queryGen.generateCLIQuery(this, 0, null);\r
+                String query = queryGen.GenerateCLIQuery(this, 0, null);\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
 \r
@@ -967,7 +967,7 @@ namespace Handbrake
         }\r
         private void chapersChanged(object sender, EventArgs e)\r
         {\r
-            Control ctl = (Control) sender;\r
+            Control ctl = (Control)sender;\r
             int chapterStart, chapterEnd;\r
             int.TryParse(drop_chapterStart.Text, out chapterStart);\r
             int.TryParse(drop_chapterFinish.Text, out chapterEnd);\r
@@ -1062,13 +1062,13 @@ namespace Handbrake
                         case 1:\r
                             if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))\r
                                 if (Properties.Settings.Default.useM4v)\r
-                                    DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv",".m4v");\r
+                                    DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");\r
                                 else\r
                                     DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");\r
                             break;\r
                         case 2:\r
                             if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))\r
-                                DVD_Save.FileName = DVD_Save.FileName .Replace(".mp4", ".mkv").Replace(".m4v",".mkv");\r
+                                DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");\r
                             break;\r
                         default:\r
                             //do nothing  \r
@@ -1078,7 +1078,7 @@ namespace Handbrake
 \r
                     // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
                     if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2)\r
-                        setExtension(".m4v");\r
+                        SetExtension(".m4v");\r
                 }\r
             }\r
         }\r
@@ -1098,19 +1098,19 @@ namespace Handbrake
             {\r
                 case 0:\r
                     if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
-                        setExtension(".m4v");\r
+                        SetExtension(".m4v");\r
                     else\r
-                        setExtension(".mp4");\r
+                        SetExtension(".mp4");\r
                     break;\r
                 case 1:\r
-                    setExtension(".mkv");\r
+                    SetExtension(".mkv");\r
                     break;\r
             }\r
 \r
             AudioSettings.SetContainer(drop_format.Text);\r
             Subtitles.setContainer(drop_format.SelectedIndex);\r
 \r
-            if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r
+            if (drop_format.Text.Contains("MP4"))\r
             {\r
                 if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))\r
                 {\r
@@ -1121,8 +1121,14 @@ namespace Handbrake
             else if (drop_format.Text.Contains("MKV"))\r
                 drp_videoEncoder.Items.Add("VP3 (Theora)");\r
         }\r
-        private void setExtension(string newExtension)\r
+        public void SetExtension(string newExtension)\r
         {\r
+            if (newExtension == ".mp4" || newExtension == ".m4v")\r
+                if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
+                    newExtension = ".m4v" ;\r
+                else\r
+                    newExtension = ".mp4";\r
+\r
             text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);\r
             text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);\r
             text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);\r
@@ -1224,7 +1230,7 @@ namespace Handbrake
                 check_iPodAtom.Checked = false;\r
             }\r
         }\r
-        private double _cachedCqStep = Properties.Settings.Default.x264cqstep;   \r
+        private double _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
         /// <summary>\r
         /// Update the CQ slider for x264 for a new CQ step. This is set from option\r
         /// </summary>\r
@@ -1233,7 +1239,7 @@ namespace Handbrake
             // Work out the current RF value.\r
             double cqStep = _cachedCqStep;\r
             double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
-            \r
+\r
             // Change the maximum value for the slider\r
             switch (Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US")))\r
             {\r
@@ -1341,14 +1347,14 @@ namespace Handbrake
             if (Check_ChapterMarkers.Checked)\r
             {\r
                 if (drop_format.SelectedIndex != 1)\r
-                    setExtension(".m4v");\r
+                    SetExtension(".m4v");\r
                 data_chpt.Enabled = true;\r
                 btn_importChapters.Enabled = true;\r
             }\r
             else\r
             {\r
                 if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)\r
-                    setExtension(".mp4");\r
+                    SetExtension(".mp4");\r
                 data_chpt.Enabled = false;\r
                 btn_importChapters.Enabled = false;\r
             }\r
@@ -1376,7 +1382,7 @@ namespace Handbrake
         // Query Editor Tab\r
         private void btn_generate_Query_Click(object sender, EventArgs e)\r
         {\r
-            rtf_query.Text = queryGen.generateCLIQuery(this, 0, null);\r
+            rtf_query.Text = queryGen.GenerateCLIQuery(this, 0, null);\r
         }\r
         private void btn_clear_Click(object sender, EventArgs e)\r
         {\r

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index fbd695f..59e6c25 100644 (file)
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -59,7 +59,7 @@ namespace Handbrake
             lbl_status.Text = "Encoding Sample for (VLC) ...";\r
             int duration;\r
             int.TryParse(cb_duration.Text, out duration);\r
-            String query = hb_common_func.generateCLIQuery(mainWindow, duration, cb_preview.Text);\r
+            String query = hb_common_func.GenerateCLIQuery(mainWindow, duration, cb_preview.Text);\r
             ThreadPool.QueueUserWorkItem(procMonitor, query);\r
         }\r
         private void btn_playQT_Click(object sender, EventArgs e)\r
@@ -89,7 +89,7 @@ namespace Handbrake
                 lbl_status.Text = "Encoding Sample for (QT) ...";\r
                 int duration;\r
                 int.TryParse(cb_duration.Text, out duration);\r
-                String query = hb_common_func.generateCLIQuery(mainWindow, duration, cb_preview.Text);\r
+                String query = hb_common_func.GenerateCLIQuery(mainWindow, duration, cb_preview.Text);\r
 \r
                 ThreadPool.QueueUserWorkItem(procMonitor, query);\r
             }\r