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, 2 deletions

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index ec9b318d1..47639341d 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -26,7 +26,7 @@ namespace Handbrake
         private Parsing.DVD thisDvd;

         private delegate void UpdateUIHandler();

         Process hbproc;

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

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

         Functions.Encode process = new Functions.Encode();

 

         public frmReadDVD(string inputFile, frmMain parent)

@@ -49,6 +49,7 @@ namespace Handbrake
                 MessageBox.Show("frmReadDVD.cs - startScan " + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

             }

         }

+

         private void startProc(object state)

         {

             try

@@ -112,7 +113,7 @@ namespace Handbrake
 

                 // Now select the longest title

                 if (thisDvd.Titles.Count != 0)

-                    hb_common_func.selectLongestTitle(mainWindow);

+                    mainWindow.drp_dvdtitle.SelectedItem = hb_common_func.selectLongestTitle(mainWindow.drp_dvdtitle);

 

                 this.Close();

             }

@@ -122,6 +123,7 @@ namespace Handbrake
                 this.Close();

             }

         }

+

         private void closeWindowAfterError()

         {

             try