WinGui:

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

diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
index a04b074..22ba835 100644 (file)
--- a/win/C#/frmAddPreset.cs
+++ b/win/C#/frmAddPreset.cs
@@ -6,8 +6,11 @@
 namespace Handbrake\r
 {\r
     using System;\r
-    using System.Drawing;\r
     using System.Windows.Forms;\r
+\r
+    using Handbrake.Functions;\r
+    using Handbrake.Model;\r
+\r
     using Presets;\r
 \r
     /// <summary>\r
@@ -15,9 +18,6 @@ namespace Handbrake
     /// </summary>\r
     public partial class frmAddPreset : Form\r
     {\r
-        /// <summary>\r
-        /// The Main  Window\r
-        /// </summary>\r
         private readonly frmMain mainWindow;\r
 \r
         /// <summary>\r
@@ -26,28 +26,19 @@ namespace Handbrake
         private readonly PresetsHandler presetCode;\r
 \r
         /// <summary>\r
-        /// The CLI Query\r
-        /// </summary>\r
-        private readonly string query = string.Empty;\r
-\r
-        /// <summary>\r
         /// Initializes a new instance of the <see cref="frmAddPreset"/> class.\r
         /// </summary>\r
-        /// <param name="fmw">\r
-        /// The fmw.\r
-        /// </param>\r
-        /// <param name="queryString">\r
-        /// The query string.\r
-        /// </param>\r
+        /// <param name="mainWindow"></param>\r
         /// <param name="presetHandler">\r
         /// The preset handler.\r
         /// </param>\r
-        public frmAddPreset(frmMain fmw, string queryString, PresetsHandler presetHandler)\r
+        public frmAddPreset(frmMain mainWindow, PresetsHandler presetHandler)\r
         {\r
             InitializeComponent();\r
-            mainWindow = fmw;\r
+            this.mainWindow = mainWindow;\r
             presetCode = presetHandler;\r
-            this.query = queryString;\r
+\r
+            cb_usePictureSettings.SelectedIndex = 0;\r
         }\r
 \r
         /// <summary>\r
@@ -61,11 +52,34 @@ namespace Handbrake
         /// </param>\r
         private void BtnAddClick(object sender, EventArgs e)\r
         {\r
-            if (presetCode.Add(txt_preset_name.Text.Trim(), query, check_pictureSettings.Checked))\r
+            if (string.IsNullOrEmpty(txt_preset_name.Text.Trim()))\r
+            {\r
+                MessageBox.Show("You must enter a preset name!", "Warning",\r
+                                MessageBoxButtons.OK, MessageBoxIcon.Warning);                \r
+                return;\r
+            }\r
+\r
+            QueryPictureSettingsMode pictureSettingsMode;\r
+\r
+            switch (cb_usePictureSettings.SelectedIndex)\r
+            {\r
+                case 0:\r
+                    pictureSettingsMode = QueryPictureSettingsMode.None;\r
+                    break;\r
+                case 1:\r
+                    pictureSettingsMode = QueryPictureSettingsMode.SourceMaximum;\r
+                    break;\r
+                default:\r
+                    pictureSettingsMode = QueryPictureSettingsMode.None;\r
+                    break;\r
+            }\r
+\r
+            string query = QueryGenerator.GenerateQueryForPreset(mainWindow, pictureSettingsMode, check_useFilters.Checked, 0, 0);\r
+\r
+            if (presetCode.Add(txt_preset_name.Text.Trim(), query, pictureSettingsMode != QueryPictureSettingsMode.None))\r
             {\r
-                TreeNode presetTreeview = new TreeNode(txt_preset_name.Text.Trim()) {ForeColor = Color.Black};\r
-                mainWindow.treeView_presets.Nodes.Add(presetTreeview);\r
-                this.Close();\r
+                this.DialogResult = DialogResult.OK;\r
+                this.Close();           \r
             }\r
             else\r
                 MessageBox.Show("Sorry, that preset name already exists. Please choose another!", "Warning", \r
@@ -83,6 +97,7 @@ namespace Handbrake
         /// </param>\r
         private void BtnCancelClick(object sender, EventArgs e)\r
         {\r
+            this.DialogResult = DialogResult.Cancel;\r
             this.Close();\r
         }\r
     }\r