WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index f7b06a4..14b0612 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -27,6 +27,7 @@ namespace Handbrake
         Functions.Encode cliObj = new Functions.Encode();\r
         Functions.Queue encodeQueue = new Functions.Queue();\r
         Functions.Presets presetHandler = new Functions.Presets();\r
+        Functions.QueryGenerator queryGen = new Functions.QueryGenerator();\r
         Parsing.Title selectedTitle;\r
         internal Process hbProc;\r
         private Parsing.DVD thisDVD;\r
@@ -224,7 +225,7 @@ namespace Handbrake
         #region Presets Menu\r
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
-            hb_common_func.grabCLIPresets();\r
+            presetHandler.grabCLIPresets();\r
             loadPresetPanel();\r
             if (treeView_presets.Nodes.Count == 0)\r
                 MessageBox.Show("Unable to load the presets.dat file. Please select \"Update Built-in Presets\" from the Presets Menu \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
@@ -315,7 +316,7 @@ namespace Handbrake
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
                 else\r
-                    query = hb_common_func.GenerateTheQuery(this);\r
+                    query = queryGen.GenerateTheQuery(this);\r
 \r
                 ThreadPool.QueueUserWorkItem(procMonitor, query);\r
                 lbl_encode.Visible = true;\r
@@ -333,7 +334,7 @@ namespace Handbrake
             else\r
             {\r
 \r
-                String query = hb_common_func.GenerateTheQuery(this);\r
+                String query = queryGen.GenerateTheQuery(this);\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
 \r
@@ -1326,7 +1327,7 @@ namespace Handbrake
         // Query Editor Tab\r
         private void btn_generate_Query_Click(object sender, EventArgs e)\r
         {\r
-            rtf_query.Text = hb_common_func.GenerateTheQuery(this);\r
+            rtf_query.Text = queryGen.GenerateTheQuery(this);\r
         }\r
         private void btn_clear_Click(object sender, EventArgs e)\r
         {\r
@@ -1352,7 +1353,7 @@ namespace Handbrake
         }\r
         private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
-            String query = hb_common_func.GenerateTheQuery(this);\r
+            String query = queryGen.GenerateTheQuery(this);\r
             Properties.Settings.Default.defaultUserSettings = query;\r
             // Save the new default Settings\r
             Properties.Settings.Default.Save();\r
@@ -1858,7 +1859,6 @@ namespace Handbrake
             btn_start.ToolTipText = "Start the encoding process";\r
             btn_start.Image = Properties.Resources.Play;\r
         }\r
-        \r
 \r
         #endregion\r
 \r
@@ -1923,7 +1923,6 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
- \r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file