WinGui:

- When selecting a destination, The audio encoder selection dropdown now repopulates with only compatible encoders (based on file container)
- Misc other changes

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1343 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 111 insertions, 66 deletions

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 6b014a053..77b250af7 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -121,7 +121,7 @@ namespace Handbrake.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Configuration.DefaultSettingValueAttribute("2008021900")]

+        [global::System.Configuration.DefaultSettingValueAttribute("2008021901")]

         public int hb_build {

             get {

                 return ((int)(this["hb_build"]));

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index c526f7a09..45f50b8db 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -27,7 +27,7 @@
       <Value Profile="(Default)">Checked</Value>

     </Setting>

     <Setting Name="hb_build" Type="System.Int32" Scope="User">

-      <Value Profile="(Default)">2008021900</Value>

+      <Value Profile="(Default)">2008021901</Value>

     </Setting>

     <Setting Name="skipversion" Type="System.Int32" Scope="User">

       <Value Profile="(Default)">0</Value>

diff --git a/win/C#/app.config b/win/C#/app.config
index f5213e9d7..091deef5b 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -32,7 +32,7 @@
                 <value>Checked</value>

             </setting>

             <setting name="hb_build" serializeAs="String">

-                <value>2008021900</value>

+                <value>2008021901</value>

             </setting>

             <setting name="skipversion" serializeAs="String">

                 <value>0</value>

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index 5d8d44492..abddecf62 100644
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -49,7 +49,7 @@ namespace Handbrake
             this.rtf_actLog.Location = new System.Drawing.Point(12, 12);

             this.rtf_actLog.Name = "rtf_actLog";

             this.rtf_actLog.ReadOnly = true;

-            this.rtf_actLog.Size = new System.Drawing.Size(389, 381);

+            this.rtf_actLog.Size = new System.Drawing.Size(515, 433);

             this.rtf_actLog.TabIndex = 29;

             this.rtf_actLog.Text = "";

             // 

@@ -60,7 +60,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(273, 399);

+            this.btn_close.Location = new System.Drawing.Point(399, 451);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(128, 22);

             this.btn_close.TabIndex = 28;

@@ -80,7 +80,7 @@ namespace Handbrake
             this.btn_copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_copy.Location = new System.Drawing.Point(12, 399);

+            this.btn_copy.Location = new System.Drawing.Point(12, 451);

             this.btn_copy.Name = "btn_copy";

             this.btn_copy.Size = new System.Drawing.Size(134, 23);

             this.btn_copy.TabIndex = 93;

@@ -95,7 +95,7 @@ namespace Handbrake
             this.btn_refresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_refresh.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_refresh.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_refresh.Location = new System.Drawing.Point(152, 399);

+            this.btn_refresh.Location = new System.Drawing.Point(152, 451);

             this.btn_refresh.Name = "btn_refresh";

             this.btn_refresh.Size = new System.Drawing.Size(69, 23);

             this.btn_refresh.TabIndex = 94;

@@ -109,7 +109,7 @@ namespace Handbrake
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(414, 434);

+            this.ClientSize = new System.Drawing.Size(539, 486);

             this.Controls.Add(this.btn_refresh);

             this.Controls.Add(this.btn_copy);

             this.Controls.Add(this.rtf_actLog);

diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index 541c3a303..61884d537 100644
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -78,8 +78,14 @@
             this.Controls.Add(this.txt_preset_name);

             this.Controls.Add(this.lbl_name);

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

+            this.MaximizeBox = false;

+            this.MinimizeBox = false;

             this.Name = "frmAddPreset";

+            this.ShowInTaskbar = false;

+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;

+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

             this.Text = "Add Preset";

+            this.TopMost = true;

             this.ResumeLayout(false);

             this.PerformLayout();

 

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 315d13a88..331271fe0 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.Label Label38;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -133,6 +133,7 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();

             this.Label18 = new System.Windows.Forms.Label();

             this.TabPage3 = new System.Windows.Forms.TabPage();

+            this.label25 = new System.Windows.Forms.Label();

             this.lbl_vfr = new System.Windows.Forms.Label();

             this.check_grayscale = new System.Windows.Forms.CheckBox();

             this.Label22 = new System.Windows.Forms.Label();

@@ -143,6 +144,8 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();

             this.Label40 = new System.Windows.Forms.Label();

             this.TabPage1 = new System.Windows.Forms.TabPage();

+            this.label6 = new System.Windows.Forms.Label();

+            this.drp_anamorphic = new System.Windows.Forms.ComboBox();

             this.text_bottom = new System.Windows.Forms.NumericUpDown();

             this.text_top = new System.Windows.Forms.NumericUpDown();

             this.text_left = new System.Windows.Forms.NumericUpDown();

@@ -199,9 +202,6 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();

             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();

             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();

-            this.label25 = new System.Windows.Forms.Label();

-            this.drp_anamorphic = new System.Windows.Forms.ComboBox();

-            this.label6 = new System.Windows.Forms.Label();

             Label38 = new System.Windows.Forms.Label();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();

@@ -323,6 +323,7 @@ namespace Handbrake
             this.text_destination.Size = new System.Drawing.Size(429, 21);

             this.text_destination.TabIndex = 1;

             this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");

+            this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);

             // 

             // btn_Browse

             // 

@@ -665,9 +666,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle6.Format = "N0";

-            dataGridViewCellStyle6.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle6;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

@@ -1112,7 +1113,7 @@ namespace Handbrake
             this.TabPage2.Location = new System.Drawing.Point(4, 22);

             this.TabPage2.Name = "TabPage2";

             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);

-            this.TabPage2.Size = new System.Drawing.Size(649, 274);

+            this.TabPage2.Size = new System.Drawing.Size(649, 283);

             this.TabPage2.TabIndex = 3;

             this.TabPage2.Text = "Audio && Subtitles";

             // 

@@ -1343,10 +1344,21 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);

             this.TabPage3.Name = "TabPage3";

             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);

-            this.TabPage3.Size = new System.Drawing.Size(649, 302);

+            this.TabPage3.Size = new System.Drawing.Size(649, 283);

             this.TabPage3.TabIndex = 2;

             this.TabPage3.Text = "Video";

             // 

+            // label25

+            // 

+            this.label25.AutoSize = true;

+            this.label25.BackColor = System.Drawing.Color.Transparent;

+            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label25.Location = new System.Drawing.Point(13, 13);

+            this.label25.Name = "label25";

+            this.label25.Size = new System.Drawing.Size(76, 13);

+            this.label25.TabIndex = 28;

+            this.label25.Text = "Framerate";

+            // 

             // lbl_vfr

             // 

             this.lbl_vfr.AutoSize = true;

@@ -1490,6 +1502,33 @@ namespace Handbrake
             this.TabPage1.TabIndex = 0;

             this.TabPage1.Text = "Picture Settings";

             // 

+            // label6

+            // 

+            this.label6.AutoSize = true;

+            this.label6.BackColor = System.Drawing.Color.Transparent;

+            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label6.Location = new System.Drawing.Point(311, 89);

+            this.label6.Name = "label6";

+            this.label6.Size = new System.Drawing.Size(80, 13);

+            this.label6.TabIndex = 37;

+            this.label6.Text = "Anamorphic:";

+            // 

+            // drp_anamorphic

+            // 

+            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drp_anamorphic.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

+            this.drp_anamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.drp_anamorphic.FormattingEnabled = true;

+            this.drp_anamorphic.Items.AddRange(new object[] {

+            "None",

+            "Strict",

+            "Loose"});

+            this.drp_anamorphic.Location = new System.Drawing.Point(414, 86);

+            this.drp_anamorphic.Name = "drp_anamorphic";

+            this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);

+            this.drp_anamorphic.TabIndex = 36;

+            this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);

+            // 

             // text_bottom

             // 

             this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

@@ -1842,7 +1881,7 @@ namespace Handbrake
             this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);

             this.tab_chapters.Location = new System.Drawing.Point(4, 22);

             this.tab_chapters.Name = "tab_chapters";

-            this.tab_chapters.Size = new System.Drawing.Size(649, 274);

+            this.tab_chapters.Size = new System.Drawing.Size(649, 283);

             this.tab_chapters.TabIndex = 6;

             this.tab_chapters.Text = "Chapters";

             // 

@@ -1879,7 +1918,7 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);

             this.h264Tab.Name = "h264Tab";

             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);

-            this.h264Tab.Size = new System.Drawing.Size(649, 274);

+            this.h264Tab.Size = new System.Drawing.Size(649, 283);

             this.h264Tab.TabIndex = 5;

             this.h264Tab.Text = "Advanced";

             // 

@@ -1962,7 +2001,7 @@ namespace Handbrake
             this.tabPage4.Controls.Add(this.rtf_query);

             this.tabPage4.Location = new System.Drawing.Point(4, 22);

             this.tabPage4.Name = "tabPage4";

-            this.tabPage4.Size = new System.Drawing.Size(649, 274);

+            this.tabPage4.Size = new System.Drawing.Size(649, 283);

             this.tabPage4.TabIndex = 7;

             this.tabPage4.Text = "Query Editor";

             // 

@@ -2163,44 +2202,6 @@ namespace Handbrake
             this.toolStripSeparator8.Name = "toolStripSeparator8";

             this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);

             // 

-            // label25

-            // 

-            this.label25.AutoSize = true;

-            this.label25.BackColor = System.Drawing.Color.Transparent;

-            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label25.Location = new System.Drawing.Point(13, 13);

-            this.label25.Name = "label25";

-            this.label25.Size = new System.Drawing.Size(76, 13);

-            this.label25.TabIndex = 28;

-            this.label25.Text = "Framerate";

-            // 

-            // drp_anamorphic

-            // 

-            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drp_anamorphic.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

-            this.drp_anamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.drp_anamorphic.FormattingEnabled = true;

-            this.drp_anamorphic.Items.AddRange(new object[] {

-            "None",

-            "Strict",

-            "Loose"});

-            this.drp_anamorphic.Location = new System.Drawing.Point(414, 86);

-            this.drp_anamorphic.Name = "drp_anamorphic";

-            this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);

-            this.drp_anamorphic.TabIndex = 36;

-            this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);

-            // 

-            // label6

-            // 

-            this.label6.AutoSize = true;

-            this.label6.BackColor = System.Drawing.Color.Transparent;

-            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label6.Location = new System.Drawing.Point(311, 89);

-            this.label6.Name = "label6";

-            this.label6.Size = new System.Drawing.Size(80, 13);

-            this.label6.TabIndex = 37;

-            this.label6.Text = "Anamorphic:";

-            // 

             // frmMain

             // 

             this.AllowDrop = true;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 424142ef8..b83137278 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -377,6 +377,8 @@ namespace Handbrake
                 MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

             else

             {

+                setAudioByContainer(DVD_Save.FileName);

+

                 text_destination.Text = DVD_Save.FileName;

 

                 // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)

@@ -398,8 +400,49 @@ namespace Handbrake
 

         #endregion

 

+        #region Reusable Functions

+        private void setAudioByContainer(String path)

+        {

+            if ((path.EndsWith(".mp4")) || (path.EndsWith(".mp4")))

+            {

+                drp_audioCodec.Items.Clear();

+                drp_audioCodec.Items.Add("AAC");

+                drp_audioCodec.Items.Add("AAC + AC3");

+                drp_audioCodec.SelectedIndex = 0;

+            }

+            else if (path.EndsWith(".avi"))

+            {

+                drp_audioCodec.Items.Clear();

+                drp_audioCodec.Items.Add("MP3");

+                drp_audioCodec.Items.Add("AC3");

+                drp_audioCodec.SelectedIndex = 0;

+            }

+            else if (path.EndsWith(".ogm"))

+            {

+                drp_audioCodec.Items.Clear();

+                drp_audioCodec.Items.Add("Vorbis");

+                drp_audioCodec.SelectedIndex = 0;

+            }

+            else if (path.EndsWith(".mkv"))

+            {

+                drp_audioCodec.Items.Clear();

+                drp_audioCodec.Items.Add("AAC");

+                drp_audioCodec.Items.Add("AAC + AC3");

+                drp_audioCodec.Items.Add("MP3");

+                drp_audioCodec.Items.Add("AC3");

+                drp_audioCodec.Items.Add("Vorbis");

+                drp_audioCodec.SelectedIndex = 0;

+            }    

+        }

+        #endregion

+

         #region frmMain Actions

 

+        private void text_destination_TextChanged(object sender, EventArgs e)

+        {

+            setAudioByContainer(text_destination.Text);

+        }

+

         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)

         {

             // Reset some values on the form

@@ -1134,7 +1177,7 @@ namespace Handbrake
             selectedPreset = treeView_presets.SelectedNode.Text;

 

             if (!selectedPreset.StartsWith("--"))

-                MessageBox.Show("Sorry, You can not remove any of the built in presets.","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                MessageBox.Show("Sorry, You can not remove any of the built in presets.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

 

 

             // Scan through the users presets and dump them all in an arraylist

@@ -1163,7 +1206,7 @@ namespace Handbrake
             int c = 0;

             foreach (string item in user_presets)

             {

-                string preset_name = selectedPreset.Replace("--","");

+                string preset_name = selectedPreset.Replace("--", "");

                 if (item.Contains(preset_name))

                     modified_presets_list.RemoveAt(c);

                 c++;

@@ -1296,6 +1339,7 @@ namespace Handbrake
 

         #endregion

 

+

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 4ed516e0f..8f2c94a34 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,12 +149,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.

 Note: Do not change any of the chapter numbers!</value>

   </data>

-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>True</value>

-  </metadata>

-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>True</value>

-  </metadata>

   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>223, 15</value>

   </metadata>