diff options
| author | sr55 <[email protected]> | 2009-06-17 18:37:28 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-06-17 18:37:28 +0000 |
| commit | 369338c32344dcf54cca78efaa95f57f83bed7c9 (patch) | |
| tree | 14628ec6bcc1436e6cb122a577467fecc56a1948 | |
| parent | cae0260e2b7ed70d42bda7b29133a7134ddca0f6 (diff) | |
WinGui:
- Tweak the presetLoader and Picture settings panel to work a bit better with built-in presets. Sets width/height then sets anamorphic mode (instead of vice-versa). This forces the calculation code to run which should correct the weird numbers that were appearing.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2558 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/C#/Controls/PictureSettings.Designer.cs | 5 | ||||
| -rw-r--r-- | win/C#/Controls/PictureSettings.cs | 4 | ||||
| -rw-r--r-- | win/C#/Controls/PictureSettings.resx | 588 | ||||
| -rw-r--r-- | win/C#/Functions/PresetLoader.cs | 27 |
4 files changed, 309 insertions, 315 deletions
diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs index 67c0dad4b..11e7aa5d3 100644 --- a/win/C#/Controls/PictureSettings.Designer.cs +++ b/win/C#/Controls/PictureSettings.Designer.cs @@ -106,11 +106,6 @@ namespace Handbrake.Controls 0,
0,
0});
- this.text_width.Minimum = new decimal(new int[] {
- 64,
- 0,
- 0,
- 0});
this.text_width.Name = "text_width";
this.toolTip.SetToolTip(this.text_width, resources.GetString("text_width.ToolTip"));
this.text_width.Value = new decimal(new int[] {
diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs index 2d1fc154d..c35c2fa51 100644 --- a/win/C#/Controls/PictureSettings.cs +++ b/win/C#/Controls/PictureSettings.cs @@ -524,8 +524,8 @@ namespace Handbrake.Controls if (selectedTitle.Resolution.Width < returnVal)
returnVal = selectedTitle.Resolution.Width;
- if (returnVal < 64)
- returnVal = 64;
+ /*if (returnVal < 64)
+ returnVal = 64; */
// Set the global tracker
widthVal = (int)returnVal;
diff --git a/win/C#/Controls/PictureSettings.resx b/win/C#/Controls/PictureSettings.resx index 455879185..f53a46d0e 100644 --- a/win/C#/Controls/PictureSettings.resx +++ b/win/C#/Controls/PictureSettings.resx @@ -120,14 +120,11 @@ <data name=">>label7.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>lbl_anamprohicLbl.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>crop_left.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>PictureSettings</value>
</data>
- <data name="lbl_max.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>label8.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name="check_KeepAR.ToolTip" xml:space="preserve">
<value />
@@ -139,10 +136,6 @@ <data name="Label53.TabIndex" type="System.Int32, mscorlib">
<value>68</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="lbl_anamorphic.Location" type="System.Drawing.Point, System.Drawing">
- <value>108, 250</value>
- </data>
<data name="lbl_modulus.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -155,9 +148,10 @@ <data name=">>crop_bottom.Name" xml:space="preserve">
<value>crop_bottom</value>
</data>
- <data name=">>drop_modulus.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>lbl_Aspect.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lbl_Aspect.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 12</value>
</data>
@@ -167,8 +161,9 @@ <data name=">>crop_right.Name" xml:space="preserve">
<value>crop_right</value>
</data>
- <data name=">>check_KeepAR.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="txt_parHeight.ToolTip" xml:space="preserve">
+ <value>PAR Height - Press "Enter" after entering a new value.
+</value>
</data>
<data name="lbl_src_res.Text" xml:space="preserve">
<value>Select a Title</value>
@@ -176,8 +171,8 @@ <data name=">>lbl_displayWidth.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="txt_displayWidth.Location" type="System.Drawing.Point, System.Drawing">
- <value>110, 170</value>
+ <data name="Label15.ToolTip" xml:space="preserve">
+ <value />
</data>
<data name="lbl_parHeight.ToolTip" xml:space="preserve">
<value />
@@ -188,18 +183,9 @@ <data name="crop_top.Location" type="System.Drawing.Point, System.Drawing">
<value>467, 100</value>
</data>
- <data name="Label55.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name=">>Label51.Name" xml:space="preserve">
- <value>Label51</value>
- </data>
<data name="txt_parWidth.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 20</value>
</data>
- <data name="label26.TabIndex" type="System.Int32, mscorlib">
- <value>39</value>
- </data>
<data name="lbl_Aspect.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -215,8 +201,8 @@ <data name=">>label26.ZOrder" xml:space="preserve">
<value>30</value>
</data>
- <data name="lbl_anamprohicLbl.Text" xml:space="preserve">
- <value>Anamorphic:</value>
+ <data name=">>text_height.ZOrder" xml:space="preserve">
+ <value>22</value>
</data>
<data name=">>lbl_displayWidth.Parent" xml:space="preserve">
<value>$this</value>
@@ -224,14 +210,11 @@ <data name=">>crop_top.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>drop_modulus.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>lbl_Aspect.Name" xml:space="preserve">
- <value>lbl_Aspect</value>
+ <data name="lbl_anamprohicLbl.Text" xml:space="preserve">
+ <value>Anamorphic:</value>
</data>
- <data name="Label52.Location" type="System.Drawing.Point, System.Drawing">
- <value>474, 85</value>
+ <data name=">>Label15.Name" xml:space="preserve">
+ <value>Label15</value>
</data>
<data name=">>label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -239,8 +222,8 @@ <data name="lbl_anamorphic.Text" xml:space="preserve">
<value>Select a Title</value>
</data>
- <data name="lbl_max.Location" type="System.Drawing.Point, System.Drawing">
- <value>279, 61</value>
+ <data name="Label55.ToolTip" xml:space="preserve">
+ <value />
</data>
<data name=">>lbl_src_res.Name" xml:space="preserve">
<value>lbl_src_res</value>
@@ -257,17 +240,14 @@ <data name="lbl_displayWidth.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="text_height.Location" type="System.Drawing.Point, System.Drawing">
- <value>206, 59</value>
- </data>
- <data name="crop_left.Location" type="System.Drawing.Point, System.Drawing">
- <value>416, 122</value>
- </data>
- <data name=">>txt_parWidth.Parent" xml:space="preserve">
+ <data name=">>lbl_anamprohicLbl.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>label4.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="label26.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name=">>crop_bottom.ZOrder" xml:space="preserve">
+ <value>4</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 13</value>
@@ -281,6 +261,18 @@ <data name="check_autoCrop.ToolTip" xml:space="preserve">
<value />
</data>
+ <data name="label26.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="lbl_max.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>lbl_displayWidth.ZOrder" xml:space="preserve">
+ <value>18</value>
+ </data>
+ <data name="lbl_parHeight.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 225</value>
+ </data>
<data name=">>txt_displayWidth.Parent" xml:space="preserve">
<value>$this</value>
</data>
@@ -312,20 +304,23 @@ <data name="lbl_modulus.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>text_height.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lbl_anamprohicLbl.TabIndex" type="System.Int32, mscorlib">
+ <value>73</value>
</data>
<data name=">>crop_right.ZOrder" xml:space="preserve">
<value>7</value>
</data>
- <data name="check_KeepAR.Location" type="System.Drawing.Point, System.Drawing">
- <value>68, 85</value>
+ <data name="crop_right.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
</data>
- <data name="Label53.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>lbl_src_res.ZOrder" xml:space="preserve">
+ <value>26</value>
</data>
- <data name=">>lbl_parHeight.Name" xml:space="preserve">
- <value>lbl_parHeight</value>
+ <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="Label53.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
<data name=">>crop_left.Name" xml:space="preserve">
<value>crop_left</value>
@@ -333,21 +328,24 @@ <data name="check_customCrop.TabIndex" type="System.Int32, mscorlib">
<value>70</value>
</data>
- <data name="Label52.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
- </data>
<data name="Label55.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 13</value>
</data>
+ <data name=">>Label91.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
<data name="lbl_parWidth.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 199</value>
</data>
<data name="lbl_max.Size" type="System.Drawing.Size, System.Drawing">
<value>34, 13</value>
</data>
+ <data name=">>lbl_modulus.ZOrder" xml:space="preserve">
+ <value>20</value>
+ </data>
<data name="label26.Text" xml:space="preserve">
<value>Size</value>
</data>
@@ -357,29 +355,26 @@ <data name="label4.Text" xml:space="preserve">
<value>Height:</value>
</data>
- <data name=">>lbl_anamprohicLbl.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
<data name=">>check_customCrop.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="label26.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt, style=Bold</value>
+ </data>
<data name=">>txt_parWidth.Name" xml:space="preserve">
<value>txt_parWidth</value>
</data>
- <data name="lbl_src_res.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 12</value>
- </data>
- <data name="Label53.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
+ <data name="crop_bottom.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
</data>
- <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
- <value>37, 13</value>
+ <data name=">>txt_displayWidth.Name" xml:space="preserve">
+ <value>txt_displayWidth</value>
</data>
- <data name="label26.Size" type="System.Drawing.Size, System.Drawing">
- <value>34, 13</value>
+ <data name="lbl_parWidth.Text" xml:space="preserve">
+ <value>PAR Width:</value>
</data>
- <data name="label26.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>drop_modulus.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label8.Name" xml:space="preserve">
<value>label8</value>
@@ -387,8 +382,8 @@ <data name="drp_anamorphic.Items1" xml:space="preserve">
<value>Strict</value>
</data>
- <data name="drp_anamorphic.Items2" xml:space="preserve">
- <value>Loose</value>
+ <data name=">>lbl_anamprohicLbl.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
<data name="drp_anamorphic.Items3" xml:space="preserve">
<value>Custom</value>
@@ -405,6 +400,9 @@ <data name=">>crop_left.ZOrder" xml:space="preserve">
<value>6</value>
</data>
+ <data name=">>crop_left.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
<data name=">>lbl_modulus.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -414,15 +412,18 @@ <data name=">>label4.Name" xml:space="preserve">
<value>label4</value>
</data>
- <data name="lbl_modulus.Text" xml:space="preserve">
- <value>Modulus:</value>
+ <data name="txt_displayWidth.Location" type="System.Drawing.Point, System.Drawing">
+ <value>110, 170</value>
</data>
- <data name="crop_bottom.Enabled" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name="txt_displayWidth.ToolTip" xml:space="preserve">
+ <value>Display Width - Press "Enter" after entering a new value.</value>
</data>
<data name=">>check_customCrop.Parent" xml:space="preserve">
<value>$this</value>
</data>
+ <data name="drp_anamorphic.Items" xml:space="preserve">
+ <value>None</value>
+ </data>
<data name=">>lbl_parHeight.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -432,8 +433,8 @@ <data name=">>crop_bottom.Type" xml:space="preserve">
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lbl_modulus.ZOrder" xml:space="preserve">
- <value>20</value>
+ <data name=">>drop_modulus.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name=">>lbl_parHeight.Parent" xml:space="preserve">
<value>$this</value>
@@ -450,17 +451,20 @@ <data name="crop_top.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
- <data name=">>label8.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="text_height.ToolTip" xml:space="preserve">
+ <value />
</data>
<data name="drp_anamorphic.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 8.25pt</value>
</data>
+ <data name="lbl_anamprohicLbl.Size" type="System.Drawing.Size, System.Drawing">
+ <value>66, 13</value>
+ </data>
<data name=">>crop_top.Type" xml:space="preserve">
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lbl_Aspect.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>Label51.Name" xml:space="preserve">
+ <value>Label51</value>
</data>
<data name=">>text_width.ZOrder" xml:space="preserve">
<value>23</value>
@@ -468,24 +472,18 @@ <data name="txt_displayWidth.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 20</value>
</data>
- <data name="lbl_parHeight.Size" type="System.Drawing.Size, System.Drawing">
- <value>75, 13</value>
- </data>
<data name="lbl_src_res.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 6.75pt</value>
</data>
<data name="lbl_displayWidth.Text" xml:space="preserve">
<value>Display Width:</value>
</data>
- <data name=">>txt_parHeight.Name" xml:space="preserve">
- <value>txt_parHeight</value>
+ <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+ <value>37, 13</value>
</data>
<data name="check_customCrop.Text" xml:space="preserve">
<value>Custom:</value>
</data>
- <data name=">>lbl_anamprohicLbl.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name="lbl_displayWidth.TabIndex" type="System.Int32, mscorlib">
<value>54</value>
</data>
@@ -501,11 +499,11 @@ <data name=">>label7.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lbl_max.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="label26.Size" type="System.Drawing.Size, System.Drawing">
+ <value>34, 13</value>
</data>
- <data name=">>lbl_displayWidth.ZOrder" xml:space="preserve">
- <value>18</value>
+ <data name="check_autoCrop.TabIndex" type="System.Int32, mscorlib">
+ <value>69</value>
</data>
<data name="lbl_parHeight.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -531,9 +529,6 @@ <data name="Label51.Text" xml:space="preserve">
<value>Right</value>
</data>
- <data name=">>Label52.Name" xml:space="preserve">
- <value>Label52</value>
- </data>
<data name=">>drp_anamorphic.ZOrder" xml:space="preserve">
<value>29</value>
</data>
@@ -543,17 +538,17 @@ <data name=">>$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lbl_max.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name=">>check_KeepAR.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name="Label51.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>$this.Name" xml:space="preserve">
- <value>PictureSettings</value>
+ <data name="drop_modulus.ToolTip" xml:space="preserve">
+ <value />
</data>
- <data name="check_autoCrop.TabIndex" type="System.Int32, mscorlib">
- <value>69</value>
+ <data name="Label55.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
<data name=">>txt_parWidth.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -564,21 +559,12 @@ <data name=">>check_autoCrop.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="check_customCrop.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="lbl_parWidth.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
- </data>
- <data name="lbl_parWidth.Text" xml:space="preserve">
- <value>PAR Width:</value>
+ <data name=">>lbl_max.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name=">>label26.Name" xml:space="preserve">
<value>label26</value>
</data>
- <data name=">>check_KeepAR.ZOrder" xml:space="preserve">
- <value>13</value>
- </data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>384, 13</value>
</data>
@@ -588,23 +574,23 @@ <data name=">>check_customCrop.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="crop_right.Size" type="System.Drawing.Size, System.Drawing">
- <value>44, 20</value>
+ <data name="label6.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
- <data name=">>lbl_anamorphic.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>txt_displayWidth.ZOrder" xml:space="preserve">
+ <value>19</value>
</data>
- <data name=">>Label15.Name" xml:space="preserve">
- <value>Label15</value>
+ <data name=">>Label52.ZOrder" xml:space="preserve">
+ <value>10</value>
</data>
<data name="Label55.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 63</value>
</data>
- <data name="Label51.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="label8.ToolTip" xml:space="preserve">
+ <value />
</data>
- <data name="lbl_anamprohicLbl.TabIndex" type="System.Int32, mscorlib">
- <value>73</value>
+ <data name="check_KeepAR.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name=">>lbl_Aspect.ZOrder" xml:space="preserve">
<value>31</value>
@@ -618,15 +604,12 @@ <data name=">>lbl_src_res.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="Label91.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
+ <data name=">>check_autoCrop.Name" xml:space="preserve">
+ <value>check_autoCrop</value>
</data>
<data name=">>label7.ZOrder" xml:space="preserve">
<value>27</value>
</data>
- <data name=">>Label15.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name="label7.Text" xml:space="preserve">
<value>Source:</value>
</data>
@@ -639,20 +622,17 @@ <data name=">>lbl_anamorphic.Name" xml:space="preserve">
<value>lbl_anamorphic</value>
</data>
- <data name="lbl_parWidth.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name=">>toolTip.Name" xml:space="preserve">
- <value>toolTip</value>
+ <data name="Label15.TabIndex" type="System.Int32, mscorlib">
+ <value>61</value>
</data>
- <data name=">>lbl_displayWidth.Name" xml:space="preserve">
- <value>lbl_displayWidth</value>
+ <data name="label26.TabIndex" type="System.Int32, mscorlib">
+ <value>39</value>
</data>
<data name="Label51.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 13</value>
</data>
- <data name="text_width.Size" type="System.Drawing.Size, System.Drawing">
- <value>64, 20</value>
+ <data name="lbl_max.ToolTip" xml:space="preserve">
+ <value />
</data>
<data name=">>text_height.Name" xml:space="preserve">
<value>text_height</value>
@@ -663,17 +643,20 @@ <data name=">>Label91.ZOrder" xml:space="preserve">
<value>32</value>
</data>
+ <data name=">>lbl_parHeight.ZOrder" xml:space="preserve">
+ <value>14</value>
+ </data>
<data name="Label52.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 13</value>
</data>
<data name=">>crop_right.Type" xml:space="preserve">
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lbl_parWidth.Name" xml:space="preserve">
- <value>lbl_parWidth</value>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
- <data name="Label53.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="Label52.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
<data name="Label91.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -681,17 +664,23 @@ <data name=">>label6.Name" xml:space="preserve">
<value>label6</value>
</data>
- <data name="label26.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 13</value>
+ <data name=">>txt_parWidth.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name=">>label7.Name" xml:space="preserve">
<value>label7</value>
</data>
- <data name=">>check_autoCrop.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="text_width.Size" type="System.Drawing.Size, System.Drawing">
+ <value>64, 20</value>
</data>
- <data name="check_autoCrop.Text" xml:space="preserve">
- <value>Automatic</value>
+ <data name="lbl_anamorphic.TabIndex" type="System.Int32, mscorlib">
+ <value>74</value>
+ </data>
+ <data name=">>drop_modulus.ZOrder" xml:space="preserve">
+ <value>21</value>
+ </data>
+ <data name="text_width.Location" type="System.Drawing.Point, System.Drawing">
+ <value>68, 59</value>
</data>
<data name="lbl_max.TabIndex" type="System.Int32, mscorlib">
<value>47</value>
@@ -702,8 +691,8 @@ <data name="Label52.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="lbl_anamorphic.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>Label15.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 35</value>
@@ -714,14 +703,11 @@ <data name="Label51.Location" type="System.Drawing.Point, System.Drawing">
<value>561, 124</value>
</data>
- <data name="label8.ToolTip" xml:space="preserve">
- <value />
- </data>
- <data name="lbl_displayWidth.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 173</value>
+ <data name=">>check_KeepAR.ZOrder" xml:space="preserve">
+ <value>13</value>
</data>
- <data name="lbl_parHeight.Text" xml:space="preserve">
- <value>PAR Height:</value>
+ <data name="Label91.Text" xml:space="preserve">
+ <value>Aspect Ratio:</value>
</data>
<data name=">>label4.ZOrder" xml:space="preserve">
<value>24</value>
@@ -732,6 +718,9 @@ <data name="lbl_parWidth.ToolTip" xml:space="preserve">
<value />
</data>
+ <data name="check_autoCrop.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 17</value>
+ </data>
<data name="txt_parHeight.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 20</value>
</data>
@@ -741,80 +730,71 @@ <data name="txt_parHeight.TabIndex" type="System.Int32, mscorlib">
<value>57</value>
</data>
- <data name="text_width.TabIndex" type="System.Int32, mscorlib">
- <value>49</value>
+ <data name=">>crop_left.Type" xml:space="preserve">
+ <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="lbl_Aspect.Location" type="System.Drawing.Point, System.Drawing">
<value>241, 36</value>
</data>
- <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>80, 13</value>
+ <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+ <value>666, 279</value>
</data>
- <data name="Label91.TabIndex" type="System.Int32, mscorlib">
- <value>42</value>
+ <data name="lbl_anamorphic.ToolTip" xml:space="preserve">
+ <value />
</data>
<data name="Label52.TabIndex" type="System.Int32, mscorlib">
<value>63</value>
</data>
- <data name=">>drp_anamorphic.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="Label51.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name="crop_right.Location" type="System.Drawing.Point, System.Drawing">
<value>518, 122</value>
</data>
- <data name="Label15.TabIndex" type="System.Int32, mscorlib">
- <value>61</value>
- </data>
<data name=">>Label51.ZOrder" xml:space="preserve">
<value>11</value>
</data>
- <data name=">>check_autoCrop.Name" xml:space="preserve">
- <value>check_autoCrop</value>
- </data>
<data name=">>text_width.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="Label91.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 13</value>
</data>
- <data name=">>lbl_max.Name" xml:space="preserve">
- <value>lbl_max</value>
+ <data name=">>lbl_parHeight.Name" xml:space="preserve">
+ <value>lbl_parHeight</value>
</data>
<data name=">>lbl_parWidth.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>Label91.Name" xml:space="preserve">
- <value>Label91</value>
+ <data name="lbl_parHeight.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 13</value>
</data>
- <data name="check_autoCrop.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 17</value>
+ <data name=">>Label52.Name" xml:space="preserve">
+ <value>Label52</value>
</data>
- <data name=">>lbl_parWidth.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="text_height.Location" type="System.Drawing.Point, System.Drawing">
+ <value>206, 59</value>
</data>
- <data name="lbl_parHeight.Location" type="System.Drawing.Point, System.Drawing">
- <value>14, 225</value>
+ <data name="check_KeepAR.Location" type="System.Drawing.Point, System.Drawing">
+ <value>68, 85</value>
</data>
- <data name="Label91.Location" type="System.Drawing.Point, System.Drawing">
- <value>152, 35</value>
+ <data name="lbl_anamorphic.Location" type="System.Drawing.Point, System.Drawing">
+ <value>108, 250</value>
</data>
<data name="crop_left.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>drp_anamorphic.Name" xml:space="preserve">
- <value>drp_anamorphic</value>
+ <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>80, 13</value>
</data>
<data name="lbl_Aspect.Text" xml:space="preserve">
<value>Select a Title</value>
</data>
- <data name="lbl_anamorphic.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="lbl_src_res.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>lbl_anamorphic.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name=">>lbl_parHeight.ZOrder" xml:space="preserve">
- <value>14</value>
+ <data name=">>label8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="lbl_modulus.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 8.25pt</value>
@@ -822,32 +802,35 @@ <data name="crop_bottom.Location" type="System.Drawing.Point, System.Drawing">
<value>467, 146</value>
</data>
+ <data name=">>lbl_parWidth.Name" xml:space="preserve">
+ <value>lbl_parWidth</value>
+ </data>
<data name=">>label26.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>txt_parHeight.Name" xml:space="preserve">
+ <value>txt_parHeight</value>
</data>
<data name="lbl_displayWidth.ToolTip" xml:space="preserve">
<value />
</data>
- <data name="Label91.ToolTip" xml:space="preserve">
- <value />
+ <data name="lbl_modulus.Text" xml:space="preserve">
+ <value>Modulus:</value>
</data>
- <data name="lbl_modulus.TabIndex" type="System.Int32, mscorlib">
- <value>51</value>
+ <data name=">>text_height.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name=">>crop_top.ZOrder" xml:space="preserve">
<value>5</value>
</data>
- <data name="label8.TabIndex" type="System.Int32, mscorlib">
- <value>60</value>
+ <data name="Label91.Location" type="System.Drawing.Point, System.Drawing">
+ <value>152, 35</value>
</data>
<data name=">>lbl_parWidth.ZOrder" xml:space="preserve">
<value>16</value>
</data>
- <data name="label6.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
+ <data name=">>check_autoCrop.Parent" xml:space="preserve">
+ <value>$this</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 119</value>
@@ -870,8 +853,8 @@ <data name=">>Label53.Name" xml:space="preserve">
<value>Label53</value>
</data>
- <data name="drop_modulus.Items2" xml:space="preserve">
- <value>4</value>
+ <data name="Label91.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
<data name=">>lbl_anamorphic.Parent" xml:space="preserve">
<value>$this</value>
@@ -882,20 +865,20 @@ <data name="check_KeepAR.TabIndex" type="System.Int32, mscorlib">
<value>59</value>
</data>
- <data name="lbl_anamorphic.TabIndex" type="System.Int32, mscorlib">
- <value>74</value>
- </data>
<data name=">>Label15.ZOrder" xml:space="preserve">
<value>12</value>
</data>
+ <data name="text_height.TabIndex" type="System.Int32, mscorlib">
+ <value>50</value>
+ </data>
<data name="Label52.Text" xml:space="preserve">
<value>Top</value>
</data>
<data name="crop_right.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>lbl_src_res.ZOrder" xml:space="preserve">
- <value>26</value>
+ <data name=">>toolTip.Name" xml:space="preserve">
+ <value>toolTip</value>
</data>
<data name=">>lbl_anamprohicLbl.Name" xml:space="preserve">
<value>lbl_anamprohicLbl</value>
@@ -918,6 +901,9 @@ <data name="lbl_anamprohicLbl.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
+ <data name="Label55.Text" xml:space="preserve">
+ <value>Width:</value>
+ </data>
<data name="crop_top.TabIndex" type="System.Int32, mscorlib">
<value>64</value>
</data>
@@ -927,14 +913,14 @@ <data name="Label15.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 8.25pt</value>
</data>
- <data name="text_height.ToolTip" xml:space="preserve">
- <value />
+ <data name="txt_parWidth.Location" type="System.Drawing.Point, System.Drawing">
+ <value>110, 196</value>
</data>
- <data name="check_KeepAR.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="crop_right.Size" type="System.Drawing.Size, System.Drawing">
+ <value>44, 20</value>
</data>
- <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>666, 279</value>
+ <data name=">>lbl_max.Name" xml:space="preserve">
+ <value>lbl_max</value>
</data>
<data name=">>text_width.Name" xml:space="preserve">
<value>text_width</value>
@@ -942,11 +928,11 @@ <data name="Label53.Text" xml:space="preserve">
<value>Bottom</value>
</data>
- <data name=">>txt_displayWidth.Name" xml:space="preserve">
- <value>txt_displayWidth</value>
+ <data name="lbl_parWidth.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="txt_displayWidth.ToolTip" xml:space="preserve">
- <value>Display Width - Press "Enter" after entering a new value.</value>
+ <data name="lbl_src_res.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 12</value>
</data>
<data name="drop_modulus.Size" type="System.Drawing.Size, System.Drawing">
<value>110, 21</value>
@@ -957,29 +943,32 @@ <data name=">>check_KeepAR.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="drp_anamorphic.Items2" xml:space="preserve">
+ <value>Loose</value>
+ </data>
<data name="txt_parHeight.Location" type="System.Drawing.Point, System.Drawing">
<value>110, 222</value>
</data>
<data name="check_autoCrop.Location" type="System.Drawing.Point, System.Drawing">
<value>387, 33</value>
</data>
- <data name="Label55.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
+ <data name="check_autoCrop.Text" xml:space="preserve">
+ <value>Automatic</value>
</data>
<data name="Label52.ToolTip" xml:space="preserve">
<value />
</data>
- <data name=">>crop_bottom.ZOrder" xml:space="preserve">
+ <data name="drop_modulus.Items2" xml:space="preserve">
<value>4</value>
</data>
- <data name="lbl_parWidth.Size" type="System.Drawing.Size, System.Drawing">
- <value>71, 13</value>
- </data>
<data name="label6.Text" xml:space="preserve">
<value>Anamorphic:</value>
</data>
- <data name="lbl_Aspect.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 6.75pt</value>
+ <data name=">>lbl_displayWidth.Name" xml:space="preserve">
+ <value>lbl_displayWidth</value>
+ </data>
+ <data name="lbl_displayWidth.Size" type="System.Drawing.Size, System.Drawing">
+ <value>90, 13</value>
</data>
<data name="lbl_parHeight.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 8.25pt</value>
@@ -1005,11 +994,11 @@ <data name=">>drp_anamorphic.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>lbl_anamorphic.ZOrder" xml:space="preserve">
- <value>0</value>
+ <data name="drop_modulus.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
- <data name=">>Label15.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="lbl_src_res.ToolTip" xml:space="preserve">
+ <value />
</data>
<data name="crop_top.ToolTip" xml:space="preserve">
<value />
@@ -1023,11 +1012,11 @@ <data name="drp_anamorphic.Location" type="System.Drawing.Point, System.Drawing">
<value>110, 116</value>
</data>
- <data name="label26.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="label8.TabIndex" type="System.Int32, mscorlib">
+ <value>60</value>
</data>
- <data name="Label15.ToolTip" xml:space="preserve">
- <value />
+ <data name=">>lbl_modulus.Name" xml:space="preserve">
+ <value>lbl_modulus</value>
</data>
<data name="label6.ToolTip" xml:space="preserve">
<value />
@@ -1038,32 +1027,41 @@ <data name="lbl_parHeight.TabIndex" type="System.Int32, mscorlib">
<value>58</value>
</data>
+ <data name=">>txt_parHeight.ZOrder" xml:space="preserve">
+ <value>15</value>
+ </data>
+ <data name="lbl_max.Location" type="System.Drawing.Point, System.Drawing">
+ <value>279, 61</value>
+ </data>
<data name="lbl_src_res.Location" type="System.Drawing.Point, System.Drawing">
<value>66, 36</value>
</data>
+ <data name=">>Label51.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
<data name="crop_bottom.TabIndex" type="System.Int32, mscorlib">
<value>67</value>
</data>
<data name="lbl_max.Text" xml:space="preserve">
<value>{max}</value>
</data>
- <data name="text_width.Location" type="System.Drawing.Point, System.Drawing">
- <value>68, 59</value>
+ <data name="check_customCrop.ToolTip" xml:space="preserve">
+ <value />
</data>
- <data name=">>label8.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>text_height.Type" xml:space="preserve">
+ <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>drop_modulus.ZOrder" xml:space="preserve">
- <value>21</value>
+ <data name="lbl_parWidth.Size" type="System.Drawing.Size, System.Drawing">
+ <value>71, 13</value>
</data>
- <data name=">>text_height.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>lbl_Aspect.Name" xml:space="preserve">
+ <value>lbl_Aspect</value>
</data>
- <data name="Label55.Text" xml:space="preserve">
- <value>Width:</value>
+ <data name="Label52.Location" type="System.Drawing.Point, System.Drawing">
+ <value>474, 85</value>
</data>
- <data name="Label91.Text" xml:space="preserve">
- <value>Aspect Ratio:</value>
+ <data name="lbl_parWidth.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
<data name="crop_bottom.ToolTip" xml:space="preserve">
<value />
@@ -1071,17 +1069,17 @@ <data name="Label51.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 8.25pt</value>
</data>
- <data name="crop_right.Enabled" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name="lbl_displayWidth.Location" type="System.Drawing.Point, System.Drawing">
+ <value>14, 173</value>
</data>
- <data name="label6.TabIndex" type="System.Int32, mscorlib">
- <value>45</value>
+ <data name="Label53.ToolTip" xml:space="preserve">
+ <value />
</data>
- <data name=">>lbl_modulus.Name" xml:space="preserve">
- <value>lbl_modulus</value>
+ <data name=">>lbl_anamorphic.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="crop_left.Enabled" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name=">>drp_anamorphic.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="crop_right.TabIndex" type="System.Int32, mscorlib">
<value>65</value>
@@ -1089,8 +1087,8 @@ <data name=">>Label52.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>Label52.ZOrder" xml:space="preserve">
- <value>10</value>
+ <data name="label26.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 13</value>
</data>
<data name="label7.TabIndex" type="System.Int32, mscorlib">
<value>40</value>
@@ -1098,11 +1096,11 @@ <data name="check_customCrop.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="drp_anamorphic.Items" xml:space="preserve">
- <value>None</value>
+ <data name=">>lbl_parWidth.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>crop_left.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="lbl_anamprohicLbl.ToolTip" xml:space="preserve">
<value />
@@ -1116,75 +1114,77 @@ <data name="txt_parWidth.TabIndex" type="System.Int32, mscorlib">
<value>55</value>
</data>
- <data name=">>Label51.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="lbl_anamorphic.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="txt_parWidth.Location" type="System.Drawing.Point, System.Drawing">
- <value>110, 196</value>
+ <data name="lbl_modulus.TabIndex" type="System.Int32, mscorlib">
+ <value>51</value>
</data>
- <data name="drop_modulus.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
+ <data name="lbl_Aspect.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 6.75pt</value>
+ </data>
+ <data name=">>Label15.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Label15.Location" type="System.Drawing.Point, System.Drawing">
<value>384, 124</value>
</data>
- <data name=">>txt_displayWidth.ZOrder" xml:space="preserve">
- <value>19</value>
+ <data name="lbl_parHeight.Text" xml:space="preserve">
+ <value>PAR Height:</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="lbl_displayWidth.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt</value>
+ <data name=">>lbl_anamprohicLbl.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lbl_displayWidth.Size" type="System.Drawing.Size, System.Drawing">
- <value>90, 13</value>
+ <data name="crop_left.Location" type="System.Drawing.Point, System.Drawing">
+ <value>416, 122</value>
</data>
<data name=">>check_customCrop.Name" xml:space="preserve">
<value>check_customCrop</value>
</data>
- <data name="txt_parHeight.ToolTip" xml:space="preserve">
- <value>PAR Height - Press "Enter" after entering a new value.
-</value>
+ <data name="Label53.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name=">>Label53.ZOrder" xml:space="preserve">
<value>9</value>
</data>
- <data name="drop_modulus.ToolTip" xml:space="preserve">
- <value />
- </data>
<data name=">>crop_top.Name" xml:space="preserve">
<value>crop_top</value>
</data>
<data name="Label51.TabIndex" type="System.Int32, mscorlib">
<value>66</value>
</data>
- <data name=">>text_height.ZOrder" xml:space="preserve">
- <value>22</value>
+ <data name=">>Label91.Name" xml:space="preserve">
+ <value>Label91</value>
</data>
- <data name="label26.Font" type="System.Drawing.Font, System.Drawing">
- <value>Verdana, 8.25pt, style=Bold</value>
+ <data name=">>drp_anamorphic.Name" xml:space="preserve">
+ <value>drp_anamorphic</value>
</data>
<data name="lbl_anamprohicLbl.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 249</value>
</data>
- <data name=">>Label91.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="crop_left.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
</data>
<data name="crop_left.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
</data>
- <data name=">>txt_parHeight.ZOrder" xml:space="preserve">
- <value>15</value>
+ <data name="Label91.TabIndex" type="System.Int32, mscorlib">
+ <value>42</value>
</data>
- <data name="lbl_anamprohicLbl.Size" type="System.Drawing.Size, System.Drawing">
- <value>66, 13</value>
+ <data name="lbl_displayWidth.Font" type="System.Drawing.Font, System.Drawing">
+ <value>Verdana, 8.25pt</value>
</data>
- <data name="text_height.TabIndex" type="System.Int32, mscorlib">
- <value>50</value>
+ <data name="label6.TabIndex" type="System.Int32, mscorlib">
+ <value>45</value>
</data>
- <data name="label4.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="Label91.ToolTip" xml:space="preserve">
+ <value />
+ </data>
+ <data name="text_width.TabIndex" type="System.Int32, mscorlib">
+ <value>49</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index 6428097b1..251735aec 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -90,16 +90,6 @@ namespace Handbrake.Functions }
}
- // Set the anamorphic mode 0,1,2,3
- mainWindow.pictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;
-
- // Custom Anamorphic Controls
- mainWindow.pictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;
- mainWindow.pictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();
- mainWindow.pictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();
- mainWindow.pictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();
- mainWindow.pictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;
-
// Reset maxWidth and MaxHeight to 0
mainWindow.pictureSettings.maxWidth = 0;
mainWindow.pictureSettings.maxHeight = 0;
@@ -107,11 +97,10 @@ namespace Handbrake.Functions // Set the width and height
if (presetQuery.Width != 0)
mainWindow.pictureSettings.text_width.Value = presetQuery.Width;
+ else if (presetQuery.MaxWidth == 0)
+ mainWindow.pictureSettings.text_width.Value = 0;
- if (presetQuery.Height != 0)
- mainWindow.pictureSettings.text_height.Value = presetQuery.Height;
- else
- mainWindow.pictureSettings.text_height.Value = 0;
+ mainWindow.pictureSettings.text_height.Value = presetQuery.Height != 0 ? presetQuery.Height : 0;
// Max Width/Height override Width/Height
if (presetQuery.MaxWidth != 0)
@@ -127,6 +116,16 @@ namespace Handbrake.Functions }
mainWindow.pictureSettings.setMax();
+ // Set the anamorphic mode 0,1,2,3
+ mainWindow.pictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;
+
+ // Custom Anamorphic Controls
+ mainWindow.pictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;
+ mainWindow.pictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();
+ mainWindow.pictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();
+ mainWindow.pictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();
+ mainWindow.pictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;
+
#endregion
|