WinGui:

- Updated Growl to 2.0.0.20
- Added 2 new options. "Growl when queue completes" and "Growl when encode completes"
- Added 1 new option. "Disable Resolution Calculation for "None" and "Custom" modes."
- Changed Filters dropdown menus for consistency and to match the new layout
- Fixed a problem with the Destination save dialog box double appending a file extension. Also added m4v to the filer.

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

3 files changed, 36 insertions, 24 deletions

diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs
index 216a12d30..d6bd830c7 100644
--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -80,8 +80,8 @@
             this.drop_detelecine.FormattingEnabled = true;

             this.drop_detelecine.Items.AddRange(new object[] {

             "Off",

-            "Default",

-            "Custom"});

+            "Custom",

+            "Default"});

             this.drop_detelecine.Location = new System.Drawing.Point(71, 3);

             this.drop_detelecine.Name = "drop_detelecine";

             this.drop_detelecine.Size = new System.Drawing.Size(174, 21);

@@ -118,8 +118,8 @@
             this.drop_decomb.FormattingEnabled = true;

             this.drop_decomb.Items.AddRange(new object[] {

             "Off",

-            "Default",

-            "Custom"});

+            "Custom",

+            "Default"});

             this.drop_decomb.Location = new System.Drawing.Point(71, 30);

             this.drop_decomb.Name = "drop_decomb";

             this.drop_decomb.Size = new System.Drawing.Size(174, 21);

@@ -155,11 +155,11 @@
             this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_deinterlace.FormattingEnabled = true;

             this.drop_deinterlace.Items.AddRange(new object[] {

-            "None",

+            "Off",

+            "Custom",

             "Fast",

             "Slow",

-            "Slower",

-            "Custom"});

+            "Slower"});

             this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);

             this.drop_deinterlace.Name = "drop_deinterlace";

             this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);

@@ -195,11 +195,11 @@
             this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_denoise.FormattingEnabled = true;

             this.drop_denoise.Items.AddRange(new object[] {

-            "None",

+            "Off",

+            "Custom",

             "Weak",

             "Medium",

-            "Strong",

-            "Custom"});

+            "Strong"});

             this.drop_denoise.Location = new System.Drawing.Point(71, 84);

             this.drop_denoise.Name = "drop_denoise";

             this.drop_denoise.Size = new System.Drawing.Size(174, 21);

diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs
index bfbc5e5ad..c5c56fcaf 100644
--- a/win/C#/Controls/Filters.cs
+++ b/win/C#/Controls/Filters.cs
@@ -166,10 +166,10 @@ namespace Handbrake.Controls
                     drop_detelecine.SelectedIndex = 0;

                     break;

                 case "Default":

-                    drop_detelecine.SelectedIndex = 1;

+                    drop_detelecine.SelectedIndex = 2;

                     break;

                 default:

-                    drop_detelecine.SelectedIndex = 2;

+                    drop_detelecine.SelectedIndex = 1;

                     text_customDT.Text = value;

                     text_customDT.Visible = true;

                     break;

@@ -181,20 +181,20 @@ namespace Handbrake.Controls
             text_customDN.Visible = false;

             switch (value)

             {

-                case "None":

+                case "Off":

                     drop_denoise.SelectedIndex = 0;

                     break;

                 case "Weak":

-                    drop_denoise.SelectedIndex = 1;

+                    drop_denoise.SelectedIndex = 2;

                     break;

                 case "Medium":

-                    drop_denoise.SelectedIndex = 2;

+                    drop_denoise.SelectedIndex = 3;

                     break;

                 case "Strong":

-                    drop_denoise.SelectedIndex = 3;

+                    drop_denoise.SelectedIndex = 4;

                     break;

                 default:

-                    drop_denoise.SelectedIndex = 4;

+                    drop_denoise.SelectedIndex = 1;

                     text_customDN.Text = value;

                     text_customDN.Visible = true;

                     break;

@@ -207,21 +207,21 @@ namespace Handbrake.Controls
             switch (value)

             {

 

-                case "None":

+                case "Off":

                     drop_deinterlace.SelectedIndex = 0;

                     break;

                 case "Fast":

-                    drop_deinterlace.SelectedIndex = 1;

+                    drop_deinterlace.SelectedIndex = 2;

                     break;

                 case "Slow":

-                    drop_deinterlace.SelectedIndex = 2;

+                    drop_deinterlace.SelectedIndex = 3;

                     break;

                 case "Slower":

-                    drop_deinterlace.SelectedIndex = 3;

+                    drop_deinterlace.SelectedIndex = 4;

 

                     break;

                 default:

-                    drop_deinterlace.SelectedIndex = 4;

+                    drop_deinterlace.SelectedIndex = 1;

                     text_customDI.Text = value;

                     text_customDI.Visible = true;

                     break;

@@ -237,10 +237,10 @@ namespace Handbrake.Controls
                     drop_decomb.SelectedIndex = 0;

                     break;

                 case "Default":

-                    drop_decomb.SelectedIndex = 1;

+                    drop_decomb.SelectedIndex = 2;

                     break;

                 default:

-                    drop_decomb.SelectedIndex = 2;

+                    drop_decomb.SelectedIndex = 1;

                     text_customDC.Text = value;

                     text_customDC.Visible = true;

                     break;

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index f9d322ba9..1d54c9867 100644
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -102,6 +102,9 @@ namespace Handbrake.Controls
         // Picture Controls

         private void text_width_ValueChanged(object sender, EventArgs e)

         {

+            if (Properties.Settings.Default.disableResCalc)

+                return;

+

             if (_preventChangingWidth)

                 return;

 

@@ -160,6 +163,9 @@ namespace Handbrake.Controls
         }

         private void text_height_ValueChanged(object sender, EventArgs e)

         {

+            if (Properties.Settings.Default.disableResCalc)

+                return;

+

             if (_preventChangingHeight)

                 return;

 

@@ -218,6 +224,9 @@ namespace Handbrake.Controls
         }

         private void check_KeepAR_CheckedChanged(object sender, EventArgs e)

         {

+            if (Properties.Settings.Default.disableResCalc)

+                return;

+

             //Force TextWidth to recalc height

             if (check_KeepAR.Checked)

                 text_width_ValueChanged(this, new EventArgs());

@@ -235,6 +244,9 @@ namespace Handbrake.Controls
         }

         private void updownDisplayWidth_ValueChanged(object sender, EventArgs e)

         {

+            if (Properties.Settings.Default.disableResCalc)

+                return;

+

             if (_preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked)

             {

                 _preventChangingCustom = true;