Index: Controls/AudioPanel.Designer.cs =================================================================== --- Controls/AudioPanel.Designer.cs (revision 2684) +++ Controls/AudioPanel.Designer.cs (working copy) @@ -137,19 +137,19 @@ this.toolStripSeparator2, this.audioList_remove}); this.audioMenu.Name = "audioMenu"; - this.audioMenu.Size = new System.Drawing.Size(142, 76); + this.audioMenu.Size = new System.Drawing.Size(139, 76); // // audioList_moveup // this.audioList_moveup.Name = "audioList_moveup"; - this.audioList_moveup.Size = new System.Drawing.Size(141, 22); + this.audioList_moveup.Size = new System.Drawing.Size(138, 22); this.audioList_moveup.Text = "Move Up"; this.audioList_moveup.Click += new System.EventHandler(this.audioList_moveup_Click); // // audioList_movedown // this.audioList_movedown.Name = "audioList_movedown"; - this.audioList_movedown.Size = new System.Drawing.Size(141, 22); + this.audioList_movedown.Size = new System.Drawing.Size(138, 22); this.audioList_movedown.Text = "Move Down"; this.audioList_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.audioList_movedown.Click += new System.EventHandler(this.audioList_movedown_Click); @@ -157,12 +157,12 @@ // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(135, 6); // // audioList_remove // this.audioList_remove.Name = "audioList_remove"; - this.audioList_remove.Size = new System.Drawing.Size(141, 22); + this.audioList_remove.Size = new System.Drawing.Size(138, 22); this.audioList_remove.Text = "Remove"; this.audioList_remove.Click += new System.EventHandler(this.audioList_remove_Click); // @@ -277,6 +277,7 @@ // // drp_audenc_1 // + this.drp_audenc_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_audenc_1.FormattingEnabled = true; this.drp_audenc_1.Items.AddRange(new object[] { "AAC (faac)", @@ -287,7 +288,6 @@ this.drp_audenc_1.Name = "drp_audenc_1"; this.drp_audenc_1.Size = new System.Drawing.Size(111, 21); this.drp_audenc_1.TabIndex = 52; - this.drp_audenc_1.Text = "AAC (faac)"; this.drp_audenc_1.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_1_SelectedIndexChanged); // // label27 @@ -302,6 +302,7 @@ // // drp_audmix_1 // + this.drp_audmix_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_audmix_1.FormattingEnabled = true; this.drp_audmix_1.Items.AddRange(new object[] { "Automatic", @@ -314,11 +315,11 @@ this.drp_audmix_1.Name = "drp_audmix_1"; this.drp_audmix_1.Size = new System.Drawing.Size(129, 21); this.drp_audmix_1.TabIndex = 54; - this.drp_audmix_1.Text = "Automatic"; this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_1_SelectedIndexChanged); // // drp_track1Audio // + this.drp_track1Audio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_track1Audio.FormattingEnabled = true; this.drp_track1Audio.Items.AddRange(new object[] { "Automatic"}); @@ -326,11 +327,11 @@ this.drp_track1Audio.Name = "drp_track1Audio"; this.drp_track1Audio.Size = new System.Drawing.Size(194, 21); this.drp_track1Audio.TabIndex = 50; - this.drp_track1Audio.Text = "Automatic"; this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged); // // drp_audbit_1 // + this.drp_audbit_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_audbit_1.FormattingEnabled = true; this.drp_audbit_1.Items.AddRange(new object[] { "32", @@ -347,11 +348,11 @@ this.drp_audbit_1.Name = "drp_audbit_1"; this.drp_audbit_1.Size = new System.Drawing.Size(70, 21); this.drp_audbit_1.TabIndex = 58; - this.drp_audbit_1.Text = "160"; this.drp_audbit_1.SelectedIndexChanged += new System.EventHandler(this.drp_audbit_1_SelectedIndexChanged); // // drp_audsr_1 // + this.drp_audsr_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_audsr_1.FormattingEnabled = true; this.drp_audsr_1.Items.AddRange(new object[] { "Auto", @@ -364,7 +365,6 @@ this.drp_audsr_1.Name = "drp_audsr_1"; this.drp_audsr_1.Size = new System.Drawing.Size(55, 21); this.drp_audsr_1.TabIndex = 56; - this.drp_audsr_1.Text = "Auto"; this.drp_audsr_1.SelectedIndexChanged += new System.EventHandler(this.drp_audsr_1_SelectedIndexChanged); // // AudioTrackGroup Index: Controls/Filters.Designer.cs =================================================================== --- Controls/Filters.Designer.cs (revision 2684) +++ Controls/Filters.Designer.cs (working copy) @@ -45,12 +45,14 @@ this.label8 = new System.Windows.Forms.Label(); this.lbl_deblockVal = new System.Windows.Forms.Label(); this.label68 = new System.Windows.Forms.Label(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // text_customDT // - this.text_customDT.Location = new System.Drawing.Point(288, 32); + this.text_customDT.Location = new System.Drawing.Point(251, 3); this.text_customDT.Name = "text_customDT"; this.text_customDT.Size = new System.Drawing.Size(115, 21); this.text_customDT.TabIndex = 47; @@ -58,9 +60,11 @@ // // label18 // + this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label18.AutoSize = true; this.label18.BackColor = System.Drawing.Color.Transparent; - this.label18.Location = new System.Drawing.Point(13, 35); + this.label18.Location = new System.Drawing.Point(0, 7); + this.label18.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(61, 13); this.label18.TabIndex = 46; @@ -74,7 +78,7 @@ "Off", "Default", "Custom"}); - this.drop_detelecine.Location = new System.Drawing.Point(121, 32); + this.drop_detelecine.Location = new System.Drawing.Point(71, 3); this.drop_detelecine.Name = "drop_detelecine"; this.drop_detelecine.Size = new System.Drawing.Size(161, 21); this.drop_detelecine.TabIndex = 45; @@ -82,7 +86,7 @@ // // text_customDC // - this.text_customDC.Location = new System.Drawing.Point(288, 59); + this.text_customDC.Location = new System.Drawing.Point(251, 30); this.text_customDC.Name = "text_customDC"; this.text_customDC.Size = new System.Drawing.Size(115, 21); this.text_customDC.TabIndex = 50; @@ -90,9 +94,11 @@ // // label1 // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Location = new System.Drawing.Point(13, 62); + this.label1.Location = new System.Drawing.Point(0, 34); + this.label1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(49, 13); this.label1.TabIndex = 49; @@ -106,7 +112,7 @@ "Off", "Default", "Custom"}); - this.drop_decomb.Location = new System.Drawing.Point(121, 59); + this.drop_decomb.Location = new System.Drawing.Point(71, 30); this.drop_decomb.Name = "drop_decomb"; this.drop_decomb.Size = new System.Drawing.Size(161, 21); this.drop_decomb.TabIndex = 48; @@ -114,7 +120,7 @@ // // text_customDI // - this.text_customDI.Location = new System.Drawing.Point(288, 86); + this.text_customDI.Location = new System.Drawing.Point(251, 57); this.text_customDI.Name = "text_customDI"; this.text_customDI.Size = new System.Drawing.Size(115, 21); this.text_customDI.TabIndex = 53; @@ -122,9 +128,11 @@ // // label2 // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Location = new System.Drawing.Point(13, 89); + this.label2.Location = new System.Drawing.Point(0, 61); + this.label2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 13); this.label2.TabIndex = 52; @@ -140,7 +148,7 @@ "Slow", "Slower", "Custom"}); - this.drop_deinterlace.Location = new System.Drawing.Point(121, 86); + this.drop_deinterlace.Location = new System.Drawing.Point(71, 57); this.drop_deinterlace.Name = "drop_deinterlace"; this.drop_deinterlace.Size = new System.Drawing.Size(161, 21); this.drop_deinterlace.TabIndex = 51; @@ -148,7 +156,7 @@ // // text_customDN // - this.text_customDN.Location = new System.Drawing.Point(288, 113); + this.text_customDN.Location = new System.Drawing.Point(251, 84); this.text_customDN.Name = "text_customDN"; this.text_customDN.Size = new System.Drawing.Size(115, 21); this.text_customDN.TabIndex = 56; @@ -156,9 +164,11 @@ // // label3 // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Location = new System.Drawing.Point(13, 116); + this.label3.Location = new System.Drawing.Point(0, 88); + this.label3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(49, 13); this.label3.TabIndex = 55; @@ -174,7 +184,7 @@ "Medium", "Strong", "Custom"}); - this.drop_denoise.Location = new System.Drawing.Point(121, 113); + this.drop_denoise.Location = new System.Drawing.Point(71, 84); this.drop_denoise.Name = "drop_denoise"; this.drop_denoise.Size = new System.Drawing.Size(161, 21); this.drop_denoise.TabIndex = 54; @@ -182,7 +192,7 @@ // // slider_deblock // - this.slider_deblock.Location = new System.Drawing.Point(121, 140); + this.slider_deblock.Location = new System.Drawing.Point(71, 111); this.slider_deblock.Maximum = 15; this.slider_deblock.Minimum = 4; this.slider_deblock.Name = "slider_deblock"; @@ -195,7 +205,7 @@ // this.check_grayscale.AutoSize = true; this.check_grayscale.BackColor = System.Drawing.Color.Transparent; - this.check_grayscale.Location = new System.Drawing.Point(121, 191); + this.check_grayscale.Location = new System.Drawing.Point(71, 162); this.check_grayscale.Name = "check_grayscale"; this.check_grayscale.Size = new System.Drawing.Size(119, 17); this.check_grayscale.TabIndex = 57; @@ -206,7 +216,8 @@ // this.label8.AutoSize = true; this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Location = new System.Drawing.Point(13, 147); + this.label8.Location = new System.Drawing.Point(0, 115); + this.label8.Margin = new System.Windows.Forms.Padding(0, 7, 3, 3); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(48, 13); this.label8.TabIndex = 60; @@ -216,7 +227,8 @@ // this.lbl_deblockVal.AutoSize = true; this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent; - this.lbl_deblockVal.Location = new System.Drawing.Point(301, 147); + this.lbl_deblockVal.Location = new System.Drawing.Point(251, 115); + this.lbl_deblockVal.Margin = new System.Windows.Forms.Padding(3, 7, 3, 3); this.lbl_deblockVal.Name = "lbl_deblockVal"; this.lbl_deblockVal.Size = new System.Drawing.Size(23, 13); this.lbl_deblockVal.TabIndex = 59; @@ -233,31 +245,53 @@ this.label68.TabIndex = 61; this.label68.Text = "Filters"; // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.AutoSize = true; + this.tableLayoutPanel1.ColumnCount = 3; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.label18, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label1, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.lbl_deblockVal, 2, 4); + this.tableLayoutPanel1.Controls.Add(this.check_grayscale, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.text_customDN, 2, 3); + this.tableLayoutPanel1.Controls.Add(this.slider_deblock, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.text_customDI, 2, 2); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.text_customDC, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.label3, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.text_customDT, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label8, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.drop_detelecine, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.drop_denoise, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.drop_decomb, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.drop_deinterlace, 1, 2); + this.tableLayoutPanel1.Location = new System.Drawing.Point(19, 29); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 6; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(369, 182); + this.tableLayoutPanel1.TabIndex = 62; + // // Filters // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.Transparent; + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.label68); - this.Controls.Add(this.slider_deblock); - this.Controls.Add(this.check_grayscale); - this.Controls.Add(this.label8); - this.Controls.Add(this.lbl_deblockVal); - this.Controls.Add(this.text_customDN); - this.Controls.Add(this.label3); - this.Controls.Add(this.drop_denoise); - this.Controls.Add(this.text_customDI); - this.Controls.Add(this.label2); - this.Controls.Add(this.drop_deinterlace); - this.Controls.Add(this.text_customDC); - this.Controls.Add(this.label1); - this.Controls.Add(this.drop_decomb); - this.Controls.Add(this.text_customDT); - this.Controls.Add(this.label18); - this.Controls.Add(this.drop_detelecine); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "Filters"; this.Size = new System.Drawing.Size(592, 270); ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -282,5 +316,6 @@ internal System.Windows.Forms.Label label8; internal System.Windows.Forms.Label lbl_deblockVal; internal System.Windows.Forms.Label label68; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } Index: Controls/PictureSettings.cs =================================================================== --- Controls/PictureSettings.cs (revision 2684) +++ Controls/PictureSettings.cs (working copy) @@ -11,8 +11,9 @@ private bool _preventChangingWidth, _preventChangingHeight; private int _maxWidth, _maxHeight, _lastEncodeWidth, _lastEncodeHeight; private double _anamorphicRatio, _displayRatio; + private Size _maxEncodeResolution; private Title _title; - private double storageAspect; + public event EventHandler PictureSettingsChanged; public PictureSettings() @@ -38,8 +39,7 @@ Enabled = _title != null; - MaximumWidth = _title.Resolution.Width; - MaximumHeight = _title.Resolution.Height; + MaximumEncodeResolution = _title.Resolution; updownParWidth.Value = _title.ParVal.Width; updownParHeight.Value = _title.ParVal.Height; @@ -67,14 +67,24 @@ } /// - /// Gets or sets the resolution of the displayed video. + /// Gets or sets the storage width. /// - public Size DisplayResolution { get; set; } - + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public int EncodeWidth { get { return (int)text_width.Value; } set { text_width.Value = value; } } + /// + /// Gets or sets the storage height; + /// + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public int EncodeHeight { get { return (int)text_height.Value; } set { text_height.Value = value; } } + /// + /// Gets or sets crop parameters. The order of values is top, bottom, left, right. + /// + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public int[] CroppingValues { get @@ -101,7 +111,7 @@ } } - /// + /*/// /// Gets or sets the maximum allowable width of the encoded video. /// public int MaximumWidth @@ -110,6 +120,7 @@ set { _maxWidth = value > 0 ? value : (Source != null ? Source.Resolution.Width : 2560); + text_width.Value = text_width.Value > _maxWidth ? _maxWidth : (Source != null ? Source.Resolution.Width : text_width.Value); } } @@ -122,9 +133,90 @@ set { _maxHeight = value > 0 ? value : (Source != null ? Source.Resolution.Height : 2560); + text_height.Value = text_height.Value > _maxHeight ? _maxHeight : (Source != null ? Source.Resolution.Height : text_height.Value); } - } + }*/ + /// + /// Gets or sets the maximum allowable size for the encoded resolution. Set a value to + /// "0" if the maximum does not matter. + /// + [Browsable(false)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + public Size MaximumEncodeResolution + { + get { return _maxEncodeResolution; } + set + { + if (Source != null) + { + // If the width is empty, then set it to the native width. + // Otherwise, if the maximum width is greater than the native width, + // then make the native width the maximum. Otherwise, make the maximum + // width the actual maximum. + // + // Same goes for height. + _maxEncodeResolution = new Size( + value.Width == 0 ? Source.Resolution.Width : (value.Width > Source.Resolution.Width ? Source.Resolution.Width : value.Width), + value.Height == 0 ? Source.Resolution.Height : (value.Height > Source.Resolution.Height ? Source.Resolution.Height : value.Height) + ); + } + else + { + // If no source is loaded, and the width is empty, just make it an + // arbitrary value of 2560. Otherwise, make the maximum the actual maximum. + _maxEncodeResolution = new Size( + value.Width == 0 ? 2560 : value.Width, + value.Height == 0 ? 2560 : value.Height + ); + } + + // Don't set anything if there's no source loaded + if (Source == null) + return; + + if (check_KeepAR.Checked) + { + // This will set the width and the height to keep + // aspect ratio + text_width.Value = _maxEncodeResolution.Width; + + // Check to make sure the height isn't too big after + // being accounted for aspect ratio + if (text_height.Value > MaximumEncodeResolution.Height) + { + // Set the height to the maximum, which will also + // keep the width at aspect ratio + text_height.Value = MaximumEncodeResolution.Height; + } + } + else + { + if (value.Width == 0 || value.Height == 0) + { + // Set the default values to aspect ratio-constained ones + check_KeepAR.Checked = true; + + if (value.Width == 0) + { + text_height.Value = MaximumEncodeResolution.Height; + } + else if (value.Height == 0) + { + text_width.Value = MaximumEncodeResolution.Width; + } + + check_KeepAR.Checked = false; + } + else + { + text_width.Value = MaximumEncodeResolution.Width; + text_height.Value = MaximumEncodeResolution.Height; + } + } + } + } + public void setMax() { @@ -135,7 +227,7 @@ /// private void UpdateAnamorphicValue() { - if (_title == null || _title.ParVal.IsEmpty) + if (_title == null || _title.ParVal.IsEmpty || drp_anamorphic.SelectedIndex == 0) return; // Set globally useful values @@ -148,7 +240,7 @@ int actualWidth = (int)text_width.Value - (int)crop_left.Value - (int)crop_right.Value; int source_display_width = Source.Resolution.Width * Source.ParVal.Width / Source.ParVal.Height; int source_cropped_height = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value; - par = ((double) text_height.Value*source_display_width/source_cropped_height)/actualWidth; + par = ((double)text_height.Value * source_display_width / source_cropped_height) / actualWidth; width = (actualWidth * par); width = Math.Truncate(width); break; @@ -193,17 +285,17 @@ } /// - /// Gets the normalized value from one given by the user that is divisible by the number - /// set in . + /// Gets the normalized value from one given by the user that is divisible by the value set + /// in . /// /// The value to normalize - /// A number that is divisible by . + /// A number that is divisible by the value in . /// /// The way that some video codecs, such as x264, compress video is by creating "macroblocks" /// that are seperated into defined squares, often 16x16 pixels. Because of this, if the width /// and height of the encoded video are not each divisible by the modulus defined, video quality /// will suffer. This method takes the supplied value and normalizes it to the nearest mutliple - /// of . + /// of the selected modulus. /// private int GetModulusValue(int value) { @@ -241,11 +333,14 @@ return; int actualWidth = (int)text_width.Value - (int)crop_left.Value - (int)crop_right.Value; - int source_cropped_height = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value; + int croppedSourceHeight = Source.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value; - if (storageAspect == 0) - storageAspect = (double)actualWidth / source_cropped_height; - double hcalc = (actualWidth / storageAspect) + 0.5; + if (_anamorphicRatio == 0) + { + _anamorphicRatio = (double)actualWidth / croppedSourceHeight; + } + + double hcalc = (actualWidth / _anamorphicRatio) + 0.5; double newHeight = GetModulusValue((int)hcalc); text_width.Value = GetModulusValue((int)text_width.Value); @@ -261,9 +356,14 @@ { // Make sure the PAR values are set correctly if (updownParWidth.Value == 0) + { updownParWidth.Value = Source.ParVal.Width; + } + if (updownParHeight.Value == 0) + { updownParHeight.Value = Source.ParVal.Height; + } // Set various values int parWidth = (int)updownParWidth.Value; @@ -306,40 +406,45 @@ } } - - private void text_width_ValueChanged(object sender, EventArgs e) { + // Don't run the handler if, for some reason, it shouldn't be run if (_preventChangingWidth) return; _preventChangingWidth = true; - if (text_width.Value > MaximumWidth) + // Make sure the new value doesn't exceed the maximum + if (text_width.Value > MaximumEncodeResolution.Width) { - text_width.Value = MaximumWidth; + text_width.Value = MaximumEncodeResolution.Width; } switch (drp_anamorphic.SelectedIndex) { - case 0: + case 0: // No anamorphosis + if (_anamorphicRatio == 0) + return; + + // Don't change the height if the user doesn't want the + // aspect ratio maintained if (check_KeepAR.Checked) { _preventChangingHeight = true; decimal newHeight = text_width.Value / (decimal)_anamorphicRatio; - text_height.Value = newHeight > MaximumHeight ? MaximumHeight : newHeight; + text_height.Value = newHeight > MaximumEncodeResolution.Height ? MaximumEncodeResolution.Height : newHeight; _preventChangingHeight = false; } break; - case 1: + case 1: // Strict anamorphosis ApplyStrictAnamorphic(); break; - case 2: + case 2: // Loose anamorphosis ApplyLooseAnamorphic(); break; - case 3: + case 3: // Custom anamorphosis ApplyCustomAnamorphic((Control)sender); break; } @@ -349,30 +454,32 @@ private void text_height_ValueChanged(object sender, EventArgs e) { + // Don't run this handler if, for some reason, it shouldn't be run if (_preventChangingHeight) return; _preventChangingHeight = true; - if (text_height.Value > MaximumHeight) + // Make sure the new height doesn't exceed the maximum + if (text_height.Value > MaximumEncodeResolution.Height) { - text_height.Value = MaximumHeight; + text_height.Value = MaximumEncodeResolution.Height; } switch (drp_anamorphic.SelectedIndex) { - case 0: + case 0: // No Anamorphosis if (check_KeepAR.Checked) { _preventChangingWidth = true; decimal newWidth = text_height.Value * (decimal)_anamorphicRatio; - text_width.Value = newWidth > MaximumWidth ? MaximumWidth : newWidth; + text_width.Value = newWidth > MaximumEncodeResolution.Width ? MaximumEncodeResolution.Width : newWidth; _preventChangingWidth = false; } break; - case 3: + case 3: // Custom Anamorphosis ApplyCustomAnamorphic((Control)sender); break; } @@ -394,7 +501,9 @@ labelDisplaySize.Visible = false; check_KeepAR.Checked = true; - break; + + // Don't update display size if we're not using anamorphic + return; case 1: text_width.Enabled = false; text_height.Enabled = false; @@ -431,22 +540,26 @@ } UpdateAnamorphicValue(); + + if (PictureSettingsChanged != null) + PictureSettingsChanged(this, new EventArgs()); } private void check_KeepAR_CheckedChanged(object sender, EventArgs e) { - if (drp_anamorphic.SelectedIndex != 3) + if (check_KeepAR.Checked) { - if (check_KeepAR.Checked) - { - text_width_ValueChanged(this, new EventArgs()); - } + text_width_ValueChanged(this, new EventArgs()); } - else + + if (drp_anamorphic.SelectedIndex == 3) { updownParWidth.Enabled = !check_KeepAR.Checked; updownParHeight.Enabled = !check_KeepAR.Checked; } + + if (PictureSettingsChanged != null) + PictureSettingsChanged(this, new EventArgs()); } private void crop_ValueChanged(object sender, EventArgs e) @@ -466,6 +579,9 @@ { text_width.Increment = int.Parse(drp_modulus.SelectedItem.ToString()); text_height.Increment = int.Parse(drp_modulus.SelectedItem.ToString()); + + if (PictureSettingsChanged != null) + PictureSettingsChanged(this, new EventArgs()); } } } Index: Controls/PictureSettings.Designer.cs =================================================================== --- Controls/PictureSettings.Designer.cs (revision 2684) +++ Controls/PictureSettings.Designer.cs (working copy) @@ -63,6 +63,8 @@ this.lbl_modulus = new System.Windows.Forms.Label(); this.lbl_displayWidth = new System.Windows.Forms.Label(); this.drp_modulus = new System.Windows.Forms.ComboBox(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.crop_bottom)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.crop_top)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.crop_left)).BeginInit(); @@ -73,25 +75,31 @@ ((System.ComponentModel.ISupportInitialize)(this.updownParHeight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.updownParWidth)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.updownDisplayWidth)).BeginInit(); + this.tableLayoutPanel2.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); this.SuspendLayout(); // // check_customCrop // this.check_customCrop.AutoSize = true; + this.tableLayoutPanel3.SetColumnSpan(this.check_customCrop, 5); this.check_customCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.check_customCrop.Location = new System.Drawing.Point(399, 57); + this.check_customCrop.Location = new System.Drawing.Point(0, 26); + this.check_customCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.check_customCrop.Name = "check_customCrop"; - this.check_customCrop.Size = new System.Drawing.Size(65, 17); + this.check_customCrop.Size = new System.Drawing.Size(61, 17); this.check_customCrop.TabIndex = 106; - this.check_customCrop.Text = "Custom:"; + this.check_customCrop.Text = "Custom"; this.check_customCrop.UseVisualStyleBackColor = true; // // check_autoCrop // this.check_autoCrop.AutoSize = true; this.check_autoCrop.Checked = true; + this.tableLayoutPanel3.SetColumnSpan(this.check_autoCrop, 5); this.check_autoCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.check_autoCrop.Location = new System.Drawing.Point(399, 33); + this.check_autoCrop.Location = new System.Drawing.Point(0, 3); + this.check_autoCrop.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.check_autoCrop.Name = "check_autoCrop"; this.check_autoCrop.Size = new System.Drawing.Size(73, 17); this.check_autoCrop.TabIndex = 105; @@ -108,7 +116,7 @@ 0, 0, 0}); - this.crop_bottom.Location = new System.Drawing.Point(479, 146); + this.crop_bottom.Location = new System.Drawing.Point(82, 122); this.crop_bottom.Maximum = new decimal(new int[] { 1080, 0, @@ -127,7 +135,7 @@ 0, 0, 0}); - this.crop_top.Location = new System.Drawing.Point(479, 100); + this.crop_top.Location = new System.Drawing.Point(82, 68); this.crop_top.Maximum = new decimal(new int[] { 1080, 0, @@ -146,7 +154,7 @@ 0, 0, 0}); - this.crop_left.Location = new System.Drawing.Point(428, 122); + this.crop_left.Location = new System.Drawing.Point(32, 95); this.crop_left.Maximum = new decimal(new int[] { 1920, 0, @@ -165,7 +173,7 @@ 0, 0, 0}); - this.crop_right.Location = new System.Drawing.Point(530, 122); + this.crop_right.Location = new System.Drawing.Point(132, 95); this.crop_right.Maximum = new decimal(new int[] { 1920, 0, @@ -182,18 +190,20 @@ this.label8.BackColor = System.Drawing.Color.Transparent; this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label8.Location = new System.Drawing.Point(396, 13); + this.label8.Location = new System.Drawing.Point(395, 13); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(33, 13); + this.label8.Size = new System.Drawing.Size(57, 13); this.label8.TabIndex = 96; - this.label8.Text = "Crop"; + this.label8.Text = "Cropping"; // // Label53 // + this.Label53.Anchor = System.Windows.Forms.AnchorStyles.Top; this.Label53.AutoSize = true; this.Label53.BackColor = System.Drawing.Color.Transparent; this.Label53.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Label53.Location = new System.Drawing.Point(477, 170); + this.Label53.Location = new System.Drawing.Point(83, 149); + this.Label53.Margin = new System.Windows.Forms.Padding(3); this.Label53.Name = "Label53"; this.Label53.Size = new System.Drawing.Size(41, 13); this.Label53.TabIndex = 104; @@ -201,10 +211,12 @@ // // Label52 // + this.Label52.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.Label52.AutoSize = true; this.Label52.BackColor = System.Drawing.Color.Transparent; this.Label52.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Label52.Location = new System.Drawing.Point(486, 85); + this.Label52.Location = new System.Drawing.Point(91, 49); + this.Label52.Margin = new System.Windows.Forms.Padding(3); this.Label52.Name = "Label52"; this.Label52.Size = new System.Drawing.Size(25, 13); this.Label52.TabIndex = 99; @@ -212,10 +224,12 @@ // // Label51 // + this.Label51.Anchor = System.Windows.Forms.AnchorStyles.Left; this.Label51.AutoSize = true; this.Label51.BackColor = System.Drawing.Color.Transparent; this.Label51.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Label51.Location = new System.Drawing.Point(580, 124); + this.Label51.Location = new System.Drawing.Point(182, 99); + this.Label51.Margin = new System.Windows.Forms.Padding(3); this.Label51.Name = "Label51"; this.Label51.Size = new System.Drawing.Size(32, 13); this.Label51.TabIndex = 102; @@ -223,10 +237,12 @@ // // Label15 // + this.Label15.Anchor = System.Windows.Forms.AnchorStyles.Right; this.Label15.AutoSize = true; this.Label15.BackColor = System.Drawing.Color.Transparent; this.Label15.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Label15.Location = new System.Drawing.Point(396, 124); + this.Label15.Location = new System.Drawing.Point(0, 99); + this.Label15.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.Label15.Name = "Label15"; this.Label15.Size = new System.Drawing.Size(26, 13); this.Label15.TabIndex = 97; @@ -235,8 +251,11 @@ // check_KeepAR // this.check_KeepAR.AutoSize = true; + this.check_KeepAR.Checked = true; + this.check_KeepAR.CheckState = System.Windows.Forms.CheckState.Checked; + this.tableLayoutPanel2.SetColumnSpan(this.check_KeepAR, 3); this.check_KeepAR.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.check_KeepAR.Location = new System.Drawing.Point(68, 85); + this.check_KeepAR.Location = new System.Drawing.Point(50, 49); this.check_KeepAR.Name = "check_KeepAR"; this.check_KeepAR.Size = new System.Drawing.Size(114, 17); this.check_KeepAR.TabIndex = 95; @@ -246,7 +265,7 @@ // // text_height // - this.text_height.Location = new System.Drawing.Point(206, 59); + this.text_height.Location = new System.Drawing.Point(198, 22); this.text_height.Maximum = new decimal(new int[] { 2560, 0, @@ -259,7 +278,7 @@ // // text_width // - this.text_width.Location = new System.Drawing.Point(68, 59); + this.text_width.Location = new System.Drawing.Point(50, 22); this.text_width.Maximum = new decimal(new int[] { 2560, 0, @@ -272,11 +291,13 @@ // // label4 // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label4.AutoSize = true; this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.ForeColor = System.Drawing.Color.Black; this.label4.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label4.Location = new System.Drawing.Point(152, 63); + this.label4.Location = new System.Drawing.Point(120, 26); + this.label4.Margin = new System.Windows.Forms.Padding(3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(42, 13); this.label4.TabIndex = 84; @@ -284,31 +305,37 @@ // // lbl_max // + this.lbl_max.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lbl_max.AutoSize = true; this.lbl_max.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lbl_max.Location = new System.Drawing.Point(279, 61); + this.lbl_max.Location = new System.Drawing.Point(268, 26); + this.lbl_max.Margin = new System.Windows.Forms.Padding(3); this.lbl_max.Name = "lbl_max"; - this.lbl_max.Size = new System.Drawing.Size(37, 13); + this.lbl_max.Size = new System.Drawing.Size(15, 13); this.lbl_max.TabIndex = 83; - this.lbl_max.Text = "{max}"; + this.lbl_max.Text = "--"; // // lbl_src_res // + this.lbl_src_res.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lbl_src_res.AutoSize = true; this.lbl_src_res.BackColor = System.Drawing.Color.Transparent; this.lbl_src_res.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lbl_src_res.Location = new System.Drawing.Point(66, 36); + this.lbl_src_res.Location = new System.Drawing.Point(50, 3); + this.lbl_src_res.Margin = new System.Windows.Forms.Padding(3); this.lbl_src_res.Name = "lbl_src_res"; - this.lbl_src_res.Size = new System.Drawing.Size(68, 13); + this.lbl_src_res.Size = new System.Drawing.Size(15, 13); this.lbl_src_res.TabIndex = 77; - this.lbl_src_res.Text = "Select a Title"; + this.lbl_src_res.Text = "--"; // // label7 // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label7.AutoSize = true; this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label7.Location = new System.Drawing.Point(13, 35); + this.label7.Location = new System.Drawing.Point(0, 3); + this.label7.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(44, 13); this.label7.TabIndex = 76; @@ -328,21 +355,25 @@ // // lbl_Aspect // + this.lbl_Aspect.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lbl_Aspect.AutoSize = true; this.lbl_Aspect.BackColor = System.Drawing.Color.Transparent; this.lbl_Aspect.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lbl_Aspect.Location = new System.Drawing.Point(241, 36); + this.lbl_Aspect.Location = new System.Drawing.Point(198, 3); + this.lbl_Aspect.Margin = new System.Windows.Forms.Padding(3); this.lbl_Aspect.Name = "lbl_Aspect"; - this.lbl_Aspect.Size = new System.Drawing.Size(68, 13); + this.lbl_Aspect.Size = new System.Drawing.Size(15, 13); this.lbl_Aspect.TabIndex = 79; - this.lbl_Aspect.Text = "Select a Title"; + this.lbl_Aspect.Text = "--"; // // Label91 // + this.Label91.Anchor = System.Windows.Forms.AnchorStyles.Left; this.Label91.AutoSize = true; this.Label91.BackColor = System.Drawing.Color.Transparent; this.Label91.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Label91.Location = new System.Drawing.Point(152, 35); + this.Label91.Location = new System.Drawing.Point(120, 3); + this.Label91.Margin = new System.Windows.Forms.Padding(3); this.Label91.Name = "Label91"; this.Label91.Size = new System.Drawing.Size(72, 13); this.Label91.TabIndex = 78; @@ -350,11 +381,13 @@ // // Label55 // + this.Label55.Anchor = System.Windows.Forms.AnchorStyles.Left; this.Label55.AutoSize = true; this.Label55.BackColor = System.Drawing.Color.Transparent; this.Label55.ForeColor = System.Drawing.Color.Black; this.Label55.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Label55.Location = new System.Drawing.Point(13, 63); + this.Label55.Location = new System.Drawing.Point(0, 26); + this.Label55.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.Label55.Name = "Label55"; this.Label55.Size = new System.Drawing.Size(39, 13); this.Label55.TabIndex = 80; @@ -379,7 +412,7 @@ this.tableLayoutPanel1.Controls.Add(this.lbl_modulus, 0, 1); this.tableLayoutPanel1.Controls.Add(this.lbl_displayWidth, 0, 2); this.tableLayoutPanel1.Controls.Add(this.drp_modulus, 1, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 108); + this.tableLayoutPanel1.Location = new System.Drawing.Point(19, 108); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 6; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -425,9 +458,9 @@ this.labelDisplaySize.Location = new System.Drawing.Point(82, 138); this.labelDisplaySize.Margin = new System.Windows.Forms.Padding(3); this.labelDisplaySize.Name = "labelDisplaySize"; - this.labelDisplaySize.Size = new System.Drawing.Size(68, 13); + this.labelDisplaySize.Size = new System.Drawing.Size(15, 13); this.labelDisplaySize.TabIndex = 108; - this.labelDisplaySize.Text = "Select a Title"; + this.labelDisplaySize.Text = "--"; // // lbl_parHeight // @@ -550,38 +583,80 @@ this.drp_modulus.TabIndex = 88; this.drp_modulus.SelectedIndexChanged += new System.EventHandler(this.drp_modulus_SelectedIndexChanged); // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.AutoSize = true; + this.tableLayoutPanel2.ColumnCount = 5; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.Controls.Add(this.label7, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.lbl_src_res, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.Label91, 2, 0); + this.tableLayoutPanel2.Controls.Add(this.lbl_Aspect, 3, 0); + this.tableLayoutPanel2.Controls.Add(this.Label55, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.text_width, 1, 1); + this.tableLayoutPanel2.Controls.Add(this.lbl_max, 4, 1); + this.tableLayoutPanel2.Controls.Add(this.label4, 2, 1); + this.tableLayoutPanel2.Controls.Add(this.text_height, 3, 1); + this.tableLayoutPanel2.Controls.Add(this.check_KeepAR, 1, 2); + this.tableLayoutPanel2.Location = new System.Drawing.Point(19, 33); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 3; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.Size = new System.Drawing.Size(376, 69); + this.tableLayoutPanel2.TabIndex = 111; + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.AutoSize = true; + this.tableLayoutPanel3.ColumnCount = 5; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.Controls.Add(this.Label15, 0, 4); + this.tableLayoutPanel3.Controls.Add(this.crop_left, 1, 4); + this.tableLayoutPanel3.Controls.Add(this.crop_right, 3, 4); + this.tableLayoutPanel3.Controls.Add(this.check_autoCrop, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.Label51, 4, 4); + this.tableLayoutPanel3.Controls.Add(this.crop_top, 2, 3); + this.tableLayoutPanel3.Controls.Add(this.Label53, 2, 6); + this.tableLayoutPanel3.Controls.Add(this.Label52, 2, 2); + this.tableLayoutPanel3.Controls.Add(this.crop_bottom, 2, 5); + this.tableLayoutPanel3.Controls.Add(this.check_customCrop, 0, 1); + this.tableLayoutPanel3.Location = new System.Drawing.Point(401, 33); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 7; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.Size = new System.Drawing.Size(217, 165); + this.tableLayoutPanel3.TabIndex = 112; + // // PictureSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Transparent; + this.Controls.Add(this.tableLayoutPanel3); + this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.tableLayoutPanel1); - this.Controls.Add(this.check_customCrop); - this.Controls.Add(this.check_autoCrop); - this.Controls.Add(this.crop_bottom); - this.Controls.Add(this.crop_top); - this.Controls.Add(this.crop_left); - this.Controls.Add(this.crop_right); this.Controls.Add(this.label8); - this.Controls.Add(this.Label53); - this.Controls.Add(this.Label52); - this.Controls.Add(this.Label51); - this.Controls.Add(this.Label15); - this.Controls.Add(this.check_KeepAR); - this.Controls.Add(this.text_height); - this.Controls.Add(this.text_width); - this.Controls.Add(this.label4); - this.Controls.Add(this.lbl_max); - this.Controls.Add(this.lbl_src_res); - this.Controls.Add(this.label7); this.Controls.Add(this.label26); - this.Controls.Add(this.lbl_Aspect); - this.Controls.Add(this.Label91); - this.Controls.Add(this.Label55); this.Enabled = false; this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "PictureSettings"; - this.Size = new System.Drawing.Size(666, 279); + this.Size = new System.Drawing.Size(634, 275); ((System.ComponentModel.ISupportInitialize)(this.crop_bottom)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.crop_top)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.crop_left)).EndInit(); @@ -593,6 +668,10 @@ ((System.ComponentModel.ISupportInitialize)(this.updownParHeight)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.updownParWidth)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.updownDisplayWidth)).EndInit(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -612,7 +691,6 @@ internal System.Windows.Forms.Label Label51; internal System.Windows.Forms.Label Label15; internal System.Windows.Forms.CheckBox check_KeepAR; - internal System.Windows.Forms.NumericUpDown text_height; internal System.Windows.Forms.Label label4; private System.Windows.Forms.Label lbl_max; internal System.Windows.Forms.Label lbl_src_res; @@ -634,7 +712,10 @@ internal System.Windows.Forms.Label lbl_modulus; internal System.Windows.Forms.Label lbl_displayWidth; internal System.Windows.Forms.ComboBox drp_modulus; - internal System.Windows.Forms.NumericUpDown text_width; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; + private System.Windows.Forms.NumericUpDown text_height; + private System.Windows.Forms.NumericUpDown text_width; } Index: Controls/x264Panel.Designer.cs =================================================================== --- Controls/x264Panel.Designer.cs (revision 2684) +++ Controls/x264Panel.Designer.cs (working copy) @@ -649,9 +649,9 @@ this.drop_refFrames.Name = "drop_refFrames"; this.drop_refFrames.Size = new System.Drawing.Size(121, 21); this.drop_refFrames.TabIndex = 54; - this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. \r\nThe more you add, the higher the quality - but the slower " + - "the encode. Be careful...too many and QuickTime struggle to play the video back." + - ""); + this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. \r\nThe more you add, the higher the quality, but the slower t" + + "he encode. Be careful... too many and QuickTime struggles to play the video back" + + "."); this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.drop_refFrames_SelectedIndexChanged); // // check_mixedReferences Index: frmAbout.Designer.cs =================================================================== --- frmAbout.Designer.cs (revision 2684) +++ frmAbout.Designer.cs (working copy) @@ -36,63 +36,43 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAbout)); this.Label3 = new System.Windows.Forms.Label(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); this.lbl_HBBuild = new System.Windows.Forms.Label(); this.PictureBox1 = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel1.SuspendLayout(); + this.button1 = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit(); this.SuspendLayout(); // // Label3 // this.Label3.AutoSize = true; - this.Label3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.Label3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label3.Location = new System.Drawing.Point(3, 23); + this.Label3.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Label3.Location = new System.Drawing.Point(80, 140); + this.Label3.Margin = new System.Windows.Forms.Padding(3, 3, 3, 1); this.Label3.Name = "Label3"; - this.Label3.Size = new System.Drawing.Size(325, 18); + this.Label3.Size = new System.Drawing.Size(99, 19); this.Label3.TabIndex = 25; this.Label3.Text = "HandBrake"; this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.lbl_HBBuild, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.Label3, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 83); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 4; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 69.44444F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30.55556F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(331, 100); - this.tableLayoutPanel1.TabIndex = 32; - // // label1 // this.label1.AutoSize = true; - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Location = new System.Drawing.Point(3, 66); + this.label1.Location = new System.Drawing.Point(12, 180); + this.label1.Margin = new System.Windows.Forms.Padding(3); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(325, 13); + this.label1.Size = new System.Drawing.Size(234, 13); this.label1.TabIndex = 33; - this.label1.Text = "(C) 2003-2009, HandBrake Developers"; + this.label1.Text = "Copyright 2003-2009 HandBrake Developers"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lbl_HBBuild // - this.lbl_HBBuild.AutoSize = true; - this.lbl_HBBuild.Dock = System.Windows.Forms.DockStyle.Bottom; - this.lbl_HBBuild.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_HBBuild.Location = new System.Drawing.Point(3, 46); + this.lbl_HBBuild.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_HBBuild.Location = new System.Drawing.Point(15, 161); + this.lbl_HBBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3); this.lbl_HBBuild.Name = "lbl_HBBuild"; - this.lbl_HBBuild.Size = new System.Drawing.Size(325, 13); + this.lbl_HBBuild.Size = new System.Drawing.Size(231, 13); this.lbl_HBBuild.TabIndex = 32; this.lbl_HBBuild.Text = "{Version}"; this.lbl_HBBuild.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -102,41 +82,58 @@ this.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo128; this.PictureBox1.InitialImage = null; - this.PictureBox1.Location = new System.Drawing.Point(120, 12); + this.PictureBox1.Location = new System.Drawing.Point(65, 9); + this.PictureBox1.Margin = new System.Windows.Forms.Padding(0); this.PictureBox1.Name = "PictureBox1"; - this.PictureBox1.Size = new System.Drawing.Size(84, 84); - this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.PictureBox1.Size = new System.Drawing.Size(128, 128); + this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.PictureBox1.TabIndex = 33; this.PictureBox1.TabStop = false; // + // button1 + // + this.button1.DialogResult = System.Windows.Forms.DialogResult.OK; + this.button1.Location = new System.Drawing.Point(92, 199); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 35; + this.button1.Text = "OK"; + this.button1.UseVisualStyleBackColor = true; + // // frmAbout // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F); + this.AcceptButton = this.button1; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(331, 183); + this.CancelButton = this.button1; + this.ClientSize = new System.Drawing.Size(258, 234); + this.Controls.Add(this.button1); + this.Controls.Add(this.label1); this.Controls.Add(this.PictureBox1); - this.Controls.Add(this.tableLayoutPanel1); - this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Controls.Add(this.lbl_HBBuild); + this.Controls.Add(this.Label3); + this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmAbout"; + this.ShowIcon = false; + this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "About HandBrake"; - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion internal System.Windows.Forms.Label Label3; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; internal System.Windows.Forms.Label label1; internal System.Windows.Forms.Label lbl_HBBuild; internal System.Windows.Forms.PictureBox PictureBox1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file Index: frmMain.Designer.cs =================================================================== --- frmMain.Designer.cs (revision 2684) +++ frmMain.Designer.cs (working copy) @@ -40,7 +40,7 @@ this.components = new System.ComponentModel.Container(); System.Windows.Forms.ContextMenuStrip notifyIconMenu; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.btn_restore = new System.Windows.Forms.ToolStripMenuItem(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); @@ -199,12 +199,12 @@ this.btn_restore}); notifyIconMenu.Name = "notifyIconMenu"; notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - notifyIconMenu.Size = new System.Drawing.Size(124, 26); + notifyIconMenu.Size = new System.Drawing.Size(114, 26); // // btn_restore // this.btn_restore.Name = "btn_restore"; - this.btn_restore.Size = new System.Drawing.Size(123, 22); + this.btn_restore.Size = new System.Drawing.Size(113, 22); this.btn_restore.Text = "Restore"; this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click); // @@ -251,7 +251,7 @@ this.check_largeFile.Anchor = System.Windows.Forms.AnchorStyles.Left; this.check_largeFile.AutoSize = true; this.check_largeFile.BackColor = System.Drawing.Color.Transparent; - this.check_largeFile.Location = new System.Drawing.Point(166, 5); + this.check_largeFile.Location = new System.Drawing.Point(179, 5); this.check_largeFile.Name = "check_largeFile"; this.check_largeFile.Size = new System.Drawing.Size(91, 17); this.check_largeFile.TabIndex = 4; @@ -345,7 +345,7 @@ this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.check_optimiseMP4.AutoSize = true; this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent; - this.check_optimiseMP4.Location = new System.Drawing.Point(263, 5); + this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5); this.check_optimiseMP4.Name = "check_optimiseMP4"; this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17); this.check_optimiseMP4.TabIndex = 25; @@ -360,11 +360,11 @@ this.check_iPodAtom.Anchor = System.Windows.Forms.AnchorStyles.Left; this.check_iPodAtom.AutoSize = true; this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent; - this.check_iPodAtom.Location = new System.Drawing.Point(365, 5); + this.check_iPodAtom.Location = new System.Drawing.Point(378, 5); this.check_iPodAtom.Name = "check_iPodAtom"; this.check_iPodAtom.Size = new System.Drawing.Size(102, 17); this.check_iPodAtom.TabIndex = 26; - this.check_iPodAtom.Text = "iPod 5G support"; + this.check_iPodAtom.Text = "iPod G5 support"; this.ToolTip.SetToolTip(this.check_iPodAtom, "Support for legacy 5th Generation iPods.\r\nEncodes will not sync if this option is" + " not enabled for H.264 encodes."); this.check_iPodAtom.UseVisualStyleBackColor = false; @@ -388,9 +388,9 @@ // // number // - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Format = "N0"; + dataGridViewCellStyle1.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle1; this.number.Frozen = true; this.number.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; @@ -441,7 +441,7 @@ this.drop_format.Items.AddRange(new object[] { "MP4 File", "MKV File"}); - this.drop_format.Location = new System.Drawing.Point(54, 3); + this.drop_format.Location = new System.Drawing.Point(67, 3); this.drop_format.Name = "drop_format"; this.drop_format.Size = new System.Drawing.Size(106, 21); this.drop_format.TabIndex = 28; @@ -450,23 +450,23 @@ // // drop_chapterFinish // + this.drop_chapterFinish.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drop_chapterFinish.FormattingEnabled = true; this.drop_chapterFinish.Location = new System.Drawing.Point(447, 3); this.drop_chapterFinish.Name = "drop_chapterFinish"; this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21); this.drop_chapterFinish.TabIndex = 10; - this.drop_chapterFinish.Text = "Auto"; this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)"); this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged); // // drop_chapterStart // + this.drop_chapterStart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drop_chapterStart.FormattingEnabled = true; this.drop_chapterStart.Location = new System.Drawing.Point(321, 3); this.drop_chapterStart.Name = "drop_chapterStart"; this.drop_chapterStart.Size = new System.Drawing.Size(69, 21); this.drop_chapterStart.TabIndex = 9; - this.drop_chapterStart.Text = "Auto"; this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)"); this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged); // @@ -482,6 +482,7 @@ // // drp_dvdtitle // + this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_dvdtitle.FormattingEnabled = true; this.drp_dvdtitle.Items.AddRange(new object[] { "Automatic"}); @@ -489,7 +490,6 @@ this.drp_dvdtitle.Name = "drp_dvdtitle"; this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21); this.drp_dvdtitle.TabIndex = 7; - this.drp_dvdtitle.Text = "Automatic"; this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" + "ter you have scanned a source."); this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged); @@ -517,13 +517,13 @@ this.mnu_killCLI, this.mnu_exit}); this.FileToolStripMenuItem.Name = "FileToolStripMenuItem"; - this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.FileToolStripMenuItem.Text = "&File"; // // mnu_killCLI // this.mnu_killCLI.Name = "mnu_killCLI"; - this.mnu_killCLI.Size = new System.Drawing.Size(143, 22); + this.mnu_killCLI.Size = new System.Drawing.Size(138, 22); this.mnu_killCLI.Text = "Cancel Scan"; this.mnu_killCLI.Visible = false; this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click); @@ -531,7 +531,7 @@ // mnu_exit // this.mnu_exit.Name = "mnu_exit"; - this.mnu_exit.Size = new System.Drawing.Size(143, 22); + this.mnu_exit.Size = new System.Drawing.Size(138, 22); this.mnu_exit.Text = "E&xit"; this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click); // @@ -548,7 +548,7 @@ this.ToolStripSeparator5, this.mnu_options}); this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"; - this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20); this.ToolsToolStripMenuItem.Text = "&Tools"; // // mnu_encode @@ -556,7 +556,7 @@ this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small; this.mnu_encode.Name = "mnu_encode"; this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); - this.mnu_encode.Size = new System.Drawing.Size(186, 22); + this.mnu_encode.Size = new System.Drawing.Size(184, 22); this.mnu_encode.Text = "Show Queue"; this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click); // @@ -564,20 +564,20 @@ // this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small; this.mnu_encodeLog.Name = "mnu_encodeLog"; - this.mnu_encodeLog.Size = new System.Drawing.Size(186, 22); + this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22); this.mnu_encodeLog.Text = "Activity Window"; this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click); // // ToolStripSeparator5 // this.ToolStripSeparator5.Name = "ToolStripSeparator5"; - this.ToolStripSeparator5.Size = new System.Drawing.Size(183, 6); + this.ToolStripSeparator5.Size = new System.Drawing.Size(181, 6); // // mnu_options // this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small; this.mnu_options.Name = "mnu_options"; - this.mnu_options.Size = new System.Drawing.Size(186, 22); + this.mnu_options.Size = new System.Drawing.Size(184, 22); this.mnu_options.Text = "Options"; this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click); // @@ -590,7 +590,7 @@ this.btn_new_preset, this.mnu_SelectDefault}); this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"; - this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20); + this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); this.PresetsToolStripMenuItem.Text = "&Presets"; // // mnu_presetReset @@ -639,14 +639,14 @@ this.toolStripSeparator6, this.mnu_about}); this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.HelpToolStripMenuItem.Text = "&Help"; // // mnu_user_guide // this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16; this.mnu_user_guide.Name = "mnu_user_guide"; - this.mnu_user_guide.Size = new System.Drawing.Size(192, 22); + this.mnu_user_guide.Size = new System.Drawing.Size(194, 22); this.mnu_user_guide.Text = "HandBrake User Guide"; this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click); // @@ -654,39 +654,39 @@ // this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16; this.mnu_handbrake_home.Name = "mnu_handbrake_home"; - this.mnu_handbrake_home.Size = new System.Drawing.Size(192, 22); + this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22); this.mnu_handbrake_home.Text = "HandBrake Homepage"; this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click); // // mnu_handbrake_forums // this.mnu_handbrake_forums.Name = "mnu_handbrake_forums"; - this.mnu_handbrake_forums.Size = new System.Drawing.Size(192, 22); + this.mnu_handbrake_forums.Size = new System.Drawing.Size(194, 22); this.mnu_handbrake_forums.Text = "HandBrake Forums"; this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click); // // ToolStripSeparator3 // this.ToolStripSeparator3.Name = "ToolStripSeparator3"; - this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6); + this.ToolStripSeparator3.Size = new System.Drawing.Size(191, 6); // // mnu_UpdateCheck // this.mnu_UpdateCheck.Name = "mnu_UpdateCheck"; - this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22); + this.mnu_UpdateCheck.Size = new System.Drawing.Size(194, 22); this.mnu_UpdateCheck.Text = "Check for Updates"; this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6); // // mnu_about // this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16; this.mnu_about.Name = "mnu_about"; - this.mnu_about.Size = new System.Drawing.Size(192, 22); + this.mnu_about.Size = new System.Drawing.Size(194, 22); this.mnu_about.Text = "About..."; this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click); // @@ -711,9 +711,9 @@ this.label5.ForeColor = System.Drawing.Color.Black; this.label5.Location = new System.Drawing.Point(3, 7); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(45, 13); + this.label5.Size = new System.Drawing.Size(58, 13); this.label5.TabIndex = 27; - this.label5.Text = "Format:"; + this.label5.Text = "Container:"; // // Label47 // @@ -891,24 +891,15 @@ this.tab_picture.Padding = new System.Windows.Forms.Padding(3); this.tab_picture.Size = new System.Drawing.Size(724, 308); this.tab_picture.TabIndex = 0; - this.tab_picture.Text = "Picture Settings"; + this.tab_picture.Text = "Picture"; this.tab_picture.UseVisualStyleBackColor = true; // // PictureSettings // - this.PictureSettings.CroppingValues = new int[] { - 0, - 0, - 0, - 0}; - this.PictureSettings.DisplayResolution = new System.Drawing.Size(0, 0); + this.PictureSettings.BackColor = System.Drawing.Color.Transparent; this.PictureSettings.Enabled = false; - this.PictureSettings.EncodeHeight = 0; - this.PictureSettings.EncodeWidth = 0; this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.PictureSettings.Location = new System.Drawing.Point(0, 0); - this.PictureSettings.MaximumHeight = 2560; - this.PictureSettings.MaximumWidth = 2560; this.PictureSettings.Name = "PictureSettings"; this.PictureSettings.Size = new System.Drawing.Size(666, 279); this.PictureSettings.TabIndex = 0; @@ -1155,40 +1146,40 @@ this.pmnu_saveChanges, this.pmnu_delete}); this.presets_menu.Name = "presets_menu"; - this.presets_menu.Size = new System.Drawing.Size(155, 98); + this.presets_menu.Size = new System.Drawing.Size(148, 98); this.presets_menu.Text = ";"; this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening); // // pmnu_expandAll // this.pmnu_expandAll.Name = "pmnu_expandAll"; - this.pmnu_expandAll.Size = new System.Drawing.Size(154, 22); + this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22); this.pmnu_expandAll.Text = "Expand All"; this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click); // // pmnu_collapse // this.pmnu_collapse.Name = "pmnu_collapse"; - this.pmnu_collapse.Size = new System.Drawing.Size(154, 22); + this.pmnu_collapse.Size = new System.Drawing.Size(147, 22); this.pmnu_collapse.Text = "Collapse All"; this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click); // // sep1 // this.sep1.Name = "sep1"; - this.sep1.Size = new System.Drawing.Size(151, 6); + this.sep1.Size = new System.Drawing.Size(144, 6); // // pmnu_saveChanges // this.pmnu_saveChanges.Name = "pmnu_saveChanges"; - this.pmnu_saveChanges.Size = new System.Drawing.Size(154, 22); + this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22); this.pmnu_saveChanges.Text = "Save Changes"; this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click); // // pmnu_delete // this.pmnu_delete.Name = "pmnu_delete"; - this.pmnu_delete.Size = new System.Drawing.Size(154, 22); + this.pmnu_delete.Size = new System.Drawing.Size(147, 22); this.pmnu_delete.Text = "Delete"; this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click); // @@ -1222,7 +1213,7 @@ this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_source.Name = "btn_source"; - this.btn_source.Size = new System.Drawing.Size(85, 36); + this.btn_source.Size = new System.Drawing.Size(88, 36); this.btn_source.Text = "Source"; this.btn_source.ToolTipText = "Open a new source file or folder."; this.btn_source.Click += new System.EventHandler(this.btn_source_Click); @@ -1231,7 +1222,7 @@ // this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small; this.btn_file_source.Name = "btn_file_source"; - this.btn_file_source.Size = new System.Drawing.Size(194, 22); + this.btn_file_source.Size = new System.Drawing.Size(192, 22); this.btn_file_source.Text = "Video File"; this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click); // @@ -1240,20 +1231,20 @@ this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image"))); this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_dvd_source.Name = "btn_dvd_source"; - this.btn_dvd_source.Size = new System.Drawing.Size(194, 22); + this.btn_dvd_source.Size = new System.Drawing.Size(192, 22); this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder"; this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(189, 6); // // mnu_dvd_drive // this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small; this.mnu_dvd_drive.Name = "mnu_dvd_drive"; - this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22); + this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22); this.mnu_dvd_drive.Text = "[No DVD Drive Ready]"; this.mnu_dvd_drive.Visible = false; this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click); @@ -1280,7 +1271,7 @@ this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_add2Queue.Name = "btn_add2Queue"; - this.btn_add2Queue.Size = new System.Drawing.Size(110, 36); + this.btn_add2Queue.Size = new System.Drawing.Size(117, 36); this.btn_add2Queue.Text = "Add to Queue"; this.btn_add2Queue.ToolTipText = "Add a new item to the Queue"; this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click); @@ -1291,7 +1282,7 @@ this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_showQueue.Name = "btn_showQueue"; - this.btn_showQueue.Size = new System.Drawing.Size(104, 36); + this.btn_showQueue.Size = new System.Drawing.Size(110, 36); this.btn_showQueue.Tag = ""; this.btn_showQueue.Text = "Show Queue"; this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click); @@ -1307,7 +1298,7 @@ this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta; this.tb_preview.Name = "tb_preview"; - this.tb_preview.Size = new System.Drawing.Size(81, 36); + this.tb_preview.Size = new System.Drawing.Size(84, 36); this.tb_preview.Text = "Preview"; this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click); // @@ -1317,7 +1308,7 @@ this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_ActivityWindow.Name = "btn_ActivityWindow"; - this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36); + this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36); this.btn_ActivityWindow.Text = "Activity Window"; this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" + "ently running encode."; @@ -1528,7 +1519,7 @@ // this.labelStaticSource.AutoSize = true; this.labelStaticSource.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelStaticSource.Location = new System.Drawing.Point(12, 70); + this.labelStaticSource.Location = new System.Drawing.Point(9, 70); this.labelStaticSource.Name = "labelStaticSource"; this.labelStaticSource.Size = new System.Drawing.Size(49, 13); this.labelStaticSource.TabIndex = 51; @@ -1537,7 +1528,7 @@ // labelSource // this.labelSource.AutoSize = true; - this.labelSource.Location = new System.Drawing.Point(67, 70); + this.labelSource.Location = new System.Drawing.Point(64, 70); this.labelSource.Name = "labelSource"; this.labelSource.Size = new System.Drawing.Size(137, 13); this.labelSource.TabIndex = 52; @@ -1547,7 +1538,7 @@ // this.labelStaticDestination.AutoSize = true; this.labelStaticDestination.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelStaticDestination.Location = new System.Drawing.Point(12, 116); + this.labelStaticDestination.Location = new System.Drawing.Point(9, 116); this.labelStaticDestination.Name = "labelStaticDestination"; this.labelStaticDestination.Size = new System.Drawing.Size(75, 13); this.labelStaticDestination.TabIndex = 53; @@ -1557,7 +1548,7 @@ // this.labelPreset.AutoSize = true; this.labelPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelPreset.Location = new System.Drawing.Point(13, 164); + this.labelPreset.Location = new System.Drawing.Point(9, 164); this.labelPreset.Name = "labelPreset"; this.labelPreset.Size = new System.Drawing.Size(180, 13); this.labelPreset.TabIndex = 54; @@ -1569,14 +1560,14 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1000, 582); + this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.labelStaticSource); this.Controls.Add(this.labelSource); - this.Controls.Add(this.tableLayoutPanel3); - this.Controls.Add(this.labelStaticDestination); this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.labelPreset); this.Controls.Add(this.frmMainMenu); + this.Controls.Add(this.labelStaticDestination); this.Controls.Add(this.tableLayoutPanel2); + this.Controls.Add(this.labelPreset); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.groupBox2); this.Controls.Add(this.StatusStrip); @@ -1752,7 +1743,5 @@ private Label labelStaticSource; internal Label labelPreset; internal Handbrake.Controls.PictureSettings PictureSettings; - - } } \ No newline at end of file Index: frmMain.resx =================================================================== --- frmMain.resx (revision 2684) +++ frmMain.resx (working copy) @@ -166,18 +166,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I - k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC - TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p - AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 - BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr - UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG - CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 - F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS - rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt - NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp - 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W - AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp + olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc + 8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5 + u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc + 08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3 + DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i + l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM + PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/ + hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU + pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp + 41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC Index: Functions/PresetLoader.cs =================================================================== --- Functions/PresetLoader.cs (revision 2684) +++ Functions/PresetLoader.cs (working copy) @@ -6,6 +6,7 @@ using System; using System.Windows.Forms; +using System.Drawing; namespace Handbrake.Functions { @@ -76,10 +77,13 @@ int.TryParse(presetQuery.CropRight, out right); mainWindow.PictureSettings.check_customCrop.Checked = true; - mainWindow.PictureSettings.crop_top.Value = top; - mainWindow.PictureSettings.crop_bottom.Value = bottom; - mainWindow.PictureSettings.crop_left.Value = left; - mainWindow.PictureSettings.crop_right.Value = right; + mainWindow.PictureSettings.CroppingValues = new int[4] + { + top, + bottom, + left, + right + }; } } @@ -90,32 +94,17 @@ mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked; // Set the Width and height as Required. + mainWindow.PictureSettings.MaximumEncodeResolution = new Size(presetQuery.MaxWidth, presetQuery.MaxHeight); + if (presetQuery.Width != 0) - mainWindow.PictureSettings.text_width.Value = presetQuery.Width; + mainWindow.PictureSettings.EncodeWidth = presetQuery.Width; if (presetQuery.Height != 0) - mainWindow.PictureSettings.text_height.Value = presetQuery.Height; + mainWindow.PictureSettings.EncodeHeight = presetQuery.Height; - // Max Width/Height override Width/Height - if (presetQuery.MaxWidth != 0) - { - mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth; - mainWindow.PictureSettings.MaximumWidth = presetQuery.MaxWidth; - } - - if (presetQuery.MaxHeight != 0) - { - mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight; - mainWindow.PictureSettings.MaximumHeight = presetQuery.MaxHeight; - } - - // Case where both height and max height are 0 - For built-in presets - if (presetQuery.MaxHeight == 0 && presetQuery.Height == 0) - mainWindow.PictureSettings.text_height.Value = 0; - if (presetQuery.MaxWidth == 0 && presetQuery.Width == 0) if (mainWindow.selectedTitle != null && mainWindow.selectedTitle.Resolution.Width != 0) - mainWindow.PictureSettings.text_width.Value = mainWindow.selectedTitle.Resolution.Width; + mainWindow.PictureSettings.EncodeWidth = mainWindow.selectedTitle.Resolution.Width; mainWindow.PictureSettings.setMax(); Index: Functions/QueryGenerator.cs =================================================================== --- Functions/QueryGenerator.cs (revision 2684) +++ Functions/QueryGenerator.cs (working copy) @@ -119,32 +119,31 @@ #region Picture Settings Tab // Use MaxWidth for built-in presets and width for user settings. - if (mainWindow.PictureSettings.MaximumWidth == 0) + if (mainWindow.PictureSettings.MaximumEncodeResolution.Width == 0) { - if (mainWindow.PictureSettings.text_width.Text != "") + if (mainWindow.PictureSettings.EncodeWidth != 0) if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic - query += " -w " + mainWindow.PictureSettings.text_width.Text; + query += " -w " + mainWindow.PictureSettings.EncodeWidth.ToString(); } else { - if (mainWindow.PictureSettings.text_width.Text != "") + if (mainWindow.PictureSettings.EncodeWidth != 0) if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) - query += " -X " + mainWindow.PictureSettings.text_width.Text; + query += " -X " + mainWindow.PictureSettings.EncodeWidth.ToString(); } // Use MaxHeight for built-in presets and height for user settings. - if (mainWindow.PictureSettings.MaximumHeight == 0) + if (mainWindow.PictureSettings.MaximumEncodeResolution.Height == 0) { - if (mainWindow.PictureSettings.text_height.Text != "0") - if (mainWindow.PictureSettings.text_height.Text != "") - if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic - query += " -l " + mainWindow.PictureSettings.text_height.Text; + if (mainWindow.PictureSettings.EncodeHeight != 0) + if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic + query += " -l " + mainWindow.PictureSettings.EncodeHeight.ToString(); } else { - if (mainWindow.PictureSettings.text_height.Text != "") + if (mainWindow.PictureSettings.EncodeHeight != 0) if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) - query += " -Y " + mainWindow.PictureSettings.text_height.Text; + query += " -Y " + mainWindow.PictureSettings.EncodeHeight.ToString(); } string cropTop = mainWindow.PictureSettings.crop_top.Text;