WinGui:

- Started to decouple this code a bit. Common.cs (now Main.cs) no longer relies on the frmMain window being passed into it. frmAddPreset no longer requires to access  QueryGenerator.cs
- QueryGenerator.cs, x264Panel.cs, PresetLoader.cs all moved into their own "frmMain" folder as that is the only place they should be used.
- Rearranged the base of frmMain.cs a bit.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
index c2f754ffe..bc2743771 100644
--- a/win/C#/frmAddPreset.cs
+++ b/win/C#/frmAddPreset.cs
@@ -17,21 +17,20 @@ namespace Handbrake
 {

     public partial class frmAddPreset : Form

     {

-        Functions.QueryGenerator queryGen = new Functions.QueryGenerator();

         private frmMain frmMainWindow;

         Functions.Presets presetCode;

-

-        public frmAddPreset(frmMain fmw, Functions.Presets presetHandler)

+        private string query = "";

+   

+        public frmAddPreset(frmMain fmw, string query_string, Functions.Presets presetHandler)

         {

             InitializeComponent();

             frmMainWindow = fmw;

             presetCode = presetHandler;

+            this.query = query_string;

         }

 

         private void btn_add_Click(object sender, EventArgs e)

         {

-            String query = queryGen.generateTabbedComponentsQuery(frmMainWindow);

-

             if (presetCode.addPreset(txt_preset_name.Text.Trim(), query) == true)

             {

                 frmMainWindow.loadPresetPanel();