OSDN Git Service

(root) / handbrake-jp / handbrake-jp-git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25ada7a)
WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 15 Jun 2009 14:56:23 +0000 (14:56 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 15 Jun 2009 14:56:23 +0000 (14:56 +0000)
- Picture Settings: Height of 0 allows for no -l to be passed to the CLI
- Picture Settings / pre-sets now set 0 when no Height specified. Prevents the panel from using incorrect values when pre-sets are selected.
- Simplified the Encode.cs set-up. Includes changes to QueueHandler

git-svn-id: svn://localhost/HandBrake/trunk@2534 b64f7644-9d1e-0410-96f1-a4d463321fa5

17 files changed:
win/C#/Controls/PictureSettings.Designer.cs patch | blob | history
win/C#/Controls/PictureSettings.cs patch | blob | history
win/C#/Controls/PictureSettings.resx patch | blob | history
win/C#/EncodeQueue/Encode.cs patch | blob | history
win/C#/EncodeQueue/EncodeProcess.cs [deleted file] patch | blob | history
win/C#/EncodeQueue/Job.cs [moved from win/C#/EncodeQueue/QueueItem.cs with 93% similarity] patch | blob | history
win/C#/EncodeQueue/QueueHandler.cs patch | blob | history
win/C#/Functions/Main.cs patch | blob | history
win/C#/Functions/PresetLoader.cs patch | blob | history
win/C#/Functions/QueryGenerator.cs patch | blob | history
win/C#/Functions/Win32.cs patch | blob | history
win/C#/HandBrakeCS.csproj patch | blob | history
win/C#/Presets/PresetsHandler.cs patch | blob | history
win/C#/frmAddPreset.Designer.cs patch | blob | history
win/C#/frmMain.cs patch | blob | history
win/C#/frmPreview.cs patch | blob | history
win/C#/frmQueue.cs patch | blob | history

diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs
index 50296bc..67c0dad 100644 (file)
--- a/win/C#/Controls/PictureSettings.Designer.cs
+++ b/win/C#/Controls/PictureSettings.Designer.cs
@@ -77,18 +77,17 @@ namespace Handbrake.Controls
             // \r
             // text_height\r
             // \r
+            this.text_height.AccessibleDescription = null;\r
+            this.text_height.AccessibleName = null;\r
             resources.ApplyResources(this.text_height, "text_height");\r
+            this.text_height.Font = null;\r
             this.text_height.Maximum = new decimal(new int[] {\r
             2560,\r
             0,\r
             0,\r
             0});\r
-            this.text_height.Minimum = new decimal(new int[] {\r
-            64,\r
-            0,\r
-            0,\r
-            0});\r
             this.text_height.Name = "text_height";\r
+            this.toolTip.SetToolTip(this.text_height, resources.GetString("text_height.ToolTip"));\r
             this.text_height.Value = new decimal(new int[] {\r
             64,\r
             0,\r
@@ -98,7 +97,10 @@ namespace Handbrake.Controls
             // \r
             // text_width\r
             // \r
+            this.text_width.AccessibleDescription = null;\r
+            this.text_width.AccessibleName = null;\r
             resources.ApplyResources(this.text_width, "text_width");\r
+            this.text_width.Font = null;\r
             this.text_width.Maximum = new decimal(new int[] {\r
             2560,\r
             0,\r
@@ -110,6 +112,7 @@ namespace Handbrake.Controls
             0,\r
             0});\r
             this.text_width.Name = "text_width";\r
+            this.toolTip.SetToolTip(this.text_width, resources.GetString("text_width.ToolTip"));\r
             this.text_width.Value = new decimal(new int[] {\r
             64,\r
             0,\r
@@ -119,38 +122,58 @@ namespace Handbrake.Controls
             // \r
             // label4\r
             // \r
+            this.label4.AccessibleDescription = null;\r
+            this.label4.AccessibleName = null;\r
             resources.ApplyResources(this.label4, "label4");\r
             this.label4.BackColor = System.Drawing.Color.Transparent;\r
             this.label4.ForeColor = System.Drawing.Color.Black;\r
             this.label4.Name = "label4";\r
+            this.toolTip.SetToolTip(this.label4, resources.GetString("label4.ToolTip"));\r
             // \r
             // lbl_max\r
             // \r
+            this.lbl_max.AccessibleDescription = null;\r
+            this.lbl_max.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_max, "lbl_max");\r
+            this.lbl_max.Font = null;\r
             this.lbl_max.Name = "lbl_max";\r
+            this.toolTip.SetToolTip(this.lbl_max, resources.GetString("lbl_max.ToolTip"));\r
             // \r
             // lbl_src_res\r
             // \r
+            this.lbl_src_res.AccessibleDescription = null;\r
+            this.lbl_src_res.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_src_res, "lbl_src_res");\r
             this.lbl_src_res.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_src_res.Name = "lbl_src_res";\r
+            this.toolTip.SetToolTip(this.lbl_src_res, resources.GetString("lbl_src_res.ToolTip"));\r
             // \r
             // label7\r
             // \r
+            this.label7.AccessibleDescription = null;\r
+            this.label7.AccessibleName = null;\r
             resources.ApplyResources(this.label7, "label7");\r
             this.label7.BackColor = System.Drawing.Color.Transparent;\r
+            this.label7.Font = null;\r
             this.label7.Name = "label7";\r
+            this.toolTip.SetToolTip(this.label7, resources.GetString("label7.ToolTip"));\r
             // \r
             // label6\r
             // \r
+            this.label6.AccessibleDescription = null;\r
+            this.label6.AccessibleName = null;\r
             resources.ApplyResources(this.label6, "label6");\r
             this.label6.BackColor = System.Drawing.Color.Transparent;\r
             this.label6.Name = "label6";\r
+            this.toolTip.SetToolTip(this.label6, resources.GetString("label6.ToolTip"));\r
             // \r
             // drp_anamorphic\r
             // \r
-            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drp_anamorphic.AccessibleDescription = null;\r
+            this.drp_anamorphic.AccessibleName = null;\r
             resources.ApplyResources(this.drp_anamorphic, "drp_anamorphic");\r
+            this.drp_anamorphic.BackgroundImage = null;\r
+            this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drp_anamorphic.FormattingEnabled = true;\r
             this.drp_anamorphic.Items.AddRange(new object[] {\r
             resources.GetString("drp_anamorphic.Items"),\r
@@ -158,43 +181,62 @@ namespace Handbrake.Controls
             resources.GetString("drp_anamorphic.Items2"),\r
             resources.GetString("drp_anamorphic.Items3")});\r
             this.drp_anamorphic.Name = "drp_anamorphic";\r
+            this.toolTip.SetToolTip(this.drp_anamorphic, resources.GetString("drp_anamorphic.ToolTip"));\r
             this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);\r
             // \r
             // label26\r
             // \r
+            this.label26.AccessibleDescription = null;\r
+            this.label26.AccessibleName = null;\r
             resources.ApplyResources(this.label26, "label26");\r
             this.label26.BackColor = System.Drawing.Color.Transparent;\r
             this.label26.Name = "label26";\r
+            this.toolTip.SetToolTip(this.label26, resources.GetString("label26.ToolTip"));\r
             // \r
             // lbl_Aspect\r
             // \r
+            this.lbl_Aspect.AccessibleDescription = null;\r
+            this.lbl_Aspect.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_Aspect, "lbl_Aspect");\r
             this.lbl_Aspect.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_Aspect.Name = "lbl_Aspect";\r
+            this.toolTip.SetToolTip(this.lbl_Aspect, resources.GetString("lbl_Aspect.ToolTip"));\r
             // \r
             // Label91\r
             // \r
+            this.Label91.AccessibleDescription = null;\r
+            this.Label91.AccessibleName = null;\r
             resources.ApplyResources(this.Label91, "Label91");\r
             this.Label91.BackColor = System.Drawing.Color.Transparent;\r
             this.Label91.Name = "Label91";\r
+            this.toolTip.SetToolTip(this.Label91, resources.GetString("Label91.ToolTip"));\r
             // \r
             // Label55\r
             // \r
+            this.Label55.AccessibleDescription = null;\r
+            this.Label55.AccessibleName = null;\r
             resources.ApplyResources(this.Label55, "Label55");\r
             this.Label55.BackColor = System.Drawing.Color.Transparent;\r
             this.Label55.ForeColor = System.Drawing.Color.Black;\r
             this.Label55.Name = "Label55";\r
+            this.toolTip.SetToolTip(this.Label55, resources.GetString("Label55.ToolTip"));\r
             // \r
             // lbl_modulus\r
             // \r
+            this.lbl_modulus.AccessibleDescription = null;\r
+            this.lbl_modulus.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_modulus, "lbl_modulus");\r
             this.lbl_modulus.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_modulus.Name = "lbl_modulus";\r
+            this.toolTip.SetToolTip(this.lbl_modulus, resources.GetString("lbl_modulus.ToolTip"));\r
             // \r
             // drop_modulus\r
             // \r
-            this.drop_modulus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_modulus.AccessibleDescription = null;\r
+            this.drop_modulus.AccessibleName = null;\r
             resources.ApplyResources(this.drop_modulus, "drop_modulus");\r
+            this.drop_modulus.BackgroundImage = null;\r
+            this.drop_modulus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_modulus.FormattingEnabled = true;\r
             this.drop_modulus.Items.AddRange(new object[] {\r
             resources.GetString("drop_modulus.Items"),\r
@@ -202,72 +244,112 @@ namespace Handbrake.Controls
             resources.GetString("drop_modulus.Items2"),\r
             resources.GetString("drop_modulus.Items3")});\r
             this.drop_modulus.Name = "drop_modulus";\r
+            this.toolTip.SetToolTip(this.drop_modulus, resources.GetString("drop_modulus.ToolTip"));\r
             // \r
             // txt_displayWidth\r
             // \r
+            this.txt_displayWidth.AccessibleDescription = null;\r
+            this.txt_displayWidth.AccessibleName = null;\r
             resources.ApplyResources(this.txt_displayWidth, "txt_displayWidth");\r
+            this.txt_displayWidth.BackgroundImage = null;\r
+            this.txt_displayWidth.Font = null;\r
             this.txt_displayWidth.Name = "txt_displayWidth";\r
             this.toolTip.SetToolTip(this.txt_displayWidth, resources.GetString("txt_displayWidth.ToolTip"));\r
             this.txt_displayWidth.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txt_displayWidth_Keyup);\r
             // \r
             // lbl_displayWidth\r
             // \r
+            this.lbl_displayWidth.AccessibleDescription = null;\r
+            this.lbl_displayWidth.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_displayWidth, "lbl_displayWidth");\r
             this.lbl_displayWidth.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_displayWidth.Name = "lbl_displayWidth";\r
+            this.toolTip.SetToolTip(this.lbl_displayWidth, resources.GetString("lbl_displayWidth.ToolTip"));\r
             // \r
             // lbl_parWidth\r
             // \r
+            this.lbl_parWidth.AccessibleDescription = null;\r
+            this.lbl_parWidth.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_parWidth, "lbl_parWidth");\r
             this.lbl_parWidth.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_parWidth.Name = "lbl_parWidth";\r
+            this.toolTip.SetToolTip(this.lbl_parWidth, resources.GetString("lbl_parWidth.ToolTip"));\r
             // \r
             // txt_parWidth\r
             // \r
+            this.txt_parWidth.AccessibleDescription = null;\r
+            this.txt_parWidth.AccessibleName = null;\r
             resources.ApplyResources(this.txt_parWidth, "txt_parWidth");\r
+            this.txt_parWidth.BackgroundImage = null;\r
+            this.txt_parWidth.Font = null;\r
             this.txt_parWidth.Name = "txt_parWidth";\r
             this.toolTip.SetToolTip(this.txt_parWidth, resources.GetString("txt_parWidth.ToolTip"));\r
             this.txt_parWidth.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txt_parWidth_Keyup);\r
             // \r
             // lbl_parHeight\r
             // \r
+            this.lbl_parHeight.AccessibleDescription = null;\r
+            this.lbl_parHeight.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_parHeight, "lbl_parHeight");\r
             this.lbl_parHeight.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_parHeight.Name = "lbl_parHeight";\r
+            this.toolTip.SetToolTip(this.lbl_parHeight, resources.GetString("lbl_parHeight.ToolTip"));\r
             // \r
             // txt_parHeight\r
             // \r
+            this.txt_parHeight.AccessibleDescription = null;\r
+            this.txt_parHeight.AccessibleName = null;\r
             resources.ApplyResources(this.txt_parHeight, "txt_parHeight");\r
+            this.txt_parHeight.BackgroundImage = null;\r
+            this.txt_parHeight.Font = null;\r
             this.txt_parHeight.Name = "txt_parHeight";\r
             this.toolTip.SetToolTip(this.txt_parHeight, resources.GetString("txt_parHeight.ToolTip"));\r
             this.txt_parHeight.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txt_parHeight_Keyup);\r
             // \r
             // check_KeepAR\r
             // \r
+            this.check_KeepAR.AccessibleDescription = null;\r
+            this.check_KeepAR.AccessibleName = null;\r
             resources.ApplyResources(this.check_KeepAR, "check_KeepAR");\r
+            this.check_KeepAR.BackgroundImage = null;\r
+            this.check_KeepAR.Font = null;\r
             this.check_KeepAR.Name = "check_KeepAR";\r
+            this.toolTip.SetToolTip(this.check_KeepAR, resources.GetString("check_KeepAR.ToolTip"));\r
             this.check_KeepAR.UseVisualStyleBackColor = true;\r
             this.check_KeepAR.CheckedChanged += new System.EventHandler(this.check_KeepAR_CheckedChanged);\r
             // \r
             // check_customCrop\r
             // \r
+            this.check_customCrop.AccessibleDescription = null;\r
+            this.check_customCrop.AccessibleName = null;\r
             resources.ApplyResources(this.check_customCrop, "check_customCrop");\r
+            this.check_customCrop.BackgroundImage = null;\r
+            this.check_customCrop.Font = null;\r
             this.check_customCrop.Name = "check_customCrop";\r
+            this.toolTip.SetToolTip(this.check_customCrop, resources.GetString("check_customCrop.ToolTip"));\r
             this.check_customCrop.UseVisualStyleBackColor = true;\r
             this.check_customCrop.CheckedChanged += new System.EventHandler(this.check_customCrop_CheckedChanged);\r
             // \r
             // check_autoCrop\r
             // \r
+            this.check_autoCrop.AccessibleDescription = null;\r
+            this.check_autoCrop.AccessibleName = null;\r
             resources.ApplyResources(this.check_autoCrop, "check_autoCrop");\r
+            this.check_autoCrop.BackgroundImage = null;\r
             this.check_autoCrop.Checked = true;\r
+            this.check_autoCrop.Font = null;\r
             this.check_autoCrop.Name = "check_autoCrop";\r
             this.check_autoCrop.TabStop = true;\r
+            this.toolTip.SetToolTip(this.check_autoCrop, resources.GetString("check_autoCrop.ToolTip"));\r
             this.check_autoCrop.UseVisualStyleBackColor = true;\r
             this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\r
             // \r
             // crop_bottom\r
             // \r
+            this.crop_bottom.AccessibleDescription = null;\r
+            this.crop_bottom.AccessibleName = null;\r
             resources.ApplyResources(this.crop_bottom, "crop_bottom");\r
+            this.crop_bottom.Font = null;\r
             this.crop_bottom.Increment = new decimal(new int[] {\r
             2,\r
             0,\r
@@ -279,11 +361,15 @@ namespace Handbrake.Controls
             0,\r
             0});\r
             this.crop_bottom.Name = "crop_bottom";\r
+            this.toolTip.SetToolTip(this.crop_bottom, resources.GetString("crop_bottom.ToolTip"));\r
             this.crop_bottom.ValueChanged += new System.EventHandler(this.crop_bottom_ValueChanged);\r
             // \r
             // crop_top\r
             // \r
+            this.crop_top.AccessibleDescription = null;\r
+            this.crop_top.AccessibleName = null;\r
             resources.ApplyResources(this.crop_top, "crop_top");\r
+            this.crop_top.Font = null;\r
             this.crop_top.Increment = new decimal(new int[] {\r
             2,\r
             0,\r
@@ -295,11 +381,15 @@ namespace Handbrake.Controls
             0,\r
             0});\r
             this.crop_top.Name = "crop_top";\r
+            this.toolTip.SetToolTip(this.crop_top, resources.GetString("crop_top.ToolTip"));\r
             this.crop_top.ValueChanged += new System.EventHandler(this.crop_top_ValueChanged);\r
             // \r
             // crop_left\r
             // \r
+            this.crop_left.AccessibleDescription = null;\r
+            this.crop_left.AccessibleName = null;\r
             resources.ApplyResources(this.crop_left, "crop_left");\r
+            this.crop_left.Font = null;\r
             this.crop_left.Increment = new decimal(new int[] {\r
             2,\r
             0,\r
@@ -311,11 +401,15 @@ namespace Handbrake.Controls
             0,\r
             0});\r
             this.crop_left.Name = "crop_left";\r
+            this.toolTip.SetToolTip(this.crop_left, resources.GetString("crop_left.ToolTip"));\r
             this.crop_left.ValueChanged += new System.EventHandler(this.crop_left_ValueChanged);\r
             // \r
             // crop_right\r
             // \r
+            this.crop_right.AccessibleDescription = null;\r
+            this.crop_right.AccessibleName = null;\r
             resources.ApplyResources(this.crop_right, "crop_right");\r
+            this.crop_right.Font = null;\r
             this.crop_right.Increment = new decimal(new int[] {\r
             2,\r
             0,\r
@@ -327,53 +421,80 @@ namespace Handbrake.Controls
             0,\r
             0});\r
             this.crop_right.Name = "crop_right";\r
+            this.toolTip.SetToolTip(this.crop_right, resources.GetString("crop_right.ToolTip"));\r
             this.crop_right.ValueChanged += new System.EventHandler(this.crop_right_ValueChanged);\r
             // \r
             // label8\r
             // \r
+            this.label8.AccessibleDescription = null;\r
+            this.label8.AccessibleName = null;\r
             resources.ApplyResources(this.label8, "label8");\r
             this.label8.BackColor = System.Drawing.Color.Transparent;\r
             this.label8.Name = "label8";\r
+            this.toolTip.SetToolTip(this.label8, resources.GetString("label8.ToolTip"));\r
             // \r
             // Label53\r
             // \r
+            this.Label53.AccessibleDescription = null;\r
+            this.Label53.AccessibleName = null;\r
             resources.ApplyResources(this.Label53, "Label53");\r
             this.Label53.BackColor = System.Drawing.Color.Transparent;\r
             this.Label53.Name = "Label53";\r
+            this.toolTip.SetToolTip(this.Label53, resources.GetString("Label53.ToolTip"));\r
             // \r
             // Label52\r
             // \r
+            this.Label52.AccessibleDescription = null;\r
+            this.Label52.AccessibleName = null;\r
             resources.ApplyResources(this.Label52, "Label52");\r
             this.Label52.BackColor = System.Drawing.Color.Transparent;\r
             this.Label52.Name = "Label52";\r
+            this.toolTip.SetToolTip(this.Label52, resources.GetString("Label52.ToolTip"));\r
             // \r
             // Label51\r
             // \r
+            this.Label51.AccessibleDescription = null;\r
+            this.Label51.AccessibleName = null;\r
             resources.ApplyResources(this.Label51, "Label51");\r
             this.Label51.BackColor = System.Drawing.Color.Transparent;\r
             this.Label51.Name = "Label51";\r
+            this.toolTip.SetToolTip(this.Label51, resources.GetString("Label51.ToolTip"));\r
             // \r
             // Label15\r
             // \r
+            this.Label15.AccessibleDescription = null;\r
+            this.Label15.AccessibleName = null;\r
             resources.ApplyResources(this.Label15, "Label15");\r
             this.Label15.BackColor = System.Drawing.Color.Transparent;\r
             this.Label15.Name = "Label15";\r
+            this.toolTip.SetToolTip(this.Label15, resources.GetString("Label15.ToolTip"));\r
             // \r
             // lbl_anamorphic\r
             // \r
+            this.lbl_anamorphic.AccessibleDescription = null;\r
+            this.lbl_anamorphic.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_anamorphic, "lbl_anamorphic");\r
             this.lbl_anamorphic.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_anamorphic.Name = "lbl_anamorphic";\r
+            this.toolTip.SetToolTip(this.lbl_anamorphic, resources.GetString("lbl_anamorphic.ToolTip"));\r
             // \r
             // lbl_anamprohicLbl\r
             // \r
+            this.lbl_anamprohicLbl.AccessibleDescription = null;\r
+            this.lbl_anamprohicLbl.AccessibleName = null;\r
             resources.ApplyResources(this.lbl_anamprohicLbl, "lbl_anamprohicLbl");\r
             this.lbl_anamprohicLbl.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_anamprohicLbl.Font = null;\r
             this.lbl_anamprohicLbl.Name = "lbl_anamprohicLbl";\r
+            this.toolTip.SetToolTip(this.lbl_anamprohicLbl, resources.GetString("lbl_anamprohicLbl.ToolTip"));\r
             // \r
             // PictureSettings\r
             // \r
+            this.AccessibleDescription = null;\r
+            this.AccessibleName = null;\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
+            resources.ApplyResources(this, "$this");\r
+            this.BackgroundImage = null;\r
             this.Controls.Add(this.lbl_anamorphic);\r
             this.Controls.Add(this.lbl_anamprohicLbl);\r
             this.Controls.Add(this.check_customCrop);\r
@@ -408,8 +529,9 @@ namespace Handbrake.Controls
             this.Controls.Add(this.lbl_Aspect);\r
             this.Controls.Add(this.Label91);\r
             this.Controls.Add(this.Label55);\r
+            this.Font = null;\r
             this.Name = "PictureSettings";\r
-            resources.ApplyResources(this, "$this");\r
+            this.toolTip.SetToolTip(this, resources.GetString("$this.ToolTip"));\r
             ((System.ComponentModel.ISupportInitialize)(this.text_height)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.text_width)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.crop_bottom)).EndInit();\r
diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index b7d08b8..2d1fc15 100644 (file)
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -542,8 +542,8 @@ namespace Handbrake.Controls
                 if (selectedTitle.Resolution.Height < returnVal)\r
                     returnVal = selectedTitle.Resolution.Height;\r
 \r
-            if (returnVal < 64)\r
-                returnVal = 64;\r
+            /*if (returnVal < 64)\r
+                returnVal = 64;*/\r
 \r
             // Set the global tracker\r
             heightVal = (int)returnVal;\r
@@ -623,20 +623,15 @@ namespace Handbrake.Controls
                     double new_height = (width*selectedTitle.Resolution.Width*ah*crop_height)/\r
                                         (selectedTitle.Resolution.Height*aw*crop_width);\r
 \r
-                    if (drp_anamorphic.SelectedIndex == 3)\r
-                        new_height = getModulusAuto(int.Parse(drop_modulus.SelectedItem.ToString()), new_height);\r
-                    else\r
-                        new_height = getModulusAuto(16, new_height);\r
+                    new_height = drp_anamorphic.SelectedIndex == 3 ? getModulusAuto(int.Parse(drop_modulus.SelectedItem.ToString()), new_height) : getModulusAuto(16, new_height);\r
 \r
-                    //16 * (421 / 16)\r
-                    //double z = ( 16 * (( y + 8 ) / 16 ) );\r
                     int x = int.Parse(new_height.ToString());\r
-                    if (x < 64)\r
-                        x = 64;\r
+                    /*if (x < 64)\r
+                        x = 64; */\r
                     return x;\r
                 }\r
             }\r
-            return 64;\r
+            return 0;\r
         }\r
         private int cacluateWidth(int height)\r
         {\r
diff --git a/win/C#/Controls/PictureSettings.resx b/win/C#/Controls/PictureSettings.resx
index 7371a74..4558791 100644 (file)
--- a/win/C#/Controls/PictureSettings.resx
+++ b/win/C#/Controls/PictureSettings.resx
@@ -117,843 +117,974 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
-  <data name="text_height.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>206, 59</value>\r
-  </data>\r
-  <data name="text_height.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>64, 20</value>\r
-  </data>\r
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
-  <data name="text_height.TabIndex" type="System.Int32, mscorlib">\r
-    <value>50</value>\r
+  <data name="&gt;&gt;label7.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;text_height.Name" xml:space="preserve">\r
-    <value>text_height</value>\r
+  <data name="&gt;&gt;lbl_anamprohicLbl.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;text_height.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;crop_left.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;text_height.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
-  </data>\r
-  <data name="&gt;&gt;text_height.ZOrder" xml:space="preserve">\r
-    <value>22</value>\r
+  <data name="lbl_max.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="text_width.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>68, 59</value>\r
+  <data name="check_KeepAR.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="text_width.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>64, 20</value>\r
+  <data name="&gt;&gt;lbl_src_res.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="text_width.TabIndex" type="System.Int32, mscorlib">\r
-    <value>49</value>\r
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="Label53.TabIndex" type="System.Int32, mscorlib">\r
+    <value>68</value>\r
   </data>\r
-  <data name="&gt;&gt;text_width.Name" xml:space="preserve">\r
-    <value>text_width</value>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="lbl_anamorphic.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>108, 250</value>\r
   </data>\r
-  <data name="&gt;&gt;text_width.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_modulus.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="&gt;&gt;text_width.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="check_KeepAR.Text" xml:space="preserve">\r
+    <value>Keep Aspect Ratio</value>\r
   </data>\r
-  <data name="&gt;&gt;text_width.ZOrder" xml:space="preserve">\r
-    <value>23</value>\r
+  <data name="drop_modulus.Items3" xml:space="preserve">\r
+    <value>2</value>\r
   </data>\r
-  <data name="label4.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="&gt;&gt;crop_bottom.Name" xml:space="preserve">\r
+    <value>crop_bottom</value>\r
   </data>\r
-  <data name="label4.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="&gt;&gt;drop_modulus.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>152, 63</value>\r
+  <data name="lbl_Aspect.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>72, 12</value>\r
   </data>\r
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>48, 13</value>\r
+  <data name="&gt;&gt;check_KeepAR.Name" xml:space="preserve">\r
+    <value>check_KeepAR</value>\r
   </data>\r
-  <data name="label4.TabIndex" type="System.Int32, mscorlib">\r
-    <value>48</value>\r
+  <data name="&gt;&gt;crop_right.Name" xml:space="preserve">\r
+    <value>crop_right</value>\r
   </data>\r
-  <data name="label4.Text" xml:space="preserve">\r
-    <value>Height:</value>\r
+  <data name="&gt;&gt;check_KeepAR.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;label4.Name" xml:space="preserve">\r
-    <value>label4</value>\r
+  <data name="lbl_src_res.Text" xml:space="preserve">\r
+    <value>Select a Title</value>\r
   </data>\r
-  <data name="&gt;&gt;label4.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;lbl_displayWidth.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;label4.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="txt_displayWidth.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>110, 170</value>\r
   </data>\r
-  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">\r
-    <value>24</value>\r
+  <data name="lbl_parHeight.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="lbl_max.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="lbl_parWidth.TabIndex" type="System.Int32, mscorlib">\r
+    <value>56</value>\r
   </data>\r
-  <data name="lbl_max.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>279, 61</value>\r
+  <data name="crop_top.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>467, 100</value>\r
   </data>\r
-  <data name="lbl_max.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>34, 13</value>\r
+  <data name="Label55.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="lbl_max.TabIndex" type="System.Int32, mscorlib">\r
-    <value>47</value>\r
+  <data name="&gt;&gt;Label51.Name" xml:space="preserve">\r
+    <value>Label51</value>\r
   </data>\r
-  <data name="lbl_max.Text" xml:space="preserve">\r
-    <value>{max}</value>\r
+  <data name="txt_parWidth.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>100, 20</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_max.Name" xml:space="preserve">\r
-    <value>lbl_max</value>\r
+  <data name="label26.TabIndex" type="System.Int32, mscorlib">\r
+    <value>39</value>\r
+  </data>\r
+  <data name="lbl_Aspect.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
   <data name="&gt;&gt;lbl_max.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_max.Parent" xml:space="preserve">\r
+  <data name="&gt;&gt;lbl_modulus.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_max.ZOrder" xml:space="preserve">\r
-    <value>25</value>\r
+  <data name="&gt;&gt;Label55.Name" xml:space="preserve">\r
+    <value>Label55</value>\r
   </data>\r
-  <data name="lbl_src_res.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="&gt;&gt;label26.ZOrder" xml:space="preserve">\r
+    <value>30</value>\r
   </data>\r
-  <data name="lbl_src_res.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 6.75pt</value>\r
+  <data name="lbl_anamprohicLbl.Text" xml:space="preserve">\r
+    <value>Anamorphic:</value>\r
   </data>\r
-  <data name="lbl_src_res.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>66, 36</value>\r
+  <data name="&gt;&gt;lbl_displayWidth.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="lbl_src_res.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>72, 12</value>\r
+  <data name="&gt;&gt;crop_top.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="lbl_src_res.TabIndex" type="System.Int32, mscorlib">\r
-    <value>41</value>\r
+  <data name="&gt;&gt;drop_modulus.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="lbl_src_res.Text" xml:space="preserve">\r
+  <data name="&gt;&gt;lbl_Aspect.Name" xml:space="preserve">\r
+    <value>lbl_Aspect</value>\r
+  </data>\r
+  <data name="Label52.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>474, 85</value>\r
+  </data>\r
+  <data name="&gt;&gt;label6.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="lbl_anamorphic.Text" xml:space="preserve">\r
     <value>Select a Title</value>\r
   </data>\r
+  <data name="lbl_max.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>279, 61</value>\r
+  </data>\r
   <data name="&gt;&gt;lbl_src_res.Name" xml:space="preserve">\r
     <value>lbl_src_res</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_src_res.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="drop_modulus.Items" xml:space="preserve">\r
+    <value>16</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_src_res.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_src_res.ZOrder" xml:space="preserve">\r
-    <value>26</value>\r
+  <data name="&gt;&gt;check_autoCrop.ZOrder" xml:space="preserve">\r
+    <value>3</value>\r
   </data>\r
-  <data name="label7.AutoSize" type="System.Boolean, mscorlib">\r
+  <data name="lbl_displayWidth.AutoSize" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
   </data>\r
-  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>13, 35</value>\r
-  </data>\r
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>44, 13</value>\r
+  <data name="text_height.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>206, 59</value>\r
   </data>\r
-  <data name="label7.TabIndex" type="System.Int32, mscorlib">\r
-    <value>40</value>\r
+  <data name="crop_left.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>416, 122</value>\r
   </data>\r
-  <data name="label7.Text" xml:space="preserve">\r
-    <value>Source:</value>\r
+  <data name="&gt;&gt;txt_parWidth.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;label7.Name" xml:space="preserve">\r
-    <value>label7</value>\r
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;label7.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>44, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;label7.Parent" xml:space="preserve">\r
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">\r
-    <value>27</value>\r
+  <data name="&gt;&gt;Label52.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="check_autoCrop.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="label6.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="&gt;&gt;txt_displayWidth.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>14, 119</value>\r
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">\r
+    <value>48</value>\r
   </data>\r
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>80, 13</value>\r
+  <data name="txt_parWidth.ToolTip" xml:space="preserve">\r
+    <value>PAR Width - Press "Enter" after entering a new value.\r
+</value>\r
   </data>\r
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">\r
-    <value>45</value>\r
+  <data name="lbl_anamorphic.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>72, 12</value>\r
   </data>\r
-  <data name="label6.Text" xml:space="preserve">\r
-    <value>Anamorphic:</value>\r
+  <data name="Label53.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>48, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">\r
-    <value>label6</value>\r
+  <data name="check_customCrop.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>63, 17</value>\r
   </data>\r
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="&gt;&gt;lbl_max.ZOrder" xml:space="preserve">\r
+    <value>25</value>\r
   </data>\r
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="crop_left.TabIndex" type="System.Int32, mscorlib">\r
+    <value>62</value>\r
   </data>\r
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">\r
-    <value>28</value>\r
+  <data name="label7.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="drp_anamorphic.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="lbl_modulus.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="drp_anamorphic.Items" xml:space="preserve">\r
-    <value>None</value>\r
+  <data name="&gt;&gt;text_height.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="drp_anamorphic.Items1" xml:space="preserve">\r
-    <value>Strict</value>\r
+  <data name="&gt;&gt;crop_right.ZOrder" xml:space="preserve">\r
+    <value>7</value>\r
   </data>\r
-  <data name="drp_anamorphic.Items2" xml:space="preserve">\r
-    <value>Loose</value>\r
+  <data name="check_KeepAR.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>68, 85</value>\r
   </data>\r
-  <data name="drp_anamorphic.Items3" xml:space="preserve">\r
-    <value>Custom</value>\r
+  <data name="Label53.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="drp_anamorphic.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>110, 116</value>\r
+  <data name="&gt;&gt;lbl_parHeight.Name" xml:space="preserve">\r
+    <value>lbl_parHeight</value>\r
   </data>\r
-  <data name="drp_anamorphic.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>110, 21</value>\r
+  <data name="&gt;&gt;crop_left.Name" xml:space="preserve">\r
+    <value>crop_left</value>\r
   </data>\r
-  <data name="drp_anamorphic.TabIndex" type="System.Int32, mscorlib">\r
-    <value>46</value>\r
-  </data>\r
-  <data name="&gt;&gt;drp_anamorphic.Name" xml:space="preserve">\r
-    <value>drp_anamorphic</value>\r
-  </data>\r
-  <data name="&gt;&gt;drp_anamorphic.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </data>\r
-  <data name="&gt;&gt;drp_anamorphic.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="check_customCrop.TabIndex" type="System.Int32, mscorlib">\r
+    <value>70</value>\r
   </data>\r
-  <data name="&gt;&gt;drp_anamorphic.ZOrder" xml:space="preserve">\r
-    <value>29</value>\r
+  <data name="Label52.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="label26.AutoSize" type="System.Boolean, mscorlib">\r
+  <data name="Label55.AutoSize" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
   </data>\r
-  <data name="label26.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt, style=Bold</value>\r
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>48, 13</value>\r
   </data>\r
-  <data name="label26.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>13, 13</value>\r
+  <data name="lbl_parWidth.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>14, 199</value>\r
   </data>\r
-  <data name="label26.Size" type="System.Drawing.Size, System.Drawing">\r
+  <data name="lbl_max.Size" type="System.Drawing.Size, System.Drawing">\r
     <value>34, 13</value>\r
   </data>\r
-  <data name="label26.TabIndex" type="System.Int32, mscorlib">\r
-    <value>39</value>\r
-  </data>\r
   <data name="label26.Text" xml:space="preserve">\r
     <value>Size</value>\r
   </data>\r
-  <data name="&gt;&gt;label26.Name" xml:space="preserve">\r
-    <value>label26</value>\r
-  </data>\r
-  <data name="&gt;&gt;label26.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </data>\r
-  <data name="&gt;&gt;label26.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="lbl_modulus.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>58, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;label26.ZOrder" xml:space="preserve">\r
-    <value>30</value>\r
+  <data name="label4.Text" xml:space="preserve">\r
+    <value>Height:</value>\r
   </data>\r
-  <data name="lbl_Aspect.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="&gt;&gt;lbl_anamprohicLbl.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
   </data>\r
-  <data name="lbl_Aspect.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 6.75pt</value>\r
+  <data name="&gt;&gt;check_customCrop.ZOrder" xml:space="preserve">\r
+    <value>2</value>\r
   </data>\r
-  <data name="lbl_Aspect.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>241, 36</value>\r
+  <data name="&gt;&gt;txt_parWidth.Name" xml:space="preserve">\r
+    <value>txt_parWidth</value>\r
   </data>\r
-  <data name="lbl_Aspect.Size" type="System.Drawing.Size, System.Drawing">\r
+  <data name="lbl_src_res.Size" type="System.Drawing.Size, System.Drawing">\r
     <value>72, 12</value>\r
   </data>\r
-  <data name="lbl_Aspect.TabIndex" type="System.Int32, mscorlib">\r
-    <value>43</value>\r
-  </data>\r
-  <data name="lbl_Aspect.Text" xml:space="preserve">\r
-    <value>Select a Title</value>\r
+  <data name="Label53.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_Aspect.Name" xml:space="preserve">\r
-    <value>lbl_Aspect</value>\r
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>37, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_Aspect.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="label26.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>34, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_Aspect.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="label26.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;lbl_Aspect.ZOrder" xml:space="preserve">\r
-    <value>31</value>\r
+  <data name="&gt;&gt;label8.Name" xml:space="preserve">\r
+    <value>label8</value>\r
   </data>\r
-  <data name="Label91.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="drp_anamorphic.Items1" xml:space="preserve">\r
+    <value>Strict</value>\r
   </data>\r
-  <data name="Label91.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="drp_anamorphic.Items2" xml:space="preserve">\r
+    <value>Loose</value>\r
   </data>\r
-  <data name="Label91.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>152, 35</value>\r
+  <data name="drp_anamorphic.Items3" xml:space="preserve">\r
+    <value>Custom</value>\r
   </data>\r
-  <data name="Label91.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>83, 13</value>\r
+  <data name="&gt;&gt;lbl_Aspect.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="Label91.TabIndex" type="System.Int32, mscorlib">\r
-    <value>42</value>\r
+  <data name="drop_modulus.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>110, 143</value>\r
   </data>\r
-  <data name="Label91.Text" xml:space="preserve">\r
-    <value>Aspect Ratio:</value>\r
+  <data name="&gt;&gt;drop_modulus.Name" xml:space="preserve">\r
+    <value>drop_modulus</value>\r
   </data>\r
-  <data name="&gt;&gt;Label91.Name" xml:space="preserve">\r
-    <value>Label91</value>\r
+  <data name="&gt;&gt;crop_left.ZOrder" xml:space="preserve">\r
+    <value>6</value>\r
   </data>\r
-  <data name="&gt;&gt;Label91.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;lbl_modulus.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;Label91.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="label4.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;Label91.ZOrder" xml:space="preserve">\r
-    <value>32</value>\r
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">\r
+    <value>label4</value>\r
   </data>\r
-  <data name="Label55.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="lbl_modulus.Text" xml:space="preserve">\r
+    <value>Modulus:</value>\r
   </data>\r
-  <data name="Label55.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="crop_bottom.Enabled" type="System.Boolean, mscorlib">\r
+    <value>False</value>\r
   </data>\r
-  <data name="Label55.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>13, 63</value>\r
+  <data name="&gt;&gt;check_customCrop.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_parHeight.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
   <data name="Label55.Size" type="System.Drawing.Size, System.Drawing">\r
     <value>44, 13</value>\r
   </data>\r
-  <data name="Label55.TabIndex" type="System.Int32, mscorlib">\r
-    <value>44</value>\r
+  <data name="&gt;&gt;crop_bottom.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="Label55.Text" xml:space="preserve">\r
-    <value>Width:</value>\r
+  <data name="&gt;&gt;lbl_modulus.ZOrder" xml:space="preserve">\r
+    <value>20</value>\r
   </data>\r
-  <data name="&gt;&gt;Label55.Name" xml:space="preserve">\r
-    <value>Label55</value>\r
+  <data name="&gt;&gt;lbl_parHeight.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;Label55.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;Label53.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;Label53.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;Label55.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="&gt;&gt;Label91.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;Label55.ZOrder" xml:space="preserve">\r
-    <value>33</value>\r
+  <data name="crop_top.Enabled" type="System.Boolean, mscorlib">\r
+    <value>False</value>\r
   </data>\r
-  <data name="lbl_modulus.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="&gt;&gt;label8.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="lbl_modulus.Font" type="System.Drawing.Font, System.Drawing">\r
+  <data name="drp_anamorphic.Font" type="System.Drawing.Font, System.Drawing">\r
     <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="lbl_modulus.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>14, 146</value>\r
+  <data name="&gt;&gt;crop_top.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="lbl_modulus.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>58, 13</value>\r
+  <data name="&gt;&gt;lbl_Aspect.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="lbl_modulus.TabIndex" type="System.Int32, mscorlib">\r
-    <value>51</value>\r
+  <data name="&gt;&gt;text_width.ZOrder" xml:space="preserve">\r
+    <value>23</value>\r
   </data>\r
-  <data name="lbl_modulus.Text" xml:space="preserve">\r
-    <value>Modulus:</value>\r
+  <data name="txt_displayWidth.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>100, 20</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_modulus.Name" xml:space="preserve">\r
-    <value>lbl_modulus</value>\r
+  <data name="lbl_parHeight.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>75, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_modulus.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_src_res.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 6.75pt</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_modulus.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="lbl_displayWidth.Text" xml:space="preserve">\r
+    <value>Display Width:</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_modulus.ZOrder" xml:space="preserve">\r
-    <value>20</value>\r
+  <data name="&gt;&gt;txt_parHeight.Name" xml:space="preserve">\r
+    <value>txt_parHeight</value>\r
   </data>\r
-  <data name="drop_modulus.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="check_customCrop.Text" xml:space="preserve">\r
+    <value>Custom:</value>\r
   </data>\r
-  <data name="drop_modulus.Items" xml:space="preserve">\r
-    <value>16</value>\r
+  <data name="&gt;&gt;lbl_anamprohicLbl.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="lbl_displayWidth.TabIndex" type="System.Int32, mscorlib">\r
+    <value>54</value>\r
+  </data>\r
+  <data name="&gt;&gt;Label55.ZOrder" xml:space="preserve">\r
+    <value>33</value>\r
+  </data>\r
+  <data name="label8.Text" xml:space="preserve">\r
+    <value>Crop</value>\r
   </data>\r
   <data name="drop_modulus.Items1" xml:space="preserve">\r
     <value>8</value>\r
   </data>\r
-  <data name="drop_modulus.Items2" xml:space="preserve">\r
-    <value>4</value>\r
+  <data name="&gt;&gt;label7.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="drop_modulus.Items3" xml:space="preserve">\r
-    <value>2</value>\r
+  <data name="&gt;&gt;lbl_max.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="drop_modulus.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>110, 143</value>\r
+  <data name="&gt;&gt;lbl_displayWidth.ZOrder" xml:space="preserve">\r
+    <value>18</value>\r
   </data>\r
-  <data name="drop_modulus.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>110, 21</value>\r
+  <data name="lbl_parHeight.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="drop_modulus.TabIndex" type="System.Int32, mscorlib">\r
-    <value>52</value>\r
+  <data name="lbl_src_res.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="&gt;&gt;drop_modulus.Name" xml:space="preserve">\r
-    <value>drop_modulus</value>\r
+  <data name="crop_top.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>44, 20</value>\r
   </data>\r
-  <data name="&gt;&gt;drop_modulus.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_Aspect.TabIndex" type="System.Int32, mscorlib">\r
+    <value>43</value>\r
   </data>\r
-  <data name="&gt;&gt;drop_modulus.Parent" xml:space="preserve">\r
+  <data name="&gt;&gt;crop_bottom.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;drop_modulus.ZOrder" xml:space="preserve">\r
-    <value>21</value>\r
+  <data name="label7.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="txt_displayWidth.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>110, 170</value>\r
+  <data name="label8.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
   </data>\r
-  <data name="txt_displayWidth.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>100, 20</value>\r
+  <data name="Label51.Text" xml:space="preserve">\r
+    <value>Right</value>\r
   </data>\r
-  <data name="txt_displayWidth.TabIndex" type="System.Int32, mscorlib">\r
-    <value>53</value>\r
+  <data name="&gt;&gt;Label52.Name" xml:space="preserve">\r
+    <value>Label52</value>\r
   </data>\r
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 17</value>\r
-  </metadata>\r
-  <data name="txt_displayWidth.ToolTip" xml:space="preserve">\r
-    <value>Display Width - Press "Enter" after entering a new value.</value>\r
+  <data name="&gt;&gt;drp_anamorphic.ZOrder" xml:space="preserve">\r
+    <value>29</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_displayWidth.Name" xml:space="preserve">\r
-    <value>txt_displayWidth</value>\r
+  <data name="drop_modulus.TabIndex" type="System.Int32, mscorlib">\r
+    <value>52</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_displayWidth.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="lbl_max.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="Label51.ToolTip" xml:space="preserve">\r
+    <value />\r
+  </data>\r
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">\r
+    <value>PictureSettings</value>\r
+  </data>\r
+  <data name="check_autoCrop.TabIndex" type="System.Int32, mscorlib">\r
+    <value>69</value>\r
+  </data>\r
+  <data name="&gt;&gt;txt_parWidth.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_displayWidth.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="&gt;&gt;toolTip.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_displayWidth.ZOrder" xml:space="preserve">\r
-    <value>19</value>\r
+  <data name="&gt;&gt;check_autoCrop.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="lbl_displayWidth.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="check_customCrop.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="lbl_displayWidth.Font" type="System.Drawing.Font, System.Drawing">\r
+  <data name="lbl_parWidth.Font" type="System.Drawing.Font, System.Drawing">\r
     <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="lbl_displayWidth.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>14, 173</value>\r
+  <data name="lbl_parWidth.Text" xml:space="preserve">\r
+    <value>PAR Width:</value>\r
   </data>\r
-  <data name="lbl_displayWidth.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>90, 13</value>\r
+  <data name="&gt;&gt;label26.Name" xml:space="preserve">\r
+    <value>label26</value>\r
   </data>\r
-  <data name="lbl_displayWidth.TabIndex" type="System.Int32, mscorlib">\r
-    <value>54</value>\r
+  <data name="&gt;&gt;check_KeepAR.ZOrder" xml:space="preserve">\r
+    <value>13</value>\r
   </data>\r
-  <data name="lbl_displayWidth.Text" xml:space="preserve">\r
-    <value>Display Width:</value>\r
+  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>384, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_displayWidth.Name" xml:space="preserve">\r
-    <value>lbl_displayWidth</value>\r
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>152, 63</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_displayWidth.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;check_customCrop.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="crop_right.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>44, 20</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_anamorphic.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_displayWidth.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="&gt;&gt;Label15.Name" xml:space="preserve">\r
+    <value>Label15</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_displayWidth.ZOrder" xml:space="preserve">\r
-    <value>18</value>\r
+  <data name="Label55.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>13, 63</value>\r
   </data>\r
-  <data name="lbl_parWidth.AutoSize" type="System.Boolean, mscorlib">\r
+  <data name="Label51.AutoSize" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
   </data>\r
-  <data name="lbl_parWidth.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="lbl_anamprohicLbl.TabIndex" type="System.Int32, mscorlib">\r
+    <value>73</value>\r
   </data>\r
-  <data name="lbl_parWidth.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>14, 199</value>\r
+  <data name="&gt;&gt;lbl_Aspect.ZOrder" xml:space="preserve">\r
+    <value>31</value>\r
   </data>\r
-  <data name="lbl_parWidth.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>71, 13</value>\r
+  <data name="Label15.Text" xml:space="preserve">\r
+    <value>Left</value>\r
   </data>\r
-  <data name="lbl_parWidth.TabIndex" type="System.Int32, mscorlib">\r
-    <value>56</value>\r
+  <data name="text_height.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>64, 20</value>\r
   </data>\r
-  <data name="lbl_parWidth.Text" xml:space="preserve">\r
-    <value>PAR Width:</value>\r
+  <data name="&gt;&gt;lbl_src_res.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parWidth.Name" xml:space="preserve">\r
-    <value>lbl_parWidth</value>\r
+  <data name="Label91.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parWidth.Type" xml:space="preserve">\r
+  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">\r
+    <value>27</value>\r
+  </data>\r
+  <data name="&gt;&gt;Label15.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parWidth.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="label7.Text" xml:space="preserve">\r
+    <value>Source:</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parWidth.ZOrder" xml:space="preserve">\r
-    <value>16</value>\r
+  <data name="lbl_Aspect.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="txt_parWidth.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>110, 196</value>\r
+  <data name="Label55.TabIndex" type="System.Int32, mscorlib">\r
+    <value>44</value>\r
   </data>\r
-  <data name="txt_parWidth.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>100, 20</value>\r
+  <data name="&gt;&gt;lbl_anamorphic.Name" xml:space="preserve">\r
+    <value>lbl_anamorphic</value>\r
   </data>\r
-  <data name="txt_parWidth.TabIndex" type="System.Int32, mscorlib">\r
-    <value>55</value>\r
+  <data name="lbl_parWidth.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="txt_parWidth.ToolTip" xml:space="preserve">\r
-    <value>PAR Width - Press "Enter" after entering a new value.\r
-</value>\r
+  <data name="&gt;&gt;toolTip.Name" xml:space="preserve">\r
+    <value>toolTip</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parWidth.Name" xml:space="preserve">\r
-    <value>txt_parWidth</value>\r
+  <data name="&gt;&gt;lbl_displayWidth.Name" xml:space="preserve">\r
+    <value>lbl_displayWidth</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parWidth.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="Label51.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>36, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parWidth.Parent" xml:space="preserve">\r
+  <data name="text_width.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>64, 20</value>\r
+  </data>\r
+  <data name="&gt;&gt;text_height.Name" xml:space="preserve">\r
+    <value>text_height</value>\r
+  </data>\r
+  <data name="lbl_src_res.TabIndex" type="System.Int32, mscorlib">\r
+    <value>41</value>\r
+  </data>\r
+  <data name="&gt;&gt;Label91.ZOrder" xml:space="preserve">\r
+    <value>32</value>\r
+  </data>\r
+  <data name="Label52.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>28, 13</value>\r
+  </data>\r
+  <data name="&gt;&gt;crop_right.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_parWidth.Name" xml:space="preserve">\r
+    <value>lbl_parWidth</value>\r
+  </data>\r
+  <data name="Label53.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="Label91.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">\r
+    <value>label6</value>\r
+  </data>\r
+  <data name="label26.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>13, 13</value>\r
+  </data>\r
+  <data name="&gt;&gt;label7.Name" xml:space="preserve">\r
+    <value>label7</value>\r
+  </data>\r
+  <data name="&gt;&gt;check_autoCrop.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parWidth.ZOrder" xml:space="preserve">\r
-    <value>17</value>\r
+  <data name="check_autoCrop.Text" xml:space="preserve">\r
+    <value>Automatic</value>\r
   </data>\r
-  <data name="lbl_parHeight.AutoSize" type="System.Boolean, mscorlib">\r
+  <data name="lbl_max.TabIndex" type="System.Int32, mscorlib">\r
+    <value>47</value>\r
+  </data>\r
+  <data name="drp_anamorphic.TabIndex" type="System.Int32, mscorlib">\r
+    <value>46</value>\r
+  </data>\r
+  <data name="Label52.AutoSize" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
   </data>\r
-  <data name="lbl_parHeight.Font" type="System.Drawing.Font, System.Drawing">\r
+  <data name="lbl_anamorphic.ToolTip" xml:space="preserve">\r
+    <value />\r
+  </data>\r
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>13, 35</value>\r
+  </data>\r
+  <data name="label4.Font" type="System.Drawing.Font, System.Drawing">\r
     <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="lbl_parHeight.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>14, 225</value>\r
+  <data name="Label51.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>561, 124</value>\r
   </data>\r
-  <data name="lbl_parHeight.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>75, 13</value>\r
+  <data name="label8.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="lbl_parHeight.TabIndex" type="System.Int32, mscorlib">\r
-    <value>58</value>\r
+  <data name="lbl_displayWidth.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>14, 173</value>\r
   </data>\r
   <data name="lbl_parHeight.Text" xml:space="preserve">\r
     <value>PAR Height:</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parHeight.Name" xml:space="preserve">\r
-    <value>lbl_parHeight</value>\r
-  </data>\r
-  <data name="&gt;&gt;lbl_parHeight.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">\r
+    <value>24</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parHeight.Parent" xml:space="preserve">\r
+  <data name="&gt;&gt;crop_right.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_parHeight.ZOrder" xml:space="preserve">\r
-    <value>14</value>\r
-  </data>\r
-  <data name="txt_parHeight.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>110, 222</value>\r
+  <data name="lbl_parWidth.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
   <data name="txt_parHeight.Size" type="System.Drawing.Size, System.Drawing">\r
     <value>100, 20</value>\r
   </data>\r
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">\r
+    <value>28</value>\r
+  </data>\r
   <data name="txt_parHeight.TabIndex" type="System.Int32, mscorlib">\r
     <value>57</value>\r
   </data>\r
-  <data name="txt_parHeight.ToolTip" xml:space="preserve">\r
-    <value>PAR Height - Press "Enter" after entering a new value.\r
-</value>\r
+  <data name="text_width.TabIndex" type="System.Int32, mscorlib">\r
+    <value>49</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parHeight.Name" xml:space="preserve">\r
-    <value>txt_parHeight</value>\r
+  <data name="lbl_Aspect.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>241, 36</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parHeight.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>80, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parHeight.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="Label91.TabIndex" type="System.Int32, mscorlib">\r
+    <value>42</value>\r
   </data>\r
-  <data name="&gt;&gt;txt_parHeight.ZOrder" xml:space="preserve">\r
-    <value>15</value>\r
+  <data name="Label52.TabIndex" type="System.Int32, mscorlib">\r
+    <value>63</value>\r
   </data>\r
-  <data name="check_KeepAR.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="&gt;&gt;drp_anamorphic.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="check_KeepAR.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>68, 85</value>\r
+  <data name="crop_right.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>518, 122</value>\r
   </data>\r
-  <data name="check_KeepAR.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>115, 17</value>\r
+  <data name="Label15.TabIndex" type="System.Int32, mscorlib">\r
+    <value>61</value>\r
   </data>\r
-  <data name="check_KeepAR.TabIndex" type="System.Int32, mscorlib">\r
-    <value>59</value>\r
+  <data name="&gt;&gt;Label51.ZOrder" xml:space="preserve">\r
+    <value>11</value>\r
   </data>\r
-  <data name="check_KeepAR.Text" xml:space="preserve">\r
-    <value>Keep Aspect Ratio</value>\r
+  <data name="&gt;&gt;check_autoCrop.Name" xml:space="preserve">\r
+    <value>check_autoCrop</value>\r
   </data>\r
-  <data name="&gt;&gt;check_KeepAR.Name" xml:space="preserve">\r
-    <value>check_KeepAR</value>\r
+  <data name="&gt;&gt;text_width.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;check_KeepAR.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="Label91.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>83, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;check_KeepAR.Parent" xml:space="preserve">\r
+  <data name="&gt;&gt;lbl_max.Name" xml:space="preserve">\r
+    <value>lbl_max</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_parWidth.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;check_KeepAR.ZOrder" xml:space="preserve">\r
-    <value>13</value>\r
+  <data name="&gt;&gt;Label91.Name" xml:space="preserve">\r
+    <value>Label91</value>\r
   </data>\r
-  <data name="check_customCrop.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="check_autoCrop.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>72, 17</value>\r
   </data>\r
-  <data name="check_customCrop.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>387, 57</value>\r
+  <data name="&gt;&gt;lbl_parWidth.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="check_customCrop.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>63, 17</value>\r
+  <data name="lbl_parHeight.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>14, 225</value>\r
   </data>\r
-  <data name="check_customCrop.TabIndex" type="System.Int32, mscorlib">\r
-    <value>70</value>\r
+  <data name="Label91.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>152, 35</value>\r
   </data>\r
-  <data name="check_customCrop.Text" xml:space="preserve">\r
-    <value>Custom:</value>\r
+  <data name="crop_left.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;check_customCrop.Name" xml:space="preserve">\r
-    <value>check_customCrop</value>\r
+  <data name="&gt;&gt;drp_anamorphic.Name" xml:space="preserve">\r
+    <value>drp_anamorphic</value>\r
   </data>\r
-  <data name="&gt;&gt;check_customCrop.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_Aspect.Text" xml:space="preserve">\r
+    <value>Select a Title</value>\r
   </data>\r
-  <data name="&gt;&gt;check_customCrop.Parent" xml:space="preserve">\r
+  <data name="lbl_anamorphic.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="lbl_src_res.ToolTip" xml:space="preserve">\r
+    <value />\r
+  </data>\r
+  <data name="&gt;&gt;lbl_parHeight.ZOrder" xml:space="preserve">\r
+    <value>14</value>\r
+  </data>\r
+  <data name="lbl_modulus.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
+  </data>\r
+  <data name="crop_bottom.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>467, 146</value>\r
+  </data>\r
+  <data name="&gt;&gt;label26.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;check_customCrop.ZOrder" xml:space="preserve">\r
-    <value>2</value>\r
+  <data name="&gt;&gt;label4.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="check_autoCrop.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="lbl_displayWidth.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="check_autoCrop.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>387, 33</value>\r
+  <data name="Label91.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="check_autoCrop.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>72, 17</value>\r
+  <data name="lbl_modulus.TabIndex" type="System.Int32, mscorlib">\r
+    <value>51</value>\r
   </data>\r
-  <data name="check_autoCrop.TabIndex" type="System.Int32, mscorlib">\r
-    <value>69</value>\r
+  <data name="&gt;&gt;crop_top.ZOrder" xml:space="preserve">\r
+    <value>5</value>\r
   </data>\r
-  <data name="check_autoCrop.Text" xml:space="preserve">\r
-    <value>Automatic</value>\r
+  <data name="label8.TabIndex" type="System.Int32, mscorlib">\r
+    <value>60</value>\r
   </data>\r
-  <data name="&gt;&gt;check_autoCrop.Name" xml:space="preserve">\r
-    <value>check_autoCrop</value>\r
+  <data name="&gt;&gt;lbl_parWidth.ZOrder" xml:space="preserve">\r
+    <value>16</value>\r
   </data>\r
-  <data name="&gt;&gt;check_autoCrop.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="label6.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="&gt;&gt;check_autoCrop.Parent" xml:space="preserve">\r
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>14, 119</value>\r
+  </data>\r
+  <data name="&gt;&gt;Label55.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;txt_parWidth.ZOrder" xml:space="preserve">\r
+    <value>17</value>\r
+  </data>\r
+  <data name="&gt;&gt;Label55.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;check_autoCrop.ZOrder" xml:space="preserve">\r
-    <value>3</value>\r
+  <data name="lbl_anamorphic.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 6.75pt</value>\r
   </data>\r
-  <data name="crop_bottom.Enabled" type="System.Boolean, mscorlib">\r
-    <value>False</value>\r
+  <data name="&gt;&gt;txt_parHeight.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="crop_bottom.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>467, 146</value>\r
+  <data name="&gt;&gt;Label53.Name" xml:space="preserve">\r
+    <value>Label53</value>\r
+  </data>\r
+  <data name="drop_modulus.Items2" xml:space="preserve">\r
+    <value>4</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_anamorphic.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
   <data name="crop_bottom.Size" type="System.Drawing.Size, System.Drawing">\r
     <value>44, 20</value>\r
   </data>\r
-  <data name="crop_bottom.TabIndex" type="System.Int32, mscorlib">\r
-    <value>67</value>\r
+  <data name="check_KeepAR.TabIndex" type="System.Int32, mscorlib">\r
+    <value>59</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_bottom.Name" xml:space="preserve">\r
-    <value>crop_bottom</value>\r
+  <data name="lbl_anamorphic.TabIndex" type="System.Int32, mscorlib">\r
+    <value>74</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_bottom.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="&gt;&gt;Label15.ZOrder" xml:space="preserve">\r
+    <value>12</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_bottom.Parent" xml:space="preserve">\r
+  <data name="Label52.Text" xml:space="preserve">\r
+    <value>Top</value>\r
+  </data>\r
+  <data name="crop_right.ToolTip" xml:space="preserve">\r
+    <value />\r
+  </data>\r
+  <data name="&gt;&gt;lbl_src_res.ZOrder" xml:space="preserve">\r
+    <value>26</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_anamprohicLbl.Name" xml:space="preserve">\r
+    <value>lbl_anamprohicLbl</value>\r
+  </data>\r
+  <data name="Label15.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="&gt;&gt;txt_parHeight.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_bottom.ZOrder" xml:space="preserve">\r
-    <value>4</value>\r
+  <data name="Label53.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>465, 170</value>\r
   </data>\r
-  <data name="crop_top.Enabled" type="System.Boolean, mscorlib">\r
-    <value>False</value>\r
+  <data name="check_customCrop.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>387, 57</value>\r
   </data>\r
-  <data name="crop_top.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>467, 100</value>\r
+  <data name="lbl_modulus.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>14, 146</value>\r
   </data>\r
-  <data name="crop_top.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>44, 20</value>\r
+  <data name="lbl_anamprohicLbl.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
   <data name="crop_top.TabIndex" type="System.Int32, mscorlib">\r
     <value>64</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_top.Name" xml:space="preserve">\r
-    <value>crop_top</value>\r
+  <data name="drp_anamorphic.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>110, 21</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_top.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="Label15.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_top.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="text_height.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;crop_top.ZOrder" xml:space="preserve">\r
-    <value>5</value>\r
+  <data name="check_KeepAR.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="crop_left.Enabled" type="System.Boolean, mscorlib">\r
-    <value>False</value>\r
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>666, 279</value>\r
   </data>\r
-  <data name="crop_left.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>416, 122</value>\r
+  <data name="&gt;&gt;text_width.Name" xml:space="preserve">\r
+    <value>text_width</value>\r
   </data>\r
-  <data name="crop_left.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>44, 20</value>\r
+  <data name="Label53.Text" xml:space="preserve">\r
+    <value>Bottom</value>\r
   </data>\r
-  <data name="crop_left.TabIndex" type="System.Int32, mscorlib">\r
-    <value>62</value>\r
+  <data name="&gt;&gt;txt_displayWidth.Name" xml:space="preserve">\r
+    <value>txt_displayWidth</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_left.Name" xml:space="preserve">\r
-    <value>crop_left</value>\r
+  <data name="txt_displayWidth.ToolTip" xml:space="preserve">\r
+    <value>Display Width - Press "Enter" after entering a new value.</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_left.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="drop_modulus.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>110, 21</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_left.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="Label15.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>28, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_left.ZOrder" xml:space="preserve">\r
-    <value>6</value>\r
+  <data name="&gt;&gt;check_KeepAR.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="crop_right.Enabled" type="System.Boolean, mscorlib">\r
-    <value>False</value>\r
+  <data name="txt_parHeight.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>110, 222</value>\r
   </data>\r
-  <data name="crop_right.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>518, 122</value>\r
+  <data name="check_autoCrop.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>387, 33</value>\r
   </data>\r
-  <data name="crop_right.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>44, 20</value>\r
+  <data name="Label55.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="crop_right.TabIndex" type="System.Int32, mscorlib">\r
-    <value>65</value>\r
+  <data name="Label52.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;crop_right.Name" xml:space="preserve">\r
-    <value>crop_right</value>\r
+  <data name="&gt;&gt;crop_bottom.ZOrder" xml:space="preserve">\r
+    <value>4</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_right.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_parWidth.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>71, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_right.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="label6.Text" xml:space="preserve">\r
+    <value>Anamorphic:</value>\r
   </data>\r
-  <data name="&gt;&gt;crop_right.ZOrder" xml:space="preserve">\r
-    <value>7</value>\r
+  <data name="lbl_Aspect.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 6.75pt</value>\r
+  </data>\r
+  <data name="lbl_parHeight.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
+  </data>\r
+  <data name="check_autoCrop.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="$this.ToolTip" xml:space="preserve">\r
+    <value />\r
+  </data>\r
+  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">\r
+    <value>8</value>\r
   </data>\r
-  <data name="label8.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="text_width.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="label8.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt, style=Bold</value>\r
+  <data name="drp_anamorphic.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>384, 13</value>\r
+  <data name="&gt;&gt;label26.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>37, 13</value>\r
+  <data name="&gt;&gt;drp_anamorphic.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="label8.TabIndex" type="System.Int32, mscorlib">\r
-    <value>60</value>\r
+  <data name="&gt;&gt;lbl_anamorphic.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
   </data>\r
-  <data name="label8.Text" xml:space="preserve">\r
-    <value>Crop</value>\r
+  <data name="&gt;&gt;Label15.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;label8.Name" xml:space="preserve">\r
-    <value>label8</value>\r
+  <data name="crop_top.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;label8.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="check_KeepAR.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>115, 17</value>\r
   </data>\r
-  <data name="&gt;&gt;label8.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="&gt;&gt;txt_displayWidth.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
-  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">\r
-    <value>8</value>\r
+  <data name="drp_anamorphic.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>110, 116</value>\r
   </data>\r
-  <data name="Label53.AutoSize" type="System.Boolean, mscorlib">\r
+  <data name="label26.AutoSize" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
   </data>\r
-  <data name="Label53.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="Label15.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="Label53.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>465, 170</value>\r
+  <data name="label6.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="Label53.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>48, 13</value>\r
+  <data name="txt_displayWidth.TabIndex" type="System.Int32, mscorlib">\r
+    <value>53</value>\r
   </data>\r
-  <data name="Label53.TabIndex" type="System.Int32, mscorlib">\r
-    <value>68</value>\r
+  <data name="lbl_parHeight.TabIndex" type="System.Int32, mscorlib">\r
+    <value>58</value>\r
   </data>\r
-  <data name="Label53.Text" xml:space="preserve">\r
-    <value>Bottom</value>\r
+  <data name="lbl_src_res.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>66, 36</value>\r
   </data>\r
-  <data name="&gt;&gt;Label53.Name" xml:space="preserve">\r
-    <value>Label53</value>\r
+  <data name="crop_bottom.TabIndex" type="System.Int32, mscorlib">\r
+    <value>67</value>\r
   </data>\r
-  <data name="&gt;&gt;Label53.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_max.Text" xml:space="preserve">\r
+    <value>{max}</value>\r
   </data>\r
-  <data name="&gt;&gt;Label53.Parent" xml:space="preserve">\r
+  <data name="text_width.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>68, 59</value>\r
+  </data>\r
+  <data name="&gt;&gt;label8.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;Label53.ZOrder" xml:space="preserve">\r
-    <value>9</value>\r
+  <data name="&gt;&gt;drop_modulus.ZOrder" xml:space="preserve">\r
+    <value>21</value>\r
   </data>\r
-  <data name="Label52.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="&gt;&gt;text_height.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="Label52.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="Label55.Text" xml:space="preserve">\r
+    <value>Width:</value>\r
   </data>\r
-  <data name="Label52.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>474, 85</value>\r
+  <data name="Label91.Text" xml:space="preserve">\r
+    <value>Aspect Ratio:</value>\r
   </data>\r
-  <data name="Label52.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>28, 13</value>\r
+  <data name="crop_bottom.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="Label52.TabIndex" type="System.Int32, mscorlib">\r
-    <value>63</value>\r
+  <data name="Label51.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="Label52.Text" xml:space="preserve">\r
-    <value>Top</value>\r
+  <data name="crop_right.Enabled" type="System.Boolean, mscorlib">\r
+    <value>False</value>\r
   </data>\r
-  <data name="&gt;&gt;Label52.Name" xml:space="preserve">\r
-    <value>Label52</value>\r
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">\r
+    <value>45</value>\r
   </data>\r
-  <data name="&gt;&gt;Label52.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="&gt;&gt;lbl_modulus.Name" xml:space="preserve">\r
+    <value>lbl_modulus</value>\r
+  </data>\r
+  <data name="crop_left.Enabled" type="System.Boolean, mscorlib">\r
+    <value>False</value>\r
+  </data>\r
+  <data name="crop_right.TabIndex" type="System.Int32, mscorlib">\r
+    <value>65</value>\r
   </data>\r
   <data name="&gt;&gt;Label52.Parent" xml:space="preserve">\r
     <value>$this</value>\r
@@ -961,142 +1092,107 @@
   <data name="&gt;&gt;Label52.ZOrder" xml:space="preserve">\r
     <value>10</value>\r
   </data>\r
-  <data name="Label51.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
-  </data>\r
-  <data name="Label51.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 8.25pt</value>\r
+  <data name="label7.TabIndex" type="System.Int32, mscorlib">\r
+    <value>40</value>\r
   </data>\r
-  <data name="Label51.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>561, 124</value>\r
+  <data name="check_customCrop.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <data name="Label51.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>36, 13</value>\r
+  <data name="drp_anamorphic.Items" xml:space="preserve">\r
+    <value>None</value>\r
   </data>\r
-  <data name="Label51.TabIndex" type="System.Int32, mscorlib">\r
-    <value>66</value>\r
+  <data name="&gt;&gt;crop_left.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="Label51.Text" xml:space="preserve">\r
-    <value>Right</value>\r
+  <data name="lbl_anamprohicLbl.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;Label51.Name" xml:space="preserve">\r
-    <value>Label51</value>\r
+  <data name="&gt;&gt;text_width.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
   <data name="&gt;&gt;Label51.Type" xml:space="preserve">\r
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </data>\r
+  <data name="txt_parWidth.TabIndex" type="System.Int32, mscorlib">\r
+    <value>55</value>\r
+  </data>\r
   <data name="&gt;&gt;Label51.Parent" xml:space="preserve">\r
     <value>$this</value>\r
   </data>\r
-  <data name="&gt;&gt;Label51.ZOrder" xml:space="preserve">\r
-    <value>11</value>\r
-  </data>\r
-  <data name="Label15.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="txt_parWidth.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>110, 196</value>\r
   </data>\r
-  <data name="Label15.Font" type="System.Drawing.Font, System.Drawing">\r
+  <data name="drop_modulus.Font" type="System.Drawing.Font, System.Drawing">\r
     <value>Verdana, 8.25pt</value>\r
   </data>\r
   <data name="Label15.Location" type="System.Drawing.Point, System.Drawing">\r
     <value>384, 124</value>\r
   </data>\r
-  <data name="Label15.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>28, 13</value>\r
-  </data>\r
-  <data name="Label15.TabIndex" type="System.Int32, mscorlib">\r
-    <value>61</value>\r
-  </data>\r
-  <data name="Label15.Text" xml:space="preserve">\r
-    <value>Left</value>\r
-  </data>\r
-  <data name="&gt;&gt;Label15.Name" xml:space="preserve">\r
-    <value>Label15</value>\r
-  </data>\r
-  <data name="&gt;&gt;Label15.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </data>\r
-  <data name="&gt;&gt;Label15.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
-  </data>\r
-  <data name="&gt;&gt;Label15.ZOrder" xml:space="preserve">\r
-    <value>12</value>\r
+  <data name="&gt;&gt;txt_displayWidth.ZOrder" xml:space="preserve">\r
+    <value>19</value>\r
   </data>\r
-  <data name="lbl_anamorphic.AutoSize" type="System.Boolean, mscorlib">\r
+  <data name="label8.AutoSize" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
   </data>\r
-  <data name="lbl_anamorphic.Font" type="System.Drawing.Font, System.Drawing">\r
-    <value>Verdana, 6.75pt</value>\r
+  <data name="lbl_displayWidth.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt</value>\r
   </data>\r
-  <data name="lbl_anamorphic.Location" type="System.Drawing.Point, System.Drawing">\r
-    <value>108, 250</value>\r
+  <data name="lbl_displayWidth.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>90, 13</value>\r
   </data>\r
-  <data name="lbl_anamorphic.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>72, 12</value>\r
+  <data name="&gt;&gt;check_customCrop.Name" xml:space="preserve">\r
+    <value>check_customCrop</value>\r
   </data>\r
-  <data name="lbl_anamorphic.TabIndex" type="System.Int32, mscorlib">\r
-    <value>74</value>\r
+  <data name="txt_parHeight.ToolTip" xml:space="preserve">\r
+    <value>PAR Height - Press "Enter" after entering a new value.\r
+</value>\r
   </data>\r
-  <data name="lbl_anamorphic.Text" xml:space="preserve">\r
-    <value>Select a Title</value>\r
+  <data name="&gt;&gt;Label53.ZOrder" xml:space="preserve">\r
+    <value>9</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamorphic.Name" xml:space="preserve">\r
-    <value>lbl_anamorphic</value>\r
+  <data name="drop_modulus.ToolTip" xml:space="preserve">\r
+    <value />\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamorphic.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="&gt;&gt;crop_top.Name" xml:space="preserve">\r
+    <value>crop_top</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamorphic.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="Label51.TabIndex" type="System.Int32, mscorlib">\r
+    <value>66</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamorphic.ZOrder" xml:space="preserve">\r
-    <value>0</value>\r
+  <data name="&gt;&gt;text_height.ZOrder" xml:space="preserve">\r
+    <value>22</value>\r
   </data>\r
-  <data name="lbl_anamprohicLbl.AutoSize" type="System.Boolean, mscorlib">\r
-    <value>True</value>\r
+  <data name="label26.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
   </data>\r
   <data name="lbl_anamprohicLbl.Location" type="System.Drawing.Point, System.Drawing">\r
     <value>14, 249</value>\r
   </data>\r
-  <data name="lbl_anamprohicLbl.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>66, 13</value>\r
-  </data>\r
-  <data name="lbl_anamprohicLbl.TabIndex" type="System.Int32, mscorlib">\r
-    <value>73</value>\r
+  <data name="&gt;&gt;Label91.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
   </data>\r
-  <data name="lbl_anamprohicLbl.Text" xml:space="preserve">\r
-    <value>Anamorphic:</value>\r
+  <data name="crop_left.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>44, 20</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamprohicLbl.Name" xml:space="preserve">\r
-    <value>lbl_anamprohicLbl</value>\r
+  <data name="&gt;&gt;txt_parHeight.ZOrder" xml:space="preserve">\r
+    <value>15</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamprohicLbl.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  <data name="lbl_anamprohicLbl.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>66, 13</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamprohicLbl.Parent" xml:space="preserve">\r
-    <value>$this</value>\r
+  <data name="text_height.TabIndex" type="System.Int32, mscorlib">\r
+    <value>50</value>\r
   </data>\r
-  <data name="&gt;&gt;lbl_anamprohicLbl.ZOrder" xml:space="preserve">\r
-    <value>1</value>\r
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
   </data>\r
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>English</value>\r
-  </metadata>\r
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">\r
-    <value>666, 279</value>\r
-  </data>\r
-  <data name="&gt;&gt;toolTip.Name" xml:space="preserve">\r
-    <value>toolTip</value>\r
-  </data>\r
-  <data name="&gt;&gt;toolTip.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </data>\r
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">\r
-    <value>PictureSettings</value>\r
-  </data>\r
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">\r
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
-  </data>\r
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 17</value>\r
+  </metadata>\r
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>English</value>\r
+  </metadata>\r
 </root>
\ No newline at end of file
diff --git a/win/C#/EncodeQueue/Encode.cs b/win/C#/EncodeQueue/Encode.cs
index 80125fc..6eced17 100644 (file)
--- a/win/C#/EncodeQueue/Encode.cs
+++ b/win/C#/EncodeQueue/Encode.cs
@@ -14,13 +14,18 @@ namespace Handbrake.EncodeQueue
 {\r
     public class Encode\r
     {\r
+        public Process hbProcess { get; set; }\r
+        public int processID { get; set; }\r
+        public IntPtr processHandle { get; set; }\r
+        public Boolean isEncoding { get; set; }\r
+        public String currentQuery { get; set; }\r
+\r
         /// <summary>\r
         /// Execute a HandBrakeCLI process.\r
         /// </summary>\r
         /// <param name="query">The CLI Query</param>\r
-        public EncodeProcess runCli(string query)\r
+        public void runCli(string query)\r
         {\r
-            EncodeProcess currentEncode = new EncodeProcess();\r
             try\r
             {\r
                 string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");\r
@@ -39,17 +44,17 @@ namespace Handbrake.EncodeQueue
                     cliStart.WindowStyle = ProcessWindowStyle.Minimized;\r
 \r
                 Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.\r
-                currentEncode.hbProcProcess = Process.Start(cliStart);\r
-                currentEncode.processID = Main.getCliProcess(before);\r
-                currentEncode.isEncoding = true;\r
-                currentEncode.currentQuery = query;\r
-                if (currentEncode.hbProcProcess != null)\r
-                    currentEncode.processHandle = (int)currentEncode.hbProcProcess.MainWindowHandle; // Set the process Handle\r
+                hbProcess = Process.Start(cliStart);\r
+                processID = Main.getCliProcess(before);\r
+                isEncoding = true;\r
+                currentQuery = query;\r
+                if (hbProcess != null)\r
+                    processHandle = hbProcess.MainWindowHandle; // Set the process Handle\r
 \r
                 // Set the process Priority\r
                 Process hbCliProcess = null;\r
-                if (currentEncode.processID != -1)\r
-                    hbCliProcess = Process.GetProcessById(currentEncode.processID);\r
+                if (processID != -1)\r
+                    hbCliProcess = Process.GetProcessById(processID);\r
 \r
                 if (hbCliProcess != null)\r
                     switch (Properties.Settings.Default.processPriority)\r
@@ -79,26 +84,23 @@ namespace Handbrake.EncodeQueue
                 MessageBox.Show("It would appear that HandBrakeCLI has not started correctly. You should take a look at the Activity log as it may indicate the reason why.\n\n   Detailed Error Information: error occured in runCli()\n\n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
 \r
-            return currentEncode;\r
         }\r
 \r
         /// <summary>\r
         /// Kill the CLI process\r
         /// </summary>\r
-        public void closeCLI(EncodeProcess ep)\r
+        public void closeCLI()\r
         {\r
-            Process cli = Process.GetProcessById(ep.processID);\r
-            if (!cli.HasExited)\r
-                cli.Kill();\r
+            hbProcess.Kill();\r
         }\r
 \r
         /// <summary>\r
         /// Perform an action after an encode. e.g a shutdown, standby, restart etc.\r
         /// </summary>\r
-        public void afterEncodeAction(EncodeProcess ep)\r
+        public void afterEncodeAction()\r
         {\r
-            ep.isEncoding = false;\r
-            ep.currentQuery = String.Empty;\r
+            isEncoding = false;\r
+            currentQuery = String.Empty;\r
             // Do something whent he encode ends.\r
             switch (Properties.Settings.Default.CompletionOption)\r
             {\r
diff --git a/win/C#/EncodeQueue/EncodeProcess.cs b/win/C#/EncodeQueue/EncodeProcess.cs
deleted file mode 100644 (file)
index c65caea..0000000
--- a/win/C#/EncodeQueue/EncodeProcess.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  QueueItem.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-using System;\r
-using System.Diagnostics;\r
-\r
-namespace Handbrake.EncodeQueue\r
-{\r
-    public class EncodeProcess\r
-    {\r
-        /// <summary>\r
-        /// The CMD.exe process that runs HandBrakeCLI.exe\r
-        /// </summary>\r
-        public Process hbProcProcess { get; set; }\r
-\r
-        /// <summary>\r
-        /// Returns whether HandBrake is currently encoding or not.\r
-        /// </summary>\r
-        public Boolean isEncoding { get; set; }\r
-\r
-        /// <summary>\r
-        /// Returns the currently encoding query string\r
-        /// </summary>\r
-        public String currentQuery { get; set; }\r
-\r
-        /// <summary>\r
-        /// Get or set the process ID of HandBrakeCLI.exe\r
-        /// </summary>\r
-        public int processID { get; set; }\r
-\r
-        /// <summary>\r
-        /// Get or Set the Process Handle\r
-        /// </summary>\r
-        public int processHandle { get; set; }\r
-    }\r
-}
\ No newline at end of file
diff --git a/win/C#/EncodeQueue/QueueItem.cs b/win/C#/EncodeQueue/Job.cs
similarity index 93%
rename from win/C#/EncodeQueue/QueueItem.cs
rename to win/C#/EncodeQueue/Job.cs
index 587bfb7..291ef40 100644 (file)
--- a/win/C#/EncodeQueue/QueueItem.cs
+++ b/win/C#/EncodeQueue/Job.cs
@@ -6,7 +6,7 @@
 \r
 namespace Handbrake.EncodeQueue\r
 {\r
-    public class QueueItem\r
+    public class Job\r
     {\r
         /// <summary>\r
         /// Get or Set the job id.\r
diff --git a/win/C#/EncodeQueue/QueueHandler.cs b/win/C#/EncodeQueue/QueueHandler.cs
index 68cfe30..6670e9e 100644 (file)
--- a/win/C#/EncodeQueue/QueueHandler.cs
+++ b/win/C#/EncodeQueue/QueueHandler.cs
@@ -15,13 +15,13 @@ namespace Handbrake.EncodeQueue
 {\r
     public class QueueHandler\r
     {\r
-        Encode encodeHandler = new Encode();\r
-        private static XmlSerializer ser = new XmlSerializer(typeof(List<QueueItem>));\r
-        List<QueueItem> queue = new List<QueueItem>();\r
+        public Encode encodeHandler = new Encode();\r
+        private static XmlSerializer ser = new XmlSerializer(typeof(List<Job>));\r
+        List<Job> queue = new List<Job>();\r
         int id; // Unique identifer number for each job\r
 \r
         #region Queue Handling\r
-        public List<QueueItem> getQueue()\r
+        public List<Job> getQueue()\r
         {\r
             return queue;\r
         }\r
@@ -30,23 +30,22 @@ namespace Handbrake.EncodeQueue
         /// Get's the next CLI query for encoding\r
         /// </summary>\r
         /// <returns>String</returns>\r
-        private string getNextItemForEncoding()\r
+        private Job getNextJobForEncoding()\r
         {\r
-            QueueItem job = queue[0];\r
-            String query = job.Query;\r
+            Job job = queue[0];\r
             lastQueueItem = job;\r
             remove(0);    // Remove the item which we are about to pass out.\r
 \r
             updateQueueRecoveryFile("hb_queue_recovery.xml");\r
 \r
-            return query;\r
+            return job;\r
         }\r
 \r
         /// <summary>\r
         /// Get the last query that was returned by getNextItemForEncoding()\r
         /// </summary>\r
         /// <returns></returns>\r
-        public QueueItem lastQueueItem { get; set; }\r
+        public Job lastQueueItem { get; set; }\r
 \r
         /// <summary>\r
         /// Add's a new item to the queue\r
@@ -56,7 +55,7 @@ namespace Handbrake.EncodeQueue
         /// <param name="destination"></param>\r
         public void add(string query, string source, string destination)\r
         {\r
-            QueueItem newJob = new QueueItem { Id = id, Query = query, Source = source, Destination = destination };\r
+            Job newJob = new Job { Id = id, Query = query, Source = source, Destination = destination };\r
             id++;\r
 \r
             queue.Add(newJob);\r
@@ -64,21 +63,6 @@ namespace Handbrake.EncodeQueue
         }\r
 \r
         /// <summary>\r
-        /// Check to see if a destination path is already on the queue\r
-        /// </summary>\r
-        /// <param name="destination">Destination path</param>\r
-        /// <returns>Boolean True/False. True = Path Exists</returns>\r
-        public Boolean checkDestinationPath(string destination)\r
-        {\r
-            foreach (QueueItem checkItem in queue)\r
-            {\r
-                if (checkItem.Destination.Contains(destination.Replace("\\\\", "\\")))\r
-                    return true;\r
-            }\r
-            return false;\r
-        }\r
-\r
-        /// <summary>\r
         /// Removes an item from the queue.\r
         /// </summary>\r
         /// <param name="index">Index</param>\r
@@ -106,7 +90,7 @@ namespace Handbrake.EncodeQueue
         {\r
             if (index > 0)\r
             {\r
-                QueueItem item = queue[index];\r
+                Job item = queue[index];\r
 \r
                 queue.RemoveAt(index);\r
                 queue.Insert((index - 1), item);\r
@@ -122,7 +106,7 @@ namespace Handbrake.EncodeQueue
         {\r
             if (index < queue.Count - 1)\r
             {\r
-                QueueItem item = queue[index];\r
+                Job item = queue[index];\r
 \r
                 queue.RemoveAt(index);\r
                 queue.Insert((index + 1), item);\r
@@ -161,7 +145,7 @@ namespace Handbrake.EncodeQueue
         public void writeBatchScript(string file)\r
         {\r
             string queries = "";\r
-            foreach (QueueItem queue_item in queue)\r
+            foreach (Job queue_item in queue)\r
             {\r
                 string q_item = queue_item.Query;\r
                 string fullQuery = '"' + Application.StartupPath + "\\HandBrakeCLI.exe" + '"' + q_item;\r
@@ -206,10 +190,10 @@ namespace Handbrake.EncodeQueue
                 {\r
                     if (strm.Length != 0)\r
                     {\r
-                        List<QueueItem> list = ser.Deserialize(strm) as List<QueueItem>;\r
+                        List<Job> list = ser.Deserialize(strm) as List<Job>;\r
 \r
                         if (list != null)\r
-                            foreach (QueueItem item in list)\r
+                            foreach (Job item in list)\r
                                 queue.Add(item);\r
 \r
                         if (file != "hb_queue_recovery.xml")\r
@@ -218,6 +202,21 @@ namespace Handbrake.EncodeQueue
                 }\r
             }\r
         }\r
+\r
+        /// <summary>\r
+        /// Check to see if a destination path is already on the queue\r
+        /// </summary>\r
+        /// <param name="destination">Destination path</param>\r
+        /// <returns>Boolean True/False. True = Path Exists</returns>\r
+        public Boolean checkDestinationPath(string destination)\r
+        {\r
+            foreach (Job checkItem in queue)\r
+            {\r
+                if (checkItem.Destination.Contains(destination.Replace("\\\\", "\\")))\r
+                    return true;\r
+            }\r
+            return false;\r
+        }\r
         #endregion\r
 \r
         #region Encoding\r
@@ -225,7 +224,6 @@ namespace Handbrake.EncodeQueue
         public Boolean isEncodeStarted { get; private set; }\r
         public Boolean isPaused { get; private set; }\r
         public Boolean isEncoding { get; private set; }\r
-        public EncodeProcess encodeProcess { get; set; }\r
 \r
         public void startEncode()\r
         { \r
@@ -255,7 +253,7 @@ namespace Handbrake.EncodeQueue
         }\r
         public void endEncode()\r
         {\r
-            encodeHandler.closeCLI(encodeProcess);\r
+            encodeHandler.closeCLI();\r
         }\r
 \r
         private void startProcess(object state)\r
@@ -265,29 +263,29 @@ namespace Handbrake.EncodeQueue
                 // Run through each item on the queue\r
                 while (this.count() != 0)\r
                 {\r
-                    string query = getNextItemForEncoding();\r
+                    string query = getNextJobForEncoding().Query;\r
                     updateQueueRecoveryFile("hb_queue_recovery.xml"); // Update the queue recovery file\r
 \r
-                    encodeProcess = encodeHandler.runCli(query);\r
+                    encodeHandler.runCli(query);\r
                     EncodeStarted(null);\r
-                    encodeProcess.hbProcProcess.WaitForExit();\r
+                    encodeHandler.hbProcess.WaitForExit();\r
 \r
                     encodeHandler.addCLIQueryToLog(query);\r
                     encodeHandler.copyLog(lastQueueItem.Destination);\r
 \r
-                    encodeProcess.hbProcProcess.Close();\r
-                    encodeProcess.hbProcProcess.Dispose();\r
+                    encodeHandler.hbProcess.Close();\r
+                    encodeHandler.hbProcess.Dispose();\r
                     EncodeFinished(null);\r
 \r
                     while (isPaused) // Need to find a better way of doing this.\r
                     {\r
-                        Thread.Sleep(10000);\r
+                        Thread.Sleep(5000);\r
                     }\r
                 }\r
                 EncodeQueueFinished(null);\r
 \r
                 // After the encode is done, we may want to shutdown, suspend etc.\r
-                encodeHandler.afterEncodeAction(encodeProcess);\r
+                encodeHandler.afterEncodeAction();\r
             }\r
             catch (Exception exc)\r
             {\r
diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 84ba263..9d936cd 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -19,7 +19,7 @@ namespace Handbrake.Functions
     static class Main\r
     {\r
         // Private Variables\r
-        private static readonly XmlSerializer ser = new XmlSerializer(typeof(List<QueueItem>));\r
+        private static readonly XmlSerializer ser = new XmlSerializer(typeof(List<Job>));\r
 \r
         /// <summary>\r
         /// Calculate the duration of the selected title and chapters\r
@@ -259,7 +259,11 @@ namespace Handbrake.Functions
                         Properties.Settings.Default.hb_version = arr[0];\r
                     }\r
                     if (cliProcess.TotalProcessorTime.Seconds > 10) // Don't wait longer than 10 seconds.\r
-                        killCLI(cliProcess.Id);\r
+                    {\r
+                        Process cli = Process.GetProcessById(cliProcess.Id);\r
+                        if (!cli.HasExited)\r
+                            cli.Kill();\r
+                    }\r
                 }\r
             }\r
             catch (Exception e)\r
@@ -269,16 +273,6 @@ namespace Handbrake.Functions
         }\r
 \r
         /// <summary>\r
-        /// Search through the running processes on the system and kill HandBrakeCLI\r
-        /// </summary>\r
-        private static void killCLI(int id)\r
-        {\r
-            Process cli = Process.GetProcessById(id);\r
-            if (!cli.HasExited)\r
-                cli.Kill();\r
-        }\r
-\r
-        /// <summary>\r
         /// Check if the queue recovery file contains records.\r
         /// If it does, it means the last queue did not complete before HandBrake closed.\r
         /// So, return a boolean if true. \r
@@ -292,7 +286,7 @@ namespace Handbrake.Functions
                 {\r
                     using (FileStream strm = new FileStream(tempPath, FileMode.Open, FileAccess.Read))\r
                     {\r
-                        List<QueueItem> list = ser.Deserialize(strm) as List<QueueItem>;\r
+                        List<Job> list = ser.Deserialize(strm) as List<Job>;\r
                         if (list != null)\r
                             if (list.Count != 0)\r
                                 return true;\r
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 15eb741..f6ea60e 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -72,7 +72,7 @@ namespace Handbrake.Functions
                 if (presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")\r
                     mainWindow.pictureSettings.check_customCrop.Checked = true;\r
 \r
-            if (pictureSettings)\r
+            if (pictureSettings) // only Load picture settings if the perset requires it\r
             {\r
                 if (presetQuery.CropTop != null)\r
                 {\r
@@ -110,6 +110,8 @@ namespace Handbrake.Functions
 \r
             if (presetQuery.Height != 0)\r
                 mainWindow.pictureSettings.text_height.Value = presetQuery.Height;\r
+            else\r
+                mainWindow.pictureSettings.text_height.Value = 0;\r
 \r
             // Max Width/Height override Width/Height\r
             if (presetQuery.MaxWidth != 0)\r
@@ -125,6 +127,7 @@ namespace Handbrake.Functions
             }\r
             mainWindow.pictureSettings.setMax();\r
 \r
+\r
             #endregion\r
 \r
             #region Filters\r
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 2f6e474..341338d 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -133,9 +133,10 @@ namespace Handbrake.Functions
             // Use MaxHeight for built-in presets and height for user settings.\r
             if (mainWindow.pictureSettings.maxHeight == 0)\r
             {\r
-                if (mainWindow.pictureSettings.text_height.Text != "")\r
-                    if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
-                        query += " -l " + mainWindow.pictureSettings.text_height.Text;\r
+                if (mainWindow.pictureSettings.text_height.Text != "0")\r
+                    if (mainWindow.pictureSettings.text_height.Text != "")\r
+                        if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
+                            query += " -l " + mainWindow.pictureSettings.text_height.Text;\r
             }\r
             else\r
             {\r
diff --git a/win/C#/Functions/Win32.cs b/win/C#/Functions/Win32.cs
index 2bc47e6..bf0bde6 100644 (file)
--- a/win/C#/Functions/Win32.cs
+++ b/win/C#/Functions/Win32.cs
@@ -6,7 +6,7 @@ namespace Handbrake.Functions
     class Win32\r
     {\r
         [DllImport("user32.dll")]\r
-        public static extern int SetForegroundWindow(int hWnd);\r
+        public static extern bool SetForegroundWindow(int hWnd);\r
 \r
         [DllImport("user32.dll")]\r
         public static extern void LockWorkStation();\r
@@ -14,7 +14,7 @@ namespace Handbrake.Functions
         [DllImport("user32.dll")]\r
         public static extern int ExitWindowsEx(int uFlags, int dwReason);\r
 \r
-        public struct MEMORYSTATUS // Unused var's are requred here.\r
+        public struct MEMORYSTATUS // Unused var's are required here.\r
         {\r
             public UInt32 dwLength;\r
             public UInt32 dwMemoryLoad;\r
@@ -31,5 +31,15 @@ namespace Handbrake.Functions
         (\r
             ref MEMORYSTATUS lpBuffer\r
         );\r
+\r
+        [DllImport("kernel32.dll", SetLastError = true)]\r
+        public static extern bool GenerateConsoleCtrlEvent(ConsoleCtrlEvent sigevent, int dwProcessGroupId);\r
+\r
+        public enum ConsoleCtrlEvent\r
+        {\r
+            CTRL_C = 0,\r
+            CTRL_BREAK = 1,\r
+            CTRL_CLOSE = 2,\r
+        }\r
     }\r
 }\r
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index a65f0c2..5d578a0 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -41,7 +41,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
-    <Optimize>true</Optimize>\r
+    <Optimize>false</Optimize>\r
     <OutputPath>bin\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
@@ -214,7 +214,6 @@
     <Compile Include="Functions\Win32.cs" />\r
     <Compile Include="Presets\preset.cs" />\r
     <Compile Include="Presets\PresetsHandler.cs" />\r
-    <Compile Include="EncodeQueue\EncodeProcess.cs" />\r
     <Compile Include="EncodeQueue\QueueHandler.cs" />\r
     <Compile Include="Functions\AppcastReader.cs" />\r
     <Compile Include="EncodeQueue\Encode.cs" />\r
@@ -247,6 +246,10 @@
       <DependentUpon>Deinterlace.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="Controls\PictureSettings.en.resx">\r
+      <DependentUpon>PictureSettings.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="Controls\PictureSettings.resx">\r
       <DependentUpon>PictureSettings.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
@@ -325,7 +328,7 @@
     <Compile Include="frmSplashScreen.Designer.cs">\r
       <DependentUpon>frmSplashScreen.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="EncodeQueue\QueueItem.cs" />\r
+    <Compile Include="EncodeQueue\Job.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="handbrakepineapple.ico" />\r
diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs
index 59c14dc..2e1401f 100644 (file)
--- a/win/C#/Presets/PresetsHandler.cs
+++ b/win/C#/Presets/PresetsHandler.cs
@@ -185,7 +185,8 @@ namespace Handbrake.Presets
                                                    TopCategory = level_1_category,\r
                                                    Name = presetName[0].Replace("+", "").Trim(),\r
                                                    Query = presetName[2],\r
-                                                   Version = Properties.Settings.Default.hb_version\r
+                                                   Version = Properties.Settings.Default.hb_version,\r
+                                                   PictureSettings = true\r
                                                };\r
                         presets.Add(newPreset);\r
                     }\r
diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index 9ac8fe4..a50372a 100644 (file)
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -42,6 +42,7 @@ namespace Handbrake
             this.btn_cancel = new System.Windows.Forms.Button();\r
             this.check_pictureSettings = new System.Windows.Forms.CheckBox();\r
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);\r
+            this.label1 = new System.Windows.Forms.Label();\r
             this.SuspendLayout();\r
             // \r
             // lbl_name\r
@@ -68,7 +69,7 @@ namespace Handbrake
             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_add.Location = new System.Drawing.Point(212, 72);\r
+            this.btn_add.Location = new System.Drawing.Point(209, 109);\r
             this.btn_add.Name = "btn_add";\r
             this.btn_add.Size = new System.Drawing.Size(66, 22);\r
             this.btn_add.TabIndex = 2;\r
@@ -82,7 +83,7 @@ namespace Handbrake
             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_cancel.Location = new System.Drawing.Point(284, 72);\r
+            this.btn_cancel.Location = new System.Drawing.Point(281, 109);\r
             this.btn_cancel.Name = "btn_cancel";\r
             this.btn_cancel.Size = new System.Drawing.Size(66, 22);\r
             this.btn_cancel.TabIndex = 3;\r
@@ -95,17 +96,27 @@ namespace Handbrake
             this.check_pictureSettings.AutoSize = true;\r
             this.check_pictureSettings.Location = new System.Drawing.Point(109, 44);\r
             this.check_pictureSettings.Name = "check_pictureSettings";\r
-            this.check_pictureSettings.Size = new System.Drawing.Size(118, 17);\r
+            this.check_pictureSettings.Size = new System.Drawing.Size(155, 17);\r
             this.check_pictureSettings.TabIndex = 1;\r
-            this.check_pictureSettings.Text = "Use Picture Size";\r
+            this.check_pictureSettings.Text = "Store Cropping Values";\r
             this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");\r
             this.check_pictureSettings.UseVisualStyleBackColor = true;\r
             // \r
+            // label1\r
+            // \r
+            this.label1.AutoSize = true;\r
+            this.label1.Location = new System.Drawing.Point(106, 64);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(236, 13);\r
+            this.label1.TabIndex = 4;\r
+            this.label1.Text = "Note: Subtitles are not stored in presets";\r
+            // \r
             // frmAddPreset\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(365, 100);\r
+            this.ClientSize = new System.Drawing.Size(365, 143);\r
+            this.Controls.Add(this.label1);\r
             this.Controls.Add(this.check_pictureSettings);\r
             this.Controls.Add(this.btn_cancel);\r
             this.Controls.Add(this.btn_add);\r
@@ -134,5 +145,6 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_cancel;\r
         private System.Windows.Forms.CheckBox check_pictureSettings;\r
         private System.Windows.Forms.ToolTip toolTip;\r
+        private System.Windows.Forms.Label label1;\r
     }\r
 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bad59d7..40aa390 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -525,7 +525,7 @@ namespace Handbrake
                     encodeQueue.pauseEncodeQueue();\r
 \r
                     // Allow the CLI to exit cleanly\r
-                    Win32.SetForegroundWindow(encodeQueue.encodeProcess.processHandle);\r
+                    Win32.SetForegroundWindow((int)encodeQueue.encodeHandler.processHandle);\r
                     SendKeys.Send("^C");\r
 \r
                     // Update the GUI\r
@@ -1561,7 +1561,7 @@ namespace Handbrake
         {\r
             try\r
             {\r
-                Parser encode = new Parser(encodeQueue.encodeProcess.hbProcProcess.StandardOutput.BaseStream);\r
+                Parser encode = new Parser(encodeQueue.encodeHandler.hbProcess.StandardOutput.BaseStream);\r
                 encode.OnEncodeProgress += encodeOnEncodeProgress;\r
                 while (!encode.EndOfStream)\r
                 {\r
diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index f38ee5c..f2356ae 100644 (file)
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -19,7 +19,6 @@ namespace Handbrake
         private delegate void UpdateUIHandler();\r
         String currently_playing = "";\r
         readonly frmMain mainWindow;\r
-        private Process hbProc;\r
         private Thread player;\r
         private Boolean noQT;\r
 \r
@@ -84,13 +83,16 @@ namespace Handbrake
         private void procMonitor(object state)\r
         {\r
             // Make sure we are not already encoding and if we are then display an error.\r
-            if (hbProc != null)\r
+            if (process.hbProcess != null)\r
                 MessageBox.Show(this, "Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
-                hbProc = process.runCli((string)state).hbProcProcess;\r
-                hbProc.WaitForExit();\r
-                hbProc = null;\r
+                process.runCli((string)state);\r
+                if (process.hbProcess != null)\r
+                {\r
+                    process.hbProcess.WaitForExit();\r
+                    process.hbProcess = null;\r
+                }\r
                 encodeCompleted();\r
             }\r
         }\r
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 1672ae3..13c0e1f 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -140,8 +140,8 @@ namespace Handbrake
             }\r
 \r
             list_queue.Items.Clear();\r
-            List<QueueItem> theQueue = queue.getQueue();\r
-            foreach (QueueItem queue_item in theQueue)\r
+            List<Job> theQueue = queue.getQueue();\r
+            foreach (Job queue_item in theQueue)\r
             {\r
                 string q_item = queue_item.Query;\r
                 Functions.QueryParser parsed = Functions.QueryParser.Parse(q_item);\r
githubのコードからのfolk
About OSDN
Find Software
Develop Software
Help