WinGui:

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 4b2ddb7..18e39f7 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -111,7 +111,7 @@ namespace Handbrake
 \r
                     if (query != null)\r
                     {\r
-                        x264Panel.reset2Defaults();\r
+                        x264Panel.Reset2Defaults();\r
 \r
                         QueryParser presetQuery = QueryParser.Parse(query);\r
                         PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
@@ -397,7 +397,7 @@ namespace Handbrake
         }\r
         private void btn_new_preset_Click(object sender, EventArgs e)\r
         {\r
-            Form preset = new frmAddPreset(this, QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null), presetHandler);\r
+            Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), presetHandler);\r
             preset.ShowDialog();\r
         }\r
         #endregion\r
@@ -597,7 +597,7 @@ namespace Handbrake
                     if (query != null)\r
                     {\r
                         //Ok, Reset all the H264 widgets before changing the preset\r
-                        x264Panel.reset2Defaults();\r
+                        x264Panel.Reset2Defaults();\r
 \r
                         // Send the query from the file to the Query Parser class\r
                         QueryParser presetQuery = QueryParser.Parse(query);\r
@@ -639,16 +639,16 @@ namespace Handbrake
                     if (result == DialogResult.Yes)\r
                     {\r
                         PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
-                        presetHandler.Update(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null),\r
+                        presetHandler.Update(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),\r
                                                    parsed.UsesPictureSettings);\r
                     }\r
                 }\r
                 else\r
                 {\r
                     PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
-                    presetHandler.Add(parsed.PresetName, QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings);\r
+                    presetHandler.Add(parsed.PresetName, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings);\r
 \r
-                    if (presetHandler.Add(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings))\r
+                    if (presetHandler.Add(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings))\r
                     {\r
                         TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
                         treeView_presets.Nodes.Add(preset_treeview);\r
@@ -706,8 +706,8 @@ namespace Handbrake
             {\r
                 if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))\r
                 {\r
-                    string generatedQuery = QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
-                    string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
+                    string generatedQuery = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
+                    string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
                     string query = string.Empty;\r
 \r
                     // Check to make sure the generated query matches the GUI settings\r
@@ -776,7 +776,7 @@ namespace Handbrake
                 MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
-                String query = QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
+                String query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
 \r
@@ -1262,7 +1262,7 @@ namespace Handbrake
                 check_turbo.CheckState = CheckState.Unchecked;\r
                 check_turbo.Enabled = false;\r
                 tab_advanced.Enabled = false;\r
-                x264Panel.x264Query = "";\r
+                x264Panel.X264Query = "";\r
                 check_iPodAtom.Enabled = false;\r
                 check_iPodAtom.Checked = false;\r
             }\r
@@ -1387,27 +1387,15 @@ namespace Handbrake
             switch (drp_videoEncoder.Text)\r
             {\r
                 case "MPEG-4 (FFmpeg)":\r
-                    double rfValue = 31 - (slider_videoQuality.Value - 1);\r
-                    double max = slider_videoQuality.Maximum;\r
-                    double min = slider_videoQuality.Minimum;\r
-                    double val = ((max - min) - (rfValue - min)) / (max - min);\r
                     lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value);\r
-                    lbl_qualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
                 case "H.264 (x264)":\r
-                    rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
-                    max = slider_videoQuality.Maximum * cqStep;\r
-                    min = slider_videoQuality.Minimum;\r
-                    val = ((max - min) - (rfValue - min)) / (max - min);\r
+                    double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
                     rfValue = Math.Round(rfValue, 2);\r
                     lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US"));\r
-                    lbl_qualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
                 case "VP3 (Theora)":\r
-                    rfValue = slider_videoQuality.Value;\r
-                    double value = rfValue / 63;\r
                     lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value;\r
-                    lbl_qualityValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
             }\r
         }\r
@@ -1491,7 +1479,7 @@ namespace Handbrake
         // Query Editor Tab\r
         private void btn_generate_Query_Click(object sender, EventArgs e)\r
         {\r
-            rtf_query.Text = QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
+            rtf_query.Text = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
         }\r
         private void btn_clear_Click(object sender, EventArgs e)\r
         {\r
@@ -1679,7 +1667,7 @@ namespace Handbrake
             if (query != null)\r
             {\r
                 //Ok, Reset all the H264 widgets before changing the preset\r
-                x264Panel.reset2Defaults();\r
+                x264Panel.Reset2Defaults();\r
 \r
                 // Send the query from the file to the Query Parser class\r
                 QueryParser presetQuery = QueryParser.Parse(query);\r