this.drop_detelecine.Name = "drop_detelecine";\r
this.drop_detelecine.Size = new System.Drawing.Size(174, 21);\r
this.drop_detelecine.TabIndex = 45;\r
- this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);\r
+ this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.DropDetelecineSelectedIndexChanged);\r
// \r
// text_customDC\r
// \r
this.drop_decomb.Name = "drop_decomb";\r
this.drop_decomb.Size = new System.Drawing.Size(174, 21);\r
this.drop_decomb.TabIndex = 48;\r
- this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);\r
+ this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.DropDecombSelectedIndexChanged);\r
// \r
// text_customDI\r
// \r
this.drop_deinterlace.Name = "drop_deinterlace";\r
this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);\r
this.drop_deinterlace.TabIndex = 51;\r
- this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.drop_deinterlace_SelectedIndexChanged);\r
+ this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.DropDeinterlaceSelectedIndexChanged);\r
// \r
// text_customDN\r
// \r
this.drop_denoise.Name = "drop_denoise";\r
this.drop_denoise.Size = new System.Drawing.Size(174, 21);\r
this.drop_denoise.TabIndex = 54;\r
- this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.drop_denoise_SelectedIndexChanged);\r
+ this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.DropDenoiseSelectedIndexChanged);\r
// \r
// slider_deblock\r
// \r
this.slider_deblock.Size = new System.Drawing.Size(174, 45);\r
this.slider_deblock.TabIndex = 58;\r
this.slider_deblock.Value = 4;\r
- this.slider_deblock.Scroll += new System.EventHandler(this.slider_deblock_Scroll);\r
+ this.slider_deblock.Scroll += new System.EventHandler(this.SliderDeblockScroll);\r
// \r
// check_grayscale\r
// \r
/// <summary>\r
/// Returns the CLI query for the query generator.\r
/// </summary>\r
- public string GetCLIQuery\r
+ public string GetCliQuery\r
{\r
get\r
{\r
}\r
\r
// Controls\r
- private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DropDetelecineSelectedIndexChanged(object sender, EventArgs e)\r
{\r
text_customDT.Visible = drop_detelecine.Text == "Custom";\r
// A Filter has changed so raise a FilterSettingsChanged event.\r
if (this.FilterSettingsChanged != null)\r
this.FilterSettingsChanged(this, new EventArgs());\r
}\r
- private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DropDecombSelectedIndexChanged(object sender, EventArgs e)\r
{\r
text_customDC.Visible = drop_decomb.Text == "Custom";\r
if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
if (this.FilterSettingsChanged != null)\r
this.FilterSettingsChanged(this, new EventArgs());\r
}\r
- private void drop_deinterlace_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DropDeinterlaceSelectedIndexChanged(object sender, EventArgs e)\r
{\r
text_customDI.Visible = drop_deinterlace.Text == "Custom";\r
if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
if (this.FilterSettingsChanged != null)\r
this.FilterSettingsChanged(this, new EventArgs());\r
}\r
- private void drop_denoise_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DropDenoiseSelectedIndexChanged(object sender, EventArgs e)\r
{\r
text_customDN.Visible = drop_denoise.Text == "Custom";\r
\r
if (this.FilterSettingsChanged != null)\r
this.FilterSettingsChanged(this, new EventArgs());\r
}\r
- private void slider_deblock_Scroll(object sender, EventArgs e)\r
+ private void SliderDeblockScroll(object sender, EventArgs e)\r
{\r
lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();\r
\r
this.crop_left.Name = "crop_left";\r
this.crop_left.Size = new System.Drawing.Size(44, 21);\r
this.crop_left.TabIndex = 98;\r
- this.crop_left.ValueChanged += new System.EventHandler(this.crop_ValueChanged);\r
+ this.crop_left.ValueChanged += new System.EventHandler(this.CropValueChanged);\r
// \r
// crop_right\r
// \r
this.crop_right.Name = "crop_right";\r
this.crop_right.Size = new System.Drawing.Size(44, 21);\r
this.crop_right.TabIndex = 101;\r
- this.crop_right.ValueChanged += new System.EventHandler(this.crop_ValueChanged);\r
+ this.crop_right.ValueChanged += new System.EventHandler(this.CropValueChanged);\r
// \r
// check_autoCrop\r
// \r
this.check_autoCrop.TabStop = true;\r
this.check_autoCrop.Text = "Automatic";\r
this.check_autoCrop.UseVisualStyleBackColor = true;\r
- this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\r
+ this.check_autoCrop.CheckedChanged += new System.EventHandler(this.CheckAutoCropCheckedChanged);\r
// \r
// Label51\r
// \r
this.crop_top.Name = "crop_top";\r
this.crop_top.Size = new System.Drawing.Size(44, 21);\r
this.crop_top.TabIndex = 100;\r
- this.crop_top.ValueChanged += new System.EventHandler(this.crop_ValueChanged);\r
+ this.crop_top.ValueChanged += new System.EventHandler(this.CropValueChanged);\r
// \r
// Label53\r
// \r
this.crop_bottom.Name = "crop_bottom";\r
this.crop_bottom.Size = new System.Drawing.Size(44, 21);\r
this.crop_bottom.TabIndex = 103;\r
- this.crop_bottom.ValueChanged += new System.EventHandler(this.crop_ValueChanged);\r
+ this.crop_bottom.ValueChanged += new System.EventHandler(this.CropValueChanged);\r
// \r
// check_customCrop\r
// \r
this.text_width.Name = "text_width";\r
this.text_width.Size = new System.Drawing.Size(64, 21);\r
this.text_width.TabIndex = 85;\r
- this.text_width.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);\r
+ this.text_width.ValueChanged += new System.EventHandler(this.TextWidthValueChanged);\r
// \r
// lbl_max\r
// \r
this.lbl_max.Size = new System.Drawing.Size(15, 13);\r
this.lbl_max.TabIndex = 83;\r
this.lbl_max.Text = "--";\r
- this.lbl_max.DoubleClick += new System.EventHandler(this.lbl_max_DoubleClick);\r
+ this.lbl_max.DoubleClick += new System.EventHandler(this.LblMaxDoubleClick);\r
// \r
// label4\r
// \r
this.text_height.Name = "text_height";\r
this.text_height.Size = new System.Drawing.Size(64, 21);\r
this.text_height.TabIndex = 86;\r
- this.text_height.ValueChanged += new System.EventHandler(this.text_height_ValueChanged);\r
+ this.text_height.ValueChanged += new System.EventHandler(this.TextHeightValueChanged);\r
// \r
// check_KeepAR\r
// \r
this.check_KeepAR.TabIndex = 95;\r
this.check_KeepAR.Text = "Keep Aspect Ratio";\r
this.check_KeepAR.UseVisualStyleBackColor = true;\r
- this.check_KeepAR.CheckedChanged += new System.EventHandler(this.check_KeepAR_CheckedChanged);\r
+ this.check_KeepAR.CheckedChanged += new System.EventHandler(this.CheckKeepArCheckedChanged);\r
// \r
// tableLayoutPanel1\r
// \r
this.updownParHeight.Name = "updownParHeight";\r
this.updownParHeight.Size = new System.Drawing.Size(53, 21);\r
this.updownParHeight.TabIndex = 112;\r
- this.updownParHeight.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);\r
+ this.updownParHeight.ValueChanged += new System.EventHandler(this.TextWidthValueChanged);\r
// \r
// label6\r
// \r
this.updownParWidth.Name = "updownParWidth";\r
this.updownParWidth.Size = new System.Drawing.Size(53, 21);\r
this.updownParWidth.TabIndex = 111;\r
- this.updownParWidth.ValueChanged += new System.EventHandler(this.text_width_ValueChanged);\r
+ this.updownParWidth.ValueChanged += new System.EventHandler(this.TextWidthValueChanged);\r
// \r
// drp_anamorphic\r
// \r
this.drp_anamorphic.Name = "drp_anamorphic";\r
this.drp_anamorphic.Size = new System.Drawing.Size(110, 21);\r
this.drp_anamorphic.TabIndex = 82;\r
- this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.drp_anamorphic_SelectedIndexChanged);\r
+ this.drp_anamorphic.SelectedIndexChanged += new System.EventHandler(this.DrpAnamorphicSelectedIndexChanged);\r
// \r
// lbl_parWidth\r
// \r
this.updownDisplayWidth.Name = "updownDisplayWidth";\r
this.updownDisplayWidth.Size = new System.Drawing.Size(53, 21);\r
this.updownDisplayWidth.TabIndex = 110;\r
- this.updownDisplayWidth.ValueChanged += new System.EventHandler(this.updownDisplayWidth_ValueChanged);\r
+ this.updownDisplayWidth.ValueChanged += new System.EventHandler(this.UpdownDisplayWidthValueChanged);\r
// \r
// lbl_modulus\r
// \r
this.drp_modulus.Name = "drp_modulus";\r
this.drp_modulus.Size = new System.Drawing.Size(110, 21);\r
this.drp_modulus.TabIndex = 88;\r
- this.drp_modulus.SelectedIndexChanged += new System.EventHandler(this.drp_modulus_SelectedIndexChanged);\r
+ this.drp_modulus.SelectedIndexChanged += new System.EventHandler(this.DrpModulusSelectedIndexChanged);\r
// \r
// label8\r
// \r
{\r
public partial class PictureSettings : UserControl\r
{\r
- private readonly CultureInfo Culture = new CultureInfo("en-US", false);\r
+ private readonly CultureInfo culture = new CultureInfo("en-US", false);\r
public event EventHandler PictureSettingsChanged;\r
\r
- private Boolean _preventChangingWidth, _preventChangingHeight, _preventChangingCustom, _preventChangingDisplayWidth;\r
- private int _presetMaximumWidth, _presetMaximumHeight;\r
- private double _cachedDar;\r
- private Title _sourceTitle;\r
+ private Boolean preventChangingWidth, preventChangingHeight, preventChangingCustom, preventChangingDisplayWidth;\r
+ private int presetMaximumWidth, presetMaximumHeight;\r
+ private double cachedDar;\r
+ private Title sourceTitle;\r
\r
+ /// <summary>\r
+ /// Creates a new instance of the Picture Settings Class\r
+ /// </summary>\r
public PictureSettings()\r
{\r
InitializeComponent();\r
/// <summary>\r
/// Gets or sets the source media used by this control.\r
/// </summary>\r
- [Browsable(false)]\r
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
public Title Source\r
{\r
- private get { return _sourceTitle; }\r
+ private get { return sourceTitle; }\r
set\r
{\r
- _sourceTitle = value;\r
- Enabled = _sourceTitle != null;\r
-\r
- // Set the Aspect Ratio\r
- lbl_Aspect.Text = _sourceTitle.AspectRatio.ToString(Culture);\r
- lbl_src_res.Text = _sourceTitle.Resolution.Width + " x " + _sourceTitle.Resolution.Height;\r
-\r
- // Set the Recommended Cropping values, but only if a preset doesn't have hard set picture settings.\r
- if (CurrentlySelectedPreset != null && CurrentlySelectedPreset.PictureSettings == false)\r
- {\r
- crop_top.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[0]);\r
- crop_bottom.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[1]);\r
- crop_left.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[2]);\r
- crop_right.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[3]);\r
- }\r
- else if (CurrentlySelectedPreset == null)\r
- {\r
- crop_top.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[0]);\r
- crop_bottom.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[1]);\r
- crop_left.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[2]);\r
- crop_right.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[3]);\r
- }\r
- SetPresetCropWarningLabel(CurrentlySelectedPreset);\r
-\r
- // Set the Resolution Boxes\r
- if (drp_anamorphic.SelectedIndex == 0)\r
- {\r
- if (text_width.Value == 0) // Only update the values if the fields don't already have values.\r
- text_width.Value = _sourceTitle.Resolution.Width;\r
-\r
- check_KeepAR.Checked = true; // Forces Resolution to be correct.\r
- }\r
- else\r
- {\r
- if (text_width.Value == 0 && text_height.Value == 0)// Only update the values if the fields don't already have values.\r
- {\r
- text_width.Value = _sourceTitle.Resolution.Width;\r
- text_height.Value = _sourceTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;\r
- }\r
-\r
- labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;\r
- }\r
-\r
- //updownDisplayWidth.Value = CalculateAnamorphicSizes().Width;\r
- updownParWidth.Value = _sourceTitle.ParVal.Width;\r
- updownParHeight.Value = _sourceTitle.ParVal.Height;\r
- //_cachedDar = (double)updownDisplayWidth.Value / (double)text_height.Value;\r
-\r
-\r
- Size croppedDar = CalculateAnamorphicSizes();\r
- _cachedDar = (double)croppedDar.Width / croppedDar.Height;\r
- updownDisplayWidth.Value = croppedDar.Width;\r
+ sourceTitle = value;\r
+ Enabled = sourceTitle != null;\r
+ NewSourceSet();\r
}\r
}\r
\r
/// Gets or sets the maximum allowable size for the encoded resolution. Set a value to\r
/// "0" if the maximum does not matter.\r
/// </summary>\r
- [Browsable(false)]\r
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
public Size PresetMaximumResolution\r
{\r
- get { return new Size(_presetMaximumWidth, _presetMaximumHeight); }\r
+ get { return new Size(presetMaximumWidth, presetMaximumHeight); }\r
set\r
{\r
- _presetMaximumWidth = value.Width;\r
- _presetMaximumHeight = value.Height;\r
+ presetMaximumWidth = value.Width;\r
+ presetMaximumHeight = value.Height;\r
\r
if (value.Width != 0 && value.Height != 0)\r
lbl_max.Text = "Max Width / Height";\r
}\r
}\r
\r
+ /// <summary>\r
+ /// Set the Preset Crop Warning Label\r
+ /// </summary>\r
+ /// <param name="selectedPreset"></param>\r
public void SetPresetCropWarningLabel(Preset selectedPreset)\r
{\r
lbl_presetCropWarning.Visible = true;\r
lbl_presetCropWarning.Visible = false;\r
}\r
\r
+ /// <summary>\r
+ /// Setup the UI. The Source has just changed.\r
+ /// </summary>\r
+ private void NewSourceSet()\r
+ {\r
+ // Set the Aspect Ratio\r
+ lbl_Aspect.Text = sourceTitle.AspectRatio.ToString(culture);\r
+ lbl_src_res.Text = sourceTitle.Resolution.Width + " x " + sourceTitle.Resolution.Height;\r
+\r
+ // Set the Recommended Cropping values, but only if a preset doesn't have hard set picture settings.\r
+ if ((CurrentlySelectedPreset != null && CurrentlySelectedPreset.PictureSettings == false) || CurrentlySelectedPreset == null)\r
+ {\r
+ crop_top.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions[0]);\r
+ crop_bottom.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions[1]);\r
+ crop_left.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions[2]);\r
+ crop_right.Value = GetCropMod2Clean(sourceTitle.AutoCropDimensions[3]);\r
+ }\r
+\r
+ SetPresetCropWarningLabel(CurrentlySelectedPreset);\r
+\r
+ // Set the Resolution Boxes\r
+ if (drp_anamorphic.SelectedIndex == 0)\r
+ {\r
+ if (text_width.Value == 0) // Only update the values if the fields don't already have values.\r
+ text_width.Value = sourceTitle.Resolution.Width;\r
+\r
+ check_KeepAR.Checked = true; // Forces Resolution to be correct.\r
+ }\r
+ else\r
+ {\r
+ if (text_width.Value == 0 && text_height.Value == 0)// Only update the values if the fields don't already have values.\r
+ {\r
+ text_width.Value = sourceTitle.Resolution.Width;\r
+ text_height.Value = sourceTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;\r
+ }\r
+\r
+ labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;\r
+ }\r
+\r
+ updownParWidth.Value = sourceTitle.ParVal.Width;\r
+ updownParHeight.Value = sourceTitle.ParVal.Height;\r
+\r
+ Size croppedDar = CalculateAnamorphicSizes();\r
+ cachedDar = (double)croppedDar.Width / croppedDar.Height;\r
+ updownDisplayWidth.Value = croppedDar.Width;\r
+ }\r
+ \r
// Picture Controls\r
- private void text_width_ValueChanged(object sender, EventArgs e)\r
+ private void TextWidthValueChanged(object sender, EventArgs e)\r
{\r
if (Properties.Settings.Default.disableResCalc)\r
return;\r
\r
- if (_preventChangingWidth)\r
+ if (preventChangingWidth)\r
return;\r
\r
// Make sure the new value doesn't exceed the maximum\r
case 0:\r
if (check_KeepAR.Checked && Source != null)\r
{\r
- _preventChangingHeight = true;\r
+ preventChangingHeight = true;\r
\r
int width = (int)text_width.Value;\r
\r
(Source.Resolution.Height * SourceAspect.Width * crop_width);\r
text_height.Value = (decimal)GetModulusValue(newHeight);\r
\r
- _preventChangingHeight = false;\r
+ preventChangingHeight = false;\r
}\r
break;\r
case 3:\r
if (check_KeepAR.CheckState == CheckState.Unchecked && Source != null)\r
{\r
- if (_preventChangingCustom)\r
+ if (preventChangingCustom)\r
break;\r
\r
- _preventChangingDisplayWidth = true;\r
+ preventChangingDisplayWidth = true;\r
updownDisplayWidth.Value = text_width.Value * updownParWidth.Value / updownParHeight.Value;\r
- _preventChangingDisplayWidth = false;\r
+ preventChangingDisplayWidth = false;\r
\r
labelDisplaySize.Text = Math.Truncate(updownDisplayWidth.Value) + "x" + text_height.Value;\r
}\r
break;\r
}\r
\r
- _preventChangingWidth = false;\r
+ preventChangingWidth = false;\r
}\r
- private void text_height_ValueChanged(object sender, EventArgs e)\r
+ private void TextHeightValueChanged(object sender, EventArgs e)\r
{\r
if (Properties.Settings.Default.disableResCalc)\r
return;\r
\r
- if (_preventChangingHeight)\r
+ if (preventChangingHeight)\r
return;\r
\r
if (Source != null)\r
case 0:\r
if (check_KeepAR.Checked && Source != null)\r
{\r
- _preventChangingWidth = true;\r
+ preventChangingWidth = true;\r
\r
double crop_width = Source.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;\r
double crop_height = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;\r
\r
text_width.Value = (decimal)GetModulusValue(new_width);\r
\r
- _preventChangingWidth = false;\r
+ preventChangingWidth = false;\r
}\r
break;\r
case 3:\r
// - Changes PIXEL HEIGHT to STORAGE WIDTH\r
// DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification)\r
\r
- double rawCalculatedDisplayWidth = (double)text_height.Value * _cachedDar;\r
+ double rawCalculatedDisplayWidth = (double)text_height.Value * cachedDar;\r
\r
- _preventChangingDisplayWidth = true; // Start Guards\r
- _preventChangingWidth = true;\r
+ preventChangingDisplayWidth = true; // Start Guards\r
+ preventChangingWidth = true;\r
\r
updownDisplayWidth.Value = (decimal)rawCalculatedDisplayWidth;\r
updownParWidth.Value = updownDisplayWidth.Value;\r
updownParHeight.Value = text_width.Value;\r
\r
- _preventChangingWidth = false; // Reset Guards\r
- _preventChangingDisplayWidth = false;\r
+ preventChangingWidth = false; // Reset Guards\r
+ preventChangingDisplayWidth = false;\r
}\r
\r
break;\r
break;\r
}\r
\r
- _preventChangingHeight = false;\r
+ preventChangingHeight = false;\r
}\r
- private void check_KeepAR_CheckedChanged(object sender, EventArgs e)\r
+ private void CheckKeepArCheckedChanged(object sender, EventArgs e)\r
{\r
if (Properties.Settings.Default.disableResCalc)\r
return;\r
\r
//Force TextWidth to recalc height\r
if (check_KeepAR.Checked)\r
- text_width_ValueChanged(this, new EventArgs());\r
+ TextWidthValueChanged(this, new EventArgs());\r
\r
// Disable the Custom Anamorphic Par Controls if checked.\r
if (drp_anamorphic.SelectedIndex == 3)\r
if (PictureSettingsChanged != null)\r
PictureSettingsChanged(this, new EventArgs());\r
}\r
- private void updownDisplayWidth_ValueChanged(object sender, EventArgs e)\r
+ private void UpdownDisplayWidthValueChanged(object sender, EventArgs e)\r
{\r
if (Properties.Settings.Default.disableResCalc)\r
return;\r
\r
- if (_preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked)\r
+ if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Unchecked)\r
{\r
- _preventChangingCustom = true;\r
+ preventChangingCustom = true;\r
updownParWidth.Value = updownDisplayWidth.Value;\r
updownParHeight.Value = text_width.Value;\r
- _preventChangingCustom = false;\r
+ preventChangingCustom = false;\r
}\r
\r
- if (_preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Checked)\r
+ if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Checked)\r
{\r
// - Changes HEIGHT to keep DAR\r
// - Changes PIXEL WIDTH to new DISPLAY WIDTH\r
if (!int.TryParse(drp_modulus.SelectedItem.ToString(), out modulus))\r
modulus = 16;\r
\r
- int rawCalculatedHeight = (int)((int)updownDisplayWidth.Value / _cachedDar);\r
+ int rawCalculatedHeight = (int)((int)updownDisplayWidth.Value / cachedDar);\r
int modulusHeight = rawCalculatedHeight - (rawCalculatedHeight % modulus);\r
\r
// Update value\r
- _preventChangingHeight = true;\r
+ preventChangingHeight = true;\r
text_height.Value = (decimal)modulusHeight;\r
updownParWidth.Value = updownDisplayWidth.Value;\r
updownParHeight.Value = text_width.Value;\r
- _preventChangingHeight = false;\r
+ preventChangingHeight = false;\r
}\r
\r
}\r
\r
// Anamorphic Controls\r
- private void drp_anamorphic_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DrpAnamorphicSelectedIndexChanged(object sender, EventArgs e)\r
{\r
switch (drp_anamorphic.SelectedIndex)\r
{\r
- case 0:\r
+ case 0: // None\r
text_width.Enabled = true;\r
text_height.Enabled = true;\r
check_KeepAR.Enabled = true;\r
\r
SetCustomAnamorphicOptionsVisible(false);\r
labelStaticDisplaySize.Visible = false;\r
- labelDisplaySize.Visible = false;\r
+ labelDisplaySize.Visible = true;\r
+ drp_modulus.Visible = true;\r
\r
// check_KeepAR.Checked = true;\r
- drp_modulus.SelectedIndex = 0;\r
\r
if (check_KeepAR.Checked)\r
- text_width_ValueChanged(this, new EventArgs());\r
+ TextWidthValueChanged(this, new EventArgs());\r
// Don't update display size if we're not using anamorphic\r
return;\r
- case 1:\r
+ case 1: // Strict\r
text_width.Enabled = false;\r
text_height.Enabled = false;\r
check_KeepAR.Enabled = false;\r
SetCustomAnamorphicOptionsVisible(false);\r
labelStaticDisplaySize.Visible = true;\r
labelDisplaySize.Visible = true;\r
- drp_modulus.SelectedIndex = 0;\r
\r
check_KeepAR.Checked = true;\r
break;\r
- case 2:\r
+ case 2: // Loose\r
text_width.Enabled = true;\r
text_height.Enabled = false;\r
check_KeepAR.Enabled = false;\r
SetCustomAnamorphicOptionsVisible(false);\r
labelStaticDisplaySize.Visible = true;\r
labelDisplaySize.Visible = true;\r
- drp_modulus.SelectedIndex = 0;\r
+ drp_modulus.Visible = true;\r
+ lbl_modulus.Visible = true;\r
\r
check_KeepAR.Checked = true;\r
break;\r
- case 3:\r
+ case 3: // Custom\r
text_width.Enabled = true;\r
text_height.Enabled = true;\r
check_KeepAR.Enabled = true;\r
labelDisplaySize.Text = CalculateAnamorphicSizes().Width + "x" + CalculateAnamorphicSizes().Height;\r
\r
if (check_KeepAR.Checked)\r
- text_width_ValueChanged(this, new EventArgs());\r
+ TextWidthValueChanged(this, new EventArgs());\r
\r
if (PictureSettingsChanged != null)\r
PictureSettingsChanged(this, new EventArgs());\r
}\r
- private void drp_modulus_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DrpModulusSelectedIndexChanged(object sender, EventArgs e)\r
{\r
- _preventChangingWidth = true;\r
- _preventChangingHeight = true;\r
+ preventChangingWidth = true;\r
+ preventChangingHeight = true;\r
\r
text_width.Value = (decimal)GetModulusValue((double)text_width.Value);\r
text_height.Value = (decimal)GetModulusValue((double)text_height.Value);\r
\r
- _preventChangingWidth = false;\r
- _preventChangingHeight = false;\r
+ preventChangingWidth = false;\r
+ preventChangingHeight = false;\r
\r
text_width.Increment = int.Parse(drp_modulus.SelectedItem.ToString());\r
text_height.Increment = int.Parse(drp_modulus.SelectedItem.ToString());\r
}\r
\r
// Cropping Controls\r
- private void check_autoCrop_CheckedChanged(object sender, EventArgs e)\r
+ private void CheckAutoCropCheckedChanged(object sender, EventArgs e)\r
{\r
crop_top.Enabled = check_customCrop.Checked;\r
crop_bottom.Enabled = check_customCrop.Checked;\r
crop_right.Value = Source.AutoCropDimensions[3];\r
}\r
}\r
- private void crop_ValueChanged(object sender, EventArgs e)\r
+ private void CropValueChanged(object sender, EventArgs e)\r
{\r
- text_width_ValueChanged(this, new EventArgs());\r
+ TextWidthValueChanged(this, new EventArgs());\r
}\r
\r
// GUI Functions\r
if (Source != null)\r
{\r
/* Set up some variables to make the math easier to follow. */\r
- int cropped_width = Source.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;\r
- int cropped_height = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;\r
- double storage_aspect = (double)cropped_width / cropped_height;\r
+ int croppedWidth = Source.Resolution.Width - (int)crop_left.Value - (int)crop_right.Value;\r
+ int croppedHeight = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;\r
+ double storageAspect = (double)croppedWidth / croppedHeight;\r
\r
/* Figure out what width the source would display at. */\r
- double source_display_width = (double)cropped_width * Source.ParVal.Width / Source.ParVal.Height;\r
+ double sourceDisplayWidth = (double)croppedWidth * Source.ParVal.Width / Source.ParVal.Height;\r
\r
/*\r
3 different ways of deciding output dimensions:\r
default:\r
case 1:\r
/* Strict anamorphic */\r
- double displayWidth = ((double)cropped_width * Source.ParVal.Width / Source.ParVal.Height);\r
+ double displayWidth = ((double)croppedWidth * Source.ParVal.Width / Source.ParVal.Height);\r
displayWidth = Math.Round(displayWidth, 0);\r
- Size output = new Size((int)displayWidth, cropped_height);\r
+ Size output = new Size((int)displayWidth, croppedHeight);\r
return output;\r
case 2:\r
/* "Loose" anamorphic.\r
width = (int)text_width.Value;\r
width = GetModulusValue(width); /* Time to get picture width that divide cleanly.*/\r
\r
- height = (width / storage_aspect) + 0.5;\r
+ height = (width / storageAspect) + 0.5;\r
height = GetModulusValue(height); /* Time to get picture height that divide cleanly.*/\r
\r
/* The film AR is the source's display width / cropped source height.\r
The output display width is the output height * film AR.\r
The output PAR is the output display width / output storage width. */\r
- double pixel_aspect_width = height * source_display_width / cropped_height;\r
- double pixel_aspect_height = width;\r
+ double pixelAspectWidth = height * sourceDisplayWidth / croppedHeight;\r
+ double pixelAspectHeight = width;\r
\r
- double disWidthLoose = (width * pixel_aspect_width / pixel_aspect_height);\r
+ double disWidthLoose = (width * pixelAspectWidth / pixelAspectHeight);\r
if (double.IsNaN(disWidthLoose))\r
disWidthLoose = 0;\r
return new Size((int)disWidthLoose, (int)height);\r
}\r
\r
// Hidden UI feature to drop the MaxWidth / Height with the MaxWidth/Height label is double clicked\r
- private void lbl_max_DoubleClick(object sender, EventArgs e)\r
+ private void LblMaxDoubleClick(object sender, EventArgs e)\r
{\r
PresetMaximumResolution = new Size(0, 0);\r
if (PictureSettingsChanged != null)\r
PictureSettingsChanged(this, new EventArgs());\r
}\r
-\r
}\r
}
\ No newline at end of file
this.btn_addTrack.Text = "Add";\r
this.toolTip.SetToolTip(this.btn_addTrack, "Add a new subtitle track to the list below");\r
this.btn_addTrack.UseVisualStyleBackColor = false;\r
- this.btn_addTrack.Click += new System.EventHandler(this.btn_addSubTrack_Click);\r
+ this.btn_addTrack.Click += new System.EventHandler(this.BtnAddSubTrackClick);\r
// \r
// btn_RemoveSubTrack\r
// \r
this.btn_RemoveSubTrack.TabIndex = 69;\r
this.btn_RemoveSubTrack.Text = "Remove";\r
this.btn_RemoveSubTrack.UseVisualStyleBackColor = false;\r
- this.btn_RemoveSubTrack.Click += new System.EventHandler(this.btn_RemoveSubTrack_Click);\r
+ this.btn_RemoveSubTrack.Click += new System.EventHandler(this.BtnRemoveSubTrackClick);\r
// \r
// lv_subList\r
// \r
this.lv_subList.TabIndex = 70;\r
this.lv_subList.UseCompatibleStateImageBehavior = false;\r
this.lv_subList.View = System.Windows.Forms.View.Details;\r
- this.lv_subList.SelectedIndexChanged += new System.EventHandler(this.lb_subList_SelectedIndexChanged);\r
+ this.lv_subList.SelectedIndexChanged += new System.EventHandler(this.LbSubListSelectedIndexChanged);\r
// \r
// col_Source\r
// \r
this.mnu_moveup.Name = "mnu_moveup";\r
this.mnu_moveup.Size = new System.Drawing.Size(138, 22);\r
this.mnu_moveup.Text = "Move Up";\r
- this.mnu_moveup.Click += new System.EventHandler(this.mnu_moveup_Click);\r
+ this.mnu_moveup.Click += new System.EventHandler(this.MnuMoveupClick);\r
// \r
// mnu_movedown\r
// \r
this.mnu_movedown.Size = new System.Drawing.Size(138, 22);\r
this.mnu_movedown.Text = "Move Down";\r
this.mnu_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
- this.mnu_movedown.Click += new System.EventHandler(this.mnu_movedown_Click);\r
+ this.mnu_movedown.Click += new System.EventHandler(this.MnuMovedownClick);\r
// \r
// toolStripSeparator2\r
// \r
this.mnu_remove.Name = "mnu_remove";\r
this.mnu_remove.Size = new System.Drawing.Size(138, 22);\r
this.mnu_remove.Text = "Remove";\r
- this.mnu_remove.Click += new System.EventHandler(this.mnu_remove_Click);\r
+ this.mnu_remove.Click += new System.EventHandler(this.MnuRemoveClick);\r
// \r
// label68\r
// \r
this.drp_subtitleTracks.Name = "drp_subtitleTracks";\r
this.drp_subtitleTracks.Size = new System.Drawing.Size(164, 21);\r
this.drp_subtitleTracks.TabIndex = 74;\r
- this.drp_subtitleTracks.SelectedIndexChanged += new System.EventHandler(this.drp_subtitleTracks_SelectedIndexChanged);\r
+ this.drp_subtitleTracks.SelectedIndexChanged += new System.EventHandler(this.DrpSubtitleTracksSelectedIndexChanged);\r
// \r
// label10\r
// \r
this.srt_offset.Name = "srt_offset";\r
this.srt_offset.Size = new System.Drawing.Size(58, 21);\r
this.srt_offset.TabIndex = 79;\r
- this.srt_offset.ValueChanged += new System.EventHandler(this.srt_offset_ValueChanged);\r
+ this.srt_offset.ValueChanged += new System.EventHandler(this.SrtOffsetValueChanged);\r
// \r
// srt_lang\r
// \r
this.srt_lang.Name = "srt_lang";\r
this.srt_lang.Size = new System.Drawing.Size(103, 21);\r
this.srt_lang.TabIndex = 50;\r
- this.srt_lang.SelectedIndexChanged += new System.EventHandler(this.srt_lang_SelectedIndexChanged);\r
+ this.srt_lang.SelectedIndexChanged += new System.EventHandler(this.SrtLangSelectedIndexChanged);\r
// \r
// label8\r
// \r
this.srt_charcode.Name = "srt_charcode";\r
this.srt_charcode.Size = new System.Drawing.Size(78, 21);\r
this.srt_charcode.TabIndex = 73;\r
- this.srt_charcode.SelectedIndexChanged += new System.EventHandler(this.srt_charcode_SelectedIndexChanged);\r
+ this.srt_charcode.SelectedIndexChanged += new System.EventHandler(this.SrtCharcodeSelectedIndexChanged);\r
// \r
// label4\r
// \r
this.check_forced.Size = new System.Drawing.Size(15, 14);\r
this.check_forced.TabIndex = 75;\r
this.check_forced.UseVisualStyleBackColor = true;\r
- this.check_forced.CheckedChanged += new System.EventHandler(this.check_forced_CheckedChanged);\r
+ this.check_forced.CheckedChanged += new System.EventHandler(this.CheckForcedCheckedChanged);\r
// \r
// label7\r
// \r
this.check_default.Size = new System.Drawing.Size(15, 14);\r
this.check_default.TabIndex = 77;\r
this.check_default.UseVisualStyleBackColor = true;\r
- this.check_default.CheckedChanged += new System.EventHandler(this.check_default_CheckedChanged);\r
+ this.check_default.CheckedChanged += new System.EventHandler(this.CheckDefaultCheckedChanged);\r
// \r
// check_burned\r
// \r
this.check_burned.Size = new System.Drawing.Size(15, 14);\r
this.check_burned.TabIndex = 76;\r
this.check_burned.UseVisualStyleBackColor = true;\r
- this.check_burned.CheckedChanged += new System.EventHandler(this.check_burned_CheckedChanged);\r
+ this.check_burned.CheckedChanged += new System.EventHandler(this.CheckBurnedCheckedChanged);\r
// \r
// btn_srtAdd\r
// \r
this.btn_srtAdd.Text = "Import SRT";\r
this.toolTip.SetToolTip(this.btn_srtAdd, "Add a new SRT file to the \"track\" dropdown menu.");\r
this.btn_srtAdd.UseVisualStyleBackColor = false;\r
- this.btn_srtAdd.Click += new System.EventHandler(this.btn_srtAdd_Click);\r
+ this.btn_srtAdd.Click += new System.EventHandler(this.BtnSrtAddClick);\r
// \r
// openFileDialog\r
// \r
\r
namespace Handbrake.Controls\r
{\r
+ using System.Linq;\r
+\r
public partial class Subtitles : UserControl\r
{\r
- readonly IDictionary<string, string> LangMap = new Dictionary<string, string>();\r
- List<SubtitleInfo> SubList = new List<SubtitleInfo>();\r
- private int FileContainer;\r
+ readonly IDictionary<string, string> langMap = new Dictionary<string, string>();\r
+ readonly List<SubtitleInfo> subList = new List<SubtitleInfo>();\r
+ private int fileContainer;\r
\r
public Subtitles()\r
{\r
InitializeComponent();\r
\r
- LangMap = Main.MapLanguages();\r
- foreach (string key in LangMap.Keys)\r
+ langMap = Main.MapLanguages();\r
+ foreach (string key in langMap.Keys)\r
srt_lang.Items.Add(key);\r
\r
srt_charcode.SelectedIndex = 28;\r
}\r
\r
// Primary Controls\r
- private void btn_addSubTrack_Click(object sender, EventArgs e)\r
+ private void BtnAddSubTrackClick(object sender, EventArgs e)\r
{\r
// Logic\r
string forcedVal = check_forced.CheckState == CheckState.Checked ? "Yes" : "No";\r
if (defaultSub == "Yes") SetNoDefault();\r
if (burnedVal == "Yes") SetNoBurned();\r
\r
- if (FileContainer == 0)\r
+ if (fileContainer == 0)\r
burnedVal = "Yes"; // MP4 must have bitmap subs burned in.\r
}\r
\r
- if (FileContainer == 0) // MP4 and M4V file extension\r
+ if (fileContainer == 0) // MP4 and M4V file extension\r
{\r
// Make sure we only have 1 bitmap track.\r
if (drp_subtitleTracks.SelectedItem != null && drp_subtitleTracks.SelectedItem.ToString().Contains("Bitmap"))\r
{\r
- foreach (ListViewItem item in lv_subList.Items)\r
+ if (lv_subList.Items.Cast<ListViewItem>().Any(item => item.SubItems[0].Text.Contains("Bitmap")))\r
{\r
- if (item.SubItems[0].Text.Contains("Bitmap"))\r
- {\r
- MessageBox.Show(this, "More than one vobsub is not supported in mp4... Your first vobsub track will now be used.",\r
- "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
- return;\r
- }\r
+ MessageBox.Show(this, "More than one vobsub is not supported in mp4... Your first vobsub track will now be used.",\r
+ "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ return;\r
}\r
}\r
}\r
};\r
\r
lv_subList.Items.Add(track.ListView);\r
- SubList.Add(track);\r
+ subList.Add(track);\r
\r
}\r
- private void btn_srtAdd_Click(object sender, EventArgs e)\r
+ private void BtnSrtAddClick(object sender, EventArgs e)\r
{\r
if (openFileDialog.ShowDialog() != DialogResult.OK)\r
return;\r
drp_subtitleTracks.Items.Add(Path.GetFileName(openFileDialog.FileName));\r
drp_subtitleTracks.SelectedItem = Path.GetFileName(openFileDialog.FileName);\r
}\r
- private void btn_RemoveSubTrack_Click(object sender, EventArgs e)\r
+ private void BtnRemoveSubTrackClick(object sender, EventArgs e)\r
{\r
RemoveTrack();\r
}\r
\r
// Secondary Controls\r
- private void lb_subList_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void LbSubListSelectedIndexChanged(object sender, EventArgs e)\r
{\r
// Set the dropdown controls based on the selected item in the List.\r
if (lv_subList.Items.Count != 0 && lv_subList.SelectedIndices.Count != 0)\r
{\r
- SubtitleInfo track = SubList[lv_subList.SelectedIndices[0]];\r
+ SubtitleInfo track = subList[lv_subList.SelectedIndices[0]];\r
\r
int c = 0;\r
if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text.ToLower().Contains(".srt")) // We have an SRT\r
}\r
\r
// Bitmap / CC / SRT Controls\r
- private void drp_subtitleTracks_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void DrpSubtitleTracksSelectedIndexChanged(object sender, EventArgs e)\r
{\r
if (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))\r
{\r
lv_subList.Select();\r
}\r
\r
- SubList[lv_subList.SelectedIndices[0]].Track = drp_subtitleTracks.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
+ subList[lv_subList.SelectedIndices[0]].Track = drp_subtitleTracks.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
}\r
- private void check_forced_CheckedChanged(object sender, EventArgs e)\r
+ private void CheckForcedCheckedChanged(object sender, EventArgs e)\r
{\r
if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
\r
lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[1].Text = check_forced.Checked ? "Yes" : "No";\r
lv_subList.Select();\r
\r
- SubList[lv_subList.SelectedIndices[0]].Forced = check_forced.Checked ? "Yes" : "No"; // Update SubList List<SubtitleInfo> \r
+ subList[lv_subList.SelectedIndices[0]].Forced = check_forced.Checked ? "Yes" : "No"; // Update SubList List<SubtitleInfo> \r
}\r
- private void check_burned_CheckedChanged(object sender, EventArgs e)\r
+ private void CheckBurnedCheckedChanged(object sender, EventArgs e)\r
{\r
if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
\r
lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[2].Text = check_burned.Checked ? "Yes" : "No";\r
lv_subList.Select();\r
\r
- SubList[lv_subList.SelectedIndices[0]].Burned = check_burned.Checked ? "Yes" : "No"; // Update SubList List<SubtitleInfo> \r
+ subList[lv_subList.SelectedIndices[0]].Burned = check_burned.Checked ? "Yes" : "No"; // Update SubList List<SubtitleInfo> \r
}\r
- private void check_default_CheckedChanged(object sender, EventArgs e)\r
+ private void CheckDefaultCheckedChanged(object sender, EventArgs e)\r
{\r
if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
\r
lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[3].Text = check_default.Checked ? "Yes" : "No";\r
lv_subList.Select();\r
\r
- SubList[lv_subList.SelectedIndices[0]].Default = check_default.Checked ? "Yes" : "No"; // Update SubList List<SubtitleInfo>\r
+ subList[lv_subList.SelectedIndices[0]].Default = check_default.Checked ? "Yes" : "No"; // Update SubList List<SubtitleInfo>\r
}\r
- private void srt_offset_ValueChanged(object sender, EventArgs e)\r
+ private void SrtOffsetValueChanged(object sender, EventArgs e)\r
{\r
// Update an item in the list if required.\r
if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0)\r
lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[6].Text = srt_offset.Value.ToString();\r
lv_subList.Select();\r
\r
- SubList[lv_subList.SelectedIndices[0]].SrtOffset = (int)srt_offset.Value; // Update SubList List<SubtitleInfo>\r
+ subList[lv_subList.SelectedIndices[0]].SrtOffset = (int)srt_offset.Value; // Update SubList List<SubtitleInfo>\r
}\r
- private void srt_charcode_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void SrtCharcodeSelectedIndexChanged(object sender, EventArgs e)\r
{\r
if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
\r
lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[5].Text = srt_charcode.SelectedItem.ToString();\r
lv_subList.Select();\r
\r
- SubList[lv_subList.SelectedIndices[0]].SrtCharCode = srt_charcode.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
+ subList[lv_subList.SelectedIndices[0]].SrtCharCode = srt_charcode.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
}\r
- private void srt_lang_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void SrtLangSelectedIndexChanged(object sender, EventArgs e)\r
{\r
if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
\r
lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[4].Text = srt_lang.SelectedItem.ToString();\r
lv_subList.Select();\r
\r
- SubList[lv_subList.SelectedIndices[0]].SrtLang = srt_lang.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
+ subList[lv_subList.SelectedIndices[0]].SrtLang = srt_lang.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
}\r
\r
// Right Click Menu\r
- private void mnu_moveup_Click(object sender, EventArgs e)\r
+ private void MnuMoveupClick(object sender, EventArgs e)\r
{\r
if (lv_subList.SelectedIndices.Count != 0)\r
{\r
}\r
}\r
}\r
- private void mnu_movedown_Click(object sender, EventArgs e)\r
+ private void MnuMovedownClick(object sender, EventArgs e)\r
{\r
if (lv_subList.SelectedIndices.Count != 0)\r
{\r
}\r
}\r
}\r
- private void mnu_remove_Click(object sender, EventArgs e)\r
+ private void MnuRemoveClick(object sender, EventArgs e)\r
{\r
RemoveTrack();\r
}\r
int c = 0;\r
foreach (ListViewItem item in lv_subList.Items)\r
{\r
- if (SubList[c].SrtPath == "-")\r
+ if (subList[c].SrtPath == "-")\r
{\r
if (item.SubItems[3].Text == "Yes")\r
{\r
item.SubItems[3].Text = "No";\r
- SubList[c].Default = "No";\r
+ subList[c].Default = "No";\r
} \r
}\r
c++;\r
int c = 0;\r
foreach (ListViewItem item in lv_subList.Items)\r
{\r
- if (SubList[c].SrtPath != "-")\r
+ if (subList[c].SrtPath != "-")\r
{\r
if (item.SubItems[3].Text == "Yes")\r
{\r
item.SubItems[3].Text = "No";\r
- SubList[c].Default = "No";\r
+ subList[c].Default = "No";\r
}\r
}\r
c++;\r
if (item.SubItems[2].Text == "Yes")\r
{\r
item.SubItems[2].Text = "No";\r
- SubList[c].Burned = "No";\r
+ subList[c].Burned = "No";\r
}\r
c++;\r
}\r
int selectedInd = lv_subList.SelectedIndices[0];\r
\r
lv_subList.Items.RemoveAt(selectedInd);\r
- SubList.RemoveAt(selectedInd);\r
+ subList.RemoveAt(selectedInd);\r
\r
// Now reslect the correct item and give focus to the list.\r
if (lv_subList.Items.Count != 0)\r
}\r
}\r
\r
- // Public Functions\r
+ /// <summary>\r
+ /// Clear the Subtitle List\r
+ /// </summary>\r
public void Clear()\r
{\r
lv_subList.Items.Clear();\r
- SubList.Clear();\r
+ subList.Clear();\r
}\r
+\r
+ /// <summary>\r
+ /// Cleverly Clear the subtitle list. Only remove tracks that are not available for the current source.\r
+ /// </summary>\r
public void SmartClear()\r
{\r
/* Smart clear will only remove subtitle tracks that do not have an equivlent \r
for the new source / title which the user has selected. */\r
throw new NotImplementedException();\r
}\r
+\r
+ /// <summary>\r
+ /// Checks of the current settings will require the m4v file extension\r
+ /// </summary>\r
+ /// <returns>True if Yes</returns>\r
public Boolean RequiresM4V()\r
{\r
foreach (ListViewItem item in lv_subList.Items)\r
}\r
return false;\r
}\r
+\r
+ /// <summary>\r
+ /// Automatically setup the subtitle tracks.\r
+ /// This handles the automatic setup of subitles which the user can control from the program options\r
+ /// </summary>\r
+ /// <param name="subs"></param>\r
public void SetSubtitleTrackAuto(object[] subs)\r
{\r
drp_subtitleTracks.Items.Clear();\r
i++;\r
}\r
\r
- btn_addSubTrack_Click(this, new EventArgs());\r
+ BtnAddSubTrackClick(this, new EventArgs());\r
}\r
}\r
}\r
+\r
+ /// <summary>\r
+ /// Set the file container which is currently in use.\r
+ /// </summary>\r
+ /// <param name="value"></param>\r
public void SetContainer(int value)\r
{\r
- FileContainer = value;\r
+ fileContainer = value;\r
Boolean trigger = false;\r
- if (FileContainer != 1)\r
+ if (fileContainer != 1)\r
foreach (ListViewItem item in lv_subList.Items)\r
{\r
if (item.SubItems[1].Text.Contains("Bitmap"))\r
}\r
}\r
}\r
+\r
+ /// <summary>\r
+ /// Get the list of subtitles.\r
+ /// </summary>\r
+ /// <returns></returns>\r
public List<SubtitleInfo> GetSubtitleInfoList()\r
{\r
- return SubList;\r
+ return subList;\r
+ }\r
+\r
+ /// <summary>\r
+ /// Get the CLI Query for this panel\r
+ /// </summary>\r
+ /// <returns></returns>\r
+ public string GetCliQuery\r
+ {\r
+ get\r
+ {\r
+ string query = string.Empty;\r
+ if (lv_subList.Items.Count != 0) // If we have subtitle tracks\r
+ {\r
+ // BitMap and CC's\r
+ string subtitleTracks = String.Empty;\r
+ string subtitleForced = String.Empty;\r
+ string subtitleBurn = String.Empty;\r
+ string subtitleDefault = String.Empty;\r
+\r
+ // SRT\r
+ string srtFile = String.Empty;\r
+ string srtCodeset = String.Empty;\r
+ string srtOffset = String.Empty;\r
+ string srtLang = String.Empty;\r
+ string srtDefault = String.Empty;\r
+ int srtCount = 0;\r
+\r
+ foreach (SubtitleInfo item in subList)\r
+ {\r
+ string itemToAdd, trackId;\r
+\r
+ if (item.IsSrtSubtitle) // We have an SRT file\r
+ {\r
+ srtCount++; // SRT track id.\r
+\r
+ srtLang += srtLang == "" ? langMap[item.SrtLang] : "," + langMap[item.SrtLang];\r
+ srtCodeset += srtCodeset == "" ? item.SrtCharCode : "," + item.SrtCharCode;\r
+\r
+ if (item.Default == "Yes")\r
+ srtDefault = srtCount.ToString();\r
+\r
+ itemToAdd = item.SrtPath;\r
+ srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+ itemToAdd = item.SrtOffset.ToString();\r
+ srtOffset += srtOffset == "" ? itemToAdd : "," + itemToAdd;\r
+ }\r
+ else // We have Bitmap or CC\r
+ {\r
+ string[] tempSub;\r
+\r
+ // Find --subtitle <string>\r
+ if (item.Track.Contains("Foreign Audio Search"))\r
+ itemToAdd = "scan";\r
+ else\r
+ {\r
+ tempSub = item.Track.Split(' ');\r
+ itemToAdd = tempSub[0];\r
+ }\r
+\r
+ subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+ // Find --subtitle-forced\r
+ itemToAdd = "";\r
+ tempSub = item.Track.Split(' ');\r
+ trackId = tempSub[0];\r
+\r
+ if (item.Forced == "Yes")\r
+ itemToAdd = "scan";\r
+\r
+ if (itemToAdd != "")\r
+ subtitleForced += subtitleForced == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+ // Find --subtitle-burn and --subtitle-default\r
+ trackId = tempSub[0];\r
+\r
+ if (trackId.Trim() == "Foreign") // foreign audio search\r
+ trackId = "scan";\r
+\r
+ if (item.Burned == "Yes") // burn\r
+ subtitleBurn = trackId;\r
+\r
+ if (item.Default == "Yes") // default\r
+ subtitleDefault = trackId;\r
+ }\r
+ }\r
+\r
+ // Build The CLI Subtitles Query\r
+ if (subtitleTracks != "")\r
+ {\r
+ query += " --subtitle " + subtitleTracks;\r
+\r
+ if (subtitleForced != "")\r
+ query += " --subtitle-forced=" + subtitleForced;\r
+ if (subtitleBurn != "")\r
+ query += " --subtitle-burn=" + subtitleBurn;\r
+ if (subtitleDefault != "")\r
+ query += " --subtitle-default=" + subtitleDefault;\r
+ }\r
+\r
+ if (srtFile != "") // SRTs\r
+ {\r
+ query += " --srt-file " + "\"" + srtFile + "\"";\r
+\r
+ if (srtCodeset != "")\r
+ query += " --srt-codeset " + srtCodeset;\r
+ if (srtOffset != "")\r
+ query += " --srt-offset " + srtOffset;\r
+ if (srtLang != "")\r
+ query += " --srt-lang " + srtLang;\r
+ if (srtDefault != "")\r
+ query += " --srt-default=" + srtDefault;\r
+ }\r
+\r
+ }\r
+ return query;\r
+ }\r
}\r
}\r
}
\ No newline at end of file
/// </summary>\r
public string X264Query\r
{\r
- get { return rtf_x264Query.Text; }\r
+ get { return " -x " + rtf_x264Query.Text; }\r
set { rtf_x264Query.Text = value; }\r
}\r
\r
/// <param name="duration">time in seconds for preview mode</param>\r
/// <param name="preview"> --start-at-preview (int) </param>\r
/// <returns>CLI Query </returns>\r
- public static string GenerateCLIQuery(frmMain mainWindow, int mode, int duration, string preview)\r
+ public static string GenerateCliQuery(frmMain mainWindow, int mode, int duration, string preview)\r
{\r
string query = "";\r
\r
\r
switch (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex)\r
{\r
+ case 0:\r
+ if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+ query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
+ break;\r
case 1:\r
query += " --strict-anamorphic ";\r
break;\r
case 2:\r
query += " --loose-anamorphic ";\r
+ if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+ query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
break;\r
case 3:\r
query += " --custom-anamorphic ";\r
}\r
#endregion\r
\r
- #region Filters\r
- query += mainWindow.Filters.GetCLIQuery;\r
- #endregion\r
+ // Filters Panel\r
+ query += mainWindow.Filters.GetCliQuery;\r
\r
#region Video Settings Tab\r
\r
\r
#endregion\r
\r
- #region Subtitles Tab\r
- if (mainWindow.Subtitles.lv_subList.Items.Count != 0) // If we have subtitle tracks\r
- {\r
- IDictionary<string, string> langMap = Main.MapLanguages();\r
-\r
- // BitMap and CC's\r
- string subtitleTracks = String.Empty;\r
- string subtitleForced = String.Empty;\r
- string subtitleBurn = String.Empty;\r
- string subtitleDefault = String.Empty;\r
-\r
- // SRT\r
- string srtFile = String.Empty;\r
- string srtCodeset = String.Empty;\r
- string srtOffset = String.Empty;\r
- string srtLang = String.Empty;\r
- string srtDefault = String.Empty;\r
- int srtCount = 0;\r
-\r
- List<SubtitleInfo> SubList = mainWindow.Subtitles.GetSubtitleInfoList();\r
-\r
- foreach (var item in SubList)\r
- {\r
- string itemToAdd, trackID;\r
-\r
- if (item.SrtPath != "-") // We have an SRT file\r
- {\r
- srtCount++; // SRT track id.\r
-\r
- srtLang += srtLang == "" ? langMap[item.SrtLang] : "," + langMap[item.SrtLang];\r
- srtCodeset += srtCodeset == "" ? item.SrtCharCode : "," + item.SrtCharCode;\r
-\r
- if (item.Default == "Yes") // default\r
- srtDefault = srtCount.ToString();\r
-\r
- itemToAdd = item.SrtPath;\r
- srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
-\r
- itemToAdd = item.SrtOffset.ToString();\r
- srtOffset += srtOffset == "" ? itemToAdd : "," + itemToAdd;\r
- }\r
- else // We have Bitmap or CC\r
- {\r
- string[] tempSub;\r
-\r
- // Find --subtitle <string>\r
- if (item.Track.Contains("Foreign Audio Search"))\r
- itemToAdd = "scan";\r
- else\r
- {\r
- tempSub = item.Track.Split(' ');\r
- itemToAdd = tempSub[0];\r
- }\r
-\r
- subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
-\r
- // Find --subtitle-forced\r
- itemToAdd = "";\r
- tempSub = item.Track.Split(' ');\r
- trackID = tempSub[0];\r
-\r
- if (item.Forced == "Yes")\r
- itemToAdd = "scan";\r
-\r
- if (itemToAdd != "")\r
- subtitleForced += subtitleForced == "" ? itemToAdd : "," + itemToAdd;\r
-\r
- // Find --subtitle-burn and --subtitle-default\r
- trackID = tempSub[0];\r
-\r
- if (trackID.Trim() == "Foreign")\r
- trackID = "scan";\r
-\r
- if (item.Burned == "Yes") // burn\r
- subtitleBurn = trackID;\r
-\r
- if (item.Default == "Yes") // default\r
- subtitleDefault = trackID;\r
- }\r
- }\r
-\r
- // Build The CLI Subtitles Query\r
- if (subtitleTracks != "")\r
- {\r
- query += " --subtitle " + subtitleTracks;\r
-\r
- if (subtitleForced != "")\r
- query += " --subtitle-forced=" + subtitleForced;\r
- if (subtitleBurn != "")\r
- query += " --subtitle-burn=" + subtitleBurn;\r
- if (subtitleDefault != "")\r
- query += " --subtitle-default=" + subtitleDefault;\r
- }\r
-\r
- if (srtFile != "") // SRTs\r
- {\r
- query += " --srt-file " + "\"" + srtFile + "\"";\r
-\r
- if (srtCodeset != "")\r
- query += " --srt-codeset " + srtCodeset;\r
- if (srtOffset != "")\r
- query += " --srt-offset " + srtOffset;\r
- if (srtLang != "")\r
- query += " --srt-lang " + srtLang;\r
- if (srtDefault != "")\r
- query += " --srt-default=" + srtDefault;\r
- }\r
-\r
- }\r
- #endregion\r
+ // Subtitles Panel\r
+ query += mainWindow.Subtitles.GetCliQuery;\r
\r
#region Chapter Markers\r
\r
dest_name = dest_name.Replace("\"", "");\r
dest_name = dest_name.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "");\r
\r
- string source_title = mainWindow.drp_dvdtitle.Text;\r
- string[] titlesplit = source_title.Split(' ');\r
- source_title = titlesplit[0];\r
+ string sourceTitle = mainWindow.drp_dvdtitle.Text;\r
+ string[] titlesplit = sourceTitle.Split(' ');\r
+ sourceTitle = titlesplit[0];\r
\r
if (mainWindow.Check_ChapterMarkers.Checked && mainWindow.Check_ChapterMarkers.Enabled)\r
{\r
if (dest_name.Trim() != String.Empty)\r
{\r
- string path = source_title != "Automatic"\r
- ? Path.Combine(Path.GetTempPath(), dest_name + "-" + source_title + "-chapters.csv")\r
+ string path = sourceTitle != "Automatic"\r
+ ? Path.Combine(Path.GetTempPath(), dest_name + "-" + sourceTitle + "-chapters.csv")\r
: Path.Combine(Path.GetTempPath(), dest_name + "-chapters.csv");\r
\r
if (ChapterCSVSave(mainWindow, path) == false)\r
}\r
#endregion\r
\r
- #region H264 Tab\r
- if (mainWindow.x264Panel.X264Query != "")\r
- query += " -x " + mainWindow.x264Panel.X264Query;\r
- #endregion\r
+ // X264 Panel\r
+ query += " -x " + mainWindow.x264Panel.X264Query;\r
\r
#region Processors / Other\r
string processors = Properties.Settings.Default.Processors;\r
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">\r
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">\r
<PropertyGroup>\r
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
</FileUpgradeFlags>\r
<UpgradeBackupLocation>\r
</UpgradeBackupLocation>\r
- <OldToolsVersion>2.0</OldToolsVersion>\r
+ <OldToolsVersion>3.5</OldToolsVersion>\r
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
<IsWebBootstrapper>false</IsWebBootstrapper>\r
<SignManifests>false</SignManifests>\r
- <TargetFrameworkSubset>\r
- </TargetFrameworkSubset>\r
<PublishUrl>publish\</PublishUrl>\r
<Install>true</Install>\r
<InstallFrom>Disk</InstallFrom>\r
<DocumentationFile>\r
</DocumentationFile>\r
<PlatformTarget>x86</PlatformTarget>\r
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
<DebugType>full</DebugType>\r
<DebugSymbols>true</DebugSymbols>\r
<FileAlignment>512</FileAlignment>\r
<PlatformTarget>x86</PlatformTarget>\r
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
<PlatformTarget>x86</PlatformTarget>\r
<OutputPath>bin\x86\Debug\</OutputPath>\r
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
<PlatformTarget>x86</PlatformTarget>\r
<UseVSHostingProcess>false</UseVSHostingProcess>\r
<DefineConstants>TRACE;DEBUG</DefineConstants>\r
<Optimize>true</Optimize>\r
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">\r
<OutputPath>bin\Build\</OutputPath>\r
<DebugType>pdbonly</DebugType>\r
<PlatformTarget>x86</PlatformTarget>\r
<ErrorReport>prompt</ErrorReport>\r
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|x86' ">\r
<OutputPath>bin\x86\Build\</OutputPath>\r
<PlatformTarget>x86</PlatformTarget>\r
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>\r
</PropertyGroup>\r
<ItemGroup>\r
<Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">\r
\r
-Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual Studio 2008\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual Studio 2010\r
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}"\r
EndProject\r
Global\r
public string SrtFileName { get; set; }\r
\r
/// <summary>\r
+ /// Returns if this is an SRT subtitle.\r
+ /// </summary>\r
+ public bool IsSrtSubtitle\r
+ {\r
+ get\r
+ {\r
+ return SrtFileName != "-";\r
+ }\r
+ }\r
+\r
+ /// <summary>\r
/// A ListViewItem Containing information about this subitlte\r
/// </summary>\r
public ListViewItem ListView\r
//------------------------------------------------------------------------------\r
// <auto-generated>\r
// This code was generated by a tool.\r
-// Runtime Version:2.0.50727.1433\r
+// Runtime Version:4.0.30128.1\r
//\r
// Changes to this file may cause incorrect behavior and will be lost if\r
// the code is regenerated.\r
// class via a tool like ResGen or Visual Studio.\r
// To add or remove a member, edit your .ResX file then rerun ResGen\r
// with the /str option, or rebuild your VS project.\r
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]\r
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
internal class Resources {\r
//------------------------------------------------------------------------------\r
// <auto-generated>\r
// This code was generated by a tool.\r
-// Runtime Version:2.0.50727.4927\r
+// Runtime Version:4.0.30128.1\r
//\r
// Changes to this file may cause incorrect behavior and will be lost if\r
// the code is regenerated.\r
\r
\r
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]\r
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]\r
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {\r
\r
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));\r
<?xml version="1.0"?>\r
<configuration>\r
- <configSections>\r
- <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
- <section name="Handbrake.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>\r
- </sectionGroup>\r
- </configSections>\r
- <userSettings>\r
- <Handbrake.Properties.Settings>\r
- <setting name="processPriority" serializeAs="String">\r
- <value>Below Normal</value>\r
- </setting>\r
- <setting name="Processors" serializeAs="String">\r
- <value>Automatic</value>\r
- </setting>\r
- <setting name="updateStatus" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="hb_version" serializeAs="String">\r
- <value>{hb_version}</value>\r
- </setting>\r
- <setting name="tooltipEnable" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="CompletionOption" serializeAs="String">\r
- <value>Do Nothing</value>\r
- </setting>\r
- <setting name="defaultPreset" serializeAs="String">\r
- <value />\r
- </setting>\r
- <setting name="hb_build" serializeAs="String">\r
- <value>0</value>\r
- </setting>\r
- <setting name="skipversion" serializeAs="String">\r
- <value>0</value>\r
- </setting>\r
- <setting name="autoNaming" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="autoNamePath" serializeAs="String">\r
- <value />\r
- </setting>\r
- <setting name="appcast" serializeAs="String">\r
- <value>http://handbrake.fr/appcast.xml</value>\r
- </setting>\r
- <setting name="appcast_unstable" serializeAs="String">\r
- <value>http://handbrake.fr/appcast_unstable.xml</value>\r
- </setting>\r
- <setting name="cli_minimized" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="autoNameFormat" serializeAs="String">\r
- <value>{source}-{title}</value>\r
- </setting>\r
- <setting name="saveLogToSpecifiedPath" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="saveLogPath" serializeAs="String">\r
- <value />\r
- </setting>\r
- <setting name="saveLogWithVideo" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="VLC_Path" serializeAs="String">\r
- <value>C:\Program Files\VideoLAN\vlc\vlc.exe</value>\r
- </setting>\r
- <setting name="MainWindowMinimize" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="QueryEditorTab" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="x264cqstep" serializeAs="String">\r
- <value>0.25</value>\r
- </setting>\r
- <setting name="verboseLevel" serializeAs="String">\r
- <value>1</value>\r
- </setting>\r
- <setting name="noDvdNav" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="presetNotification" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="enocdeStatusInGui" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="trayIconAlerts" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="lastUpdateCheckDate" serializeAs="String">\r
- <value />\r
- </setting>\r
- <setting name="daysBetweenUpdateCheck" serializeAs="String">\r
- <value>7</value>\r
- </setting>\r
- <setting name="useM4v" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="PromptOnUnmatchingQueries" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- <setting name="NativeLanguage" serializeAs="String">\r
- <value>Any</value>\r
- </setting>\r
- <setting name="DubAudio" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="hb_platform" serializeAs="String">\r
- <value />\r
- </setting>\r
- <setting name="disableResCalc" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="growlQueue" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="growlEncode" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="cliLastModified" serializeAs="String">\r
- <value />\r
- </setting>\r
- <setting name="previewScanCount" serializeAs="String">\r
- <value>10</value>\r
- </setting>\r
- <setting name="clearOldLogs" serializeAs="String">\r
- <value>False</value>\r
- </setting>\r
- <setting name="showCliForInGuiEncodeStatus" serializeAs="String">\r
- <value>True</value>\r
- </setting>\r
- </Handbrake.Properties.Settings>\r
- </userSettings>\r
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>\r
+ <configSections>\r
+ <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+ <section name="Handbrake.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>\r
+ </sectionGroup>\r
+ </configSections>\r
+ <userSettings>\r
+ <Handbrake.Properties.Settings>\r
+ <setting name="processPriority" serializeAs="String">\r
+ <value>Below Normal</value>\r
+ </setting>\r
+ <setting name="Processors" serializeAs="String">\r
+ <value>Automatic</value>\r
+ </setting>\r
+ <setting name="updateStatus" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="hb_version" serializeAs="String">\r
+ <value>{hb_version}</value>\r
+ </setting>\r
+ <setting name="tooltipEnable" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="CompletionOption" serializeAs="String">\r
+ <value>Do Nothing</value>\r
+ </setting>\r
+ <setting name="defaultPreset" serializeAs="String">\r
+ <value/>\r
+ </setting>\r
+ <setting name="hb_build" serializeAs="String">\r
+ <value>0</value>\r
+ </setting>\r
+ <setting name="skipversion" serializeAs="String">\r
+ <value>0</value>\r
+ </setting>\r
+ <setting name="autoNaming" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="autoNamePath" serializeAs="String">\r
+ <value/>\r
+ </setting>\r
+ <setting name="appcast" serializeAs="String">\r
+ <value>http://handbrake.fr/appcast.xml</value>\r
+ </setting>\r
+ <setting name="appcast_unstable" serializeAs="String">\r
+ <value>http://handbrake.fr/appcast_unstable.xml</value>\r
+ </setting>\r
+ <setting name="cli_minimized" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="autoNameFormat" serializeAs="String">\r
+ <value>{source}-{title}</value>\r
+ </setting>\r
+ <setting name="saveLogToSpecifiedPath" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="saveLogPath" serializeAs="String">\r
+ <value/>\r
+ </setting>\r
+ <setting name="saveLogWithVideo" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="VLC_Path" serializeAs="String">\r
+ <value>C:\Program Files\VideoLAN\vlc\vlc.exe</value>\r
+ </setting>\r
+ <setting name="MainWindowMinimize" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="QueryEditorTab" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="x264cqstep" serializeAs="String">\r
+ <value>0.25</value>\r
+ </setting>\r
+ <setting name="verboseLevel" serializeAs="String">\r
+ <value>1</value>\r
+ </setting>\r
+ <setting name="noDvdNav" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="presetNotification" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="enocdeStatusInGui" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="trayIconAlerts" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="lastUpdateCheckDate" serializeAs="String">\r
+ <value/>\r
+ </setting>\r
+ <setting name="daysBetweenUpdateCheck" serializeAs="String">\r
+ <value>7</value>\r
+ </setting>\r
+ <setting name="useM4v" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="PromptOnUnmatchingQueries" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ <setting name="NativeLanguage" serializeAs="String">\r
+ <value>Any</value>\r
+ </setting>\r
+ <setting name="DubAudio" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="hb_platform" serializeAs="String">\r
+ <value/>\r
+ </setting>\r
+ <setting name="disableResCalc" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="growlQueue" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="growlEncode" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="cliLastModified" serializeAs="String">\r
+ <value/>\r
+ </setting>\r
+ <setting name="previewScanCount" serializeAs="String">\r
+ <value>10</value>\r
+ </setting>\r
+ <setting name="clearOldLogs" serializeAs="String">\r
+ <value>False</value>\r
+ </setting>\r
+ <setting name="showCliForInGuiEncodeStatus" serializeAs="String">\r
+ <value>True</value>\r
+ </setting>\r
+ </Handbrake.Properties.Settings>\r
+ </userSettings>\r
+ <startup/></configuration>\r
this.check_turbo.Enabled = false;\r
this.check_turbo.Location = new System.Drawing.Point(146, 123);\r
this.check_turbo.Name = "check_turbo";\r
- this.check_turbo.Size = new System.Drawing.Size(101, 17);\r
+ this.check_turbo.Size = new System.Drawing.Size(99, 17);\r
this.check_turbo.TabIndex = 7;\r
this.check_turbo.Text = "Turbo first Pass";\r
this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
this.radio_cq.BackColor = System.Drawing.Color.Transparent;\r
this.radio_cq.Location = new System.Drawing.Point(336, 97);\r
this.radio_cq.Name = "radio_cq";\r
- this.radio_cq.Size = new System.Drawing.Size(110, 17);\r
+ this.radio_cq.Size = new System.Drawing.Size(105, 17);\r
this.radio_cq.TabIndex = 18;\r
this.radio_cq.Text = "Constant Quality:";\r
this.radio_cq.UseVisualStyleBackColor = false;\r
this.radio_avgBitrate.Checked = true;\r
this.radio_avgBitrate.Location = new System.Drawing.Point(336, 64);\r
this.radio_avgBitrate.Name = "radio_avgBitrate";\r
- this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);\r
+ this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);\r
this.radio_avgBitrate.TabIndex = 17;\r
this.radio_avgBitrate.TabStop = true;\r
this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";\r
this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent;\r
this.radio_targetFilesize.Location = new System.Drawing.Point(336, 37);\r
this.radio_targetFilesize.Name = "radio_targetFilesize";\r
- this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);\r
+ this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17);\r
this.radio_targetFilesize.TabIndex = 16;\r
this.radio_targetFilesize.Text = "Target Size (MB):";\r
this.radio_targetFilesize.UseVisualStyleBackColor = false;\r
this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;\r
this.check_2PassEncode.Location = new System.Drawing.Point(125, 100);\r
this.check_2PassEncode.Name = "check_2PassEncode";\r
- this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);\r
+ this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);\r
this.check_2PassEncode.TabIndex = 6;\r
this.check_2PassEncode.Text = "2-Pass Encoding";\r
this.check_2PassEncode.UseVisualStyleBackColor = false;\r
this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
this.PictureSettings.Name = "PictureSettings";\r
+ this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);\r
this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
this.PictureSettings.TabIndex = 0;\r
// \r
this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;\r
this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);\r
this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
- this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);\r
+ this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);\r
this.Check_ChapterMarkers.TabIndex = 1;\r
this.Check_ChapterMarkers.Text = "Create chapter markers";\r
this.Check_ChapterMarkers.UseVisualStyleBackColor = false;\r
this.treeView_presets.ShowLines = false;\r
this.treeView_presets.Size = new System.Drawing.Size(240, 424);\r
this.treeView_presets.TabIndex = 0;\r
- this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);\r
this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);\r
+ this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);\r
// \r
// presets_menu\r
// \r
}\r
private void btn_new_preset_Click(object sender, EventArgs e)\r
{\r
- Form preset = new frmAddPreset(this, QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null), presetHandler);\r
+ Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), presetHandler);\r
preset.ShowDialog();\r
}\r
#endregion\r
if (result == DialogResult.Yes)\r
{\r
PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
- presetHandler.Update(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null),\r
+ presetHandler.Update(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null),\r
parsed.UsesPictureSettings);\r
}\r
}\r
else\r
{\r
PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
- presetHandler.Add(parsed.PresetName, QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings);\r
+ presetHandler.Add(parsed.PresetName, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings);\r
\r
- if (presetHandler.Add(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings))\r
+ if (presetHandler.Add(parsed.PresetName + " (Imported)", QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), parsed.UsesPictureSettings))\r
{\r
TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
treeView_presets.Nodes.Add(preset_treeview);\r
{\r
if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))\r
{\r
- string generatedQuery = QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
- string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
+ string generatedQuery = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
+ string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
string query = string.Empty;\r
\r
// Check to make sure the generated query matches the GUI settings\r
MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
else\r
{\r
- String query = QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
+ String query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
if (rtf_query.Text != "")\r
query = rtf_query.Text;\r
\r
// Query Editor Tab\r
private void btn_generate_Query_Click(object sender, EventArgs e)\r
{\r
- rtf_query.Text = QueryGenerator.GenerateCLIQuery(this, drop_mode.SelectedIndex, 0, null);\r
+ rtf_query.Text = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null);\r
}\r
private void btn_clear_Click(object sender, EventArgs e)\r
{\r
<resheader name="writer">\r
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</resheader>\r
- <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
- <value>17, 54</value>\r
- </metadata>\r
<metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
<value>False</value>\r
</metadata>\r
+ <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <value>17, 54</value>\r
+ </metadata>\r
<metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
<value>556, 15</value>\r
</metadata>\r
lbl_status.Text = "Encoding Sample for (VLC) ...";\r
int duration;\r
int.TryParse(cb_duration.Text, out duration);\r
- String query = QueryGenerator.GenerateCLIQuery(MainWindow, 3, duration, cb_preview.Text);\r
+ String query = QueryGenerator.GenerateCliQuery(MainWindow, 3, duration, cb_preview.Text);\r
ThreadPool.QueueUserWorkItem(ProcMonitor, query);\r
}\r
private void btn_playQT_Click(object sender, EventArgs e)\r
lbl_status.Text = "Encoding Sample for (QT) ...";\r
int duration;\r
int.TryParse(cb_duration.Text, out duration);\r
- String query = QueryGenerator.GenerateCLIQuery(MainWindow, 3, duration, cb_preview.Text);\r
+ String query = QueryGenerator.GenerateCliQuery(MainWindow, 3, duration, cb_preview.Text);\r
\r
ThreadPool.QueueUserWorkItem(ProcMonitor, query);\r
}\r
OSDN Git Service
