WinGui:

- Picture filters now have their own tab.
- Deinterlace, Decomb, Denoise and Detelecine are now custom controls with optional passthru string values
- Preset system updated to handle new controls and custom string values for filters.

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

1 files changed, 24 insertions, 11 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 4cad19528..3c77a8d1a 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -20,8 +20,8 @@ namespace Handbrake
     {

         // Objects which may be used by one or more other objects

         private delegate void UpdateWindowHandler();

-        Functions.Main hb_common_func = new Functions.Main();

-        Functions.Encode encodeHandler = new Functions.Encode();

+        Main hb_common_func = new Main();

+        Encode encodeHandler = new Encode();

         Queue.QueueHandler encodeQueue = new Queue.QueueHandler();

         Presets.PresetsHandler presetHandler = new Presets.PresetsHandler();

         Parsing.Title selectedTitle;

@@ -39,8 +39,6 @@ namespace Handbrake
         private string lastAction;

         public int maxWidth;

         public int maxHeight;

-

-

         Process hbproc;

 

         // Applicaiton Startup ************************************************

@@ -326,6 +324,14 @@ namespace Handbrake
         }

         #endregion

 

+        #region Debug Menu

+        private void mnu_qptest_Click(object sender, EventArgs e)

+        {

+            QueryParserTester qptest = new QueryParserTester();

+            qptest.Show();

+        }

+        #endregion

+

         #region Preset Bar

         // Right Click Menu Code

         private void pmnu_expandAll_Click(object sender, EventArgs e)

@@ -1172,6 +1178,20 @@ namespace Handbrake
                 text_width.Enabled = true;

             }

         }

+        

+        // Filter Tab

+        private void ctl_decomb_changed(object sender, EventArgs e)

+        {

+            if (ctl_decomb.getDropValue != "Off")

+                if (ctl_deinterlace.getDropValue != "None")

+                    ctl_deinterlace.setOption("None");

+        }

+        private void ctl_deinterlace_changed(object sender, EventArgs e)

+        {

+            if (ctl_detelecine.getDropValue != "None")

+                if (ctl_decomb.getDropValue != "Off")

+                    ctl_decomb.setOption("Off");

+        }

         private void slider_deblock_Scroll(object sender, EventArgs e)

         {

             lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();

@@ -2071,13 +2091,6 @@ namespace Handbrake
 

         #endregion

 

-        private void mnu_qptest_Click(object sender, EventArgs e)

-        {

-            QueryParserTester qptest = new QueryParserTester();

-            qptest.Show();

-

-        }

-

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

     }

 }
\ No newline at end of file