WinGui:

- Code tweaks to x264Panel animate function.
- Picture Settings: Added text labal which indicates when max width / height is used.

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

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index 809626d..cee6dfa 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -25,7 +25,7 @@ namespace Handbrake
                 System.Windows.Forms.Screen scr = Screen.PrimaryScreen;\r
                 if ((scr.Bounds.Width < 1024) || (scr.Bounds.Height < 720))\r
                 {\r
-                    MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n" + "Your screen is running at: " + scr.Bounds.Width.ToString() + "x" + scr.Bounds.Height.ToString() + " \nScreen resolution is too Low. Must be 1024x720 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n" + "Your screen is running at: " + scr.Bounds.Width + "x" + scr.Bounds.Height.ToString() + " \nScreen resolution is too Low. Must be 1024x720 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                     launch = false;\r
                 }\r
             }\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index f1b024c..ff8b71a 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -179,14 +179,9 @@ namespace Handbrake
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_Filters = new System.Windows.Forms.TabPage();\r
-            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
-            this.ctl_denoise = new Handbrake.Denoise();\r
-            this.ctl_decomb = new Handbrake.Decomb();\r
-            this.ctl_detelecine = new Handbrake.Detelecine();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.h264Tab = new System.Windows.Forms.TabPage();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -215,11 +210,17 @@ namespace Handbrake
             this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
             this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
-            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
+            this.lbl_max = new System.Windows.Forms.Label();\r
+            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
+            this.ctl_denoise = new Handbrake.Denoise();\r
+            this.ctl_decomb = new Handbrake.Decomb();\r
+            this.ctl_detelecine = new Handbrake.Detelecine();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -377,7 +378,7 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_1.Location = new System.Drawing.Point(526, 52);\r
+            this.drp_audbit_1.Location = new System.Drawing.Point(526, 47);\r
             this.drp_audbit_1.Name = "drp_audbit_1";\r
             this.drp_audbit_1.Size = new System.Drawing.Size(70, 20);\r
             this.drp_audbit_1.TabIndex = 11;\r
@@ -396,7 +397,7 @@ namespace Handbrake
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_1.Location = new System.Drawing.Point(468, 52);\r
+            this.drp_audsr_1.Location = new System.Drawing.Point(468, 47);\r
             this.drp_audsr_1.Name = "drp_audsr_1";\r
             this.drp_audsr_1.Size = new System.Drawing.Size(55, 20);\r
             this.drp_audsr_1.TabIndex = 9;\r
@@ -502,11 +503,11 @@ namespace Handbrake
             // btn_setDefault\r
             // \r
             this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_setDefault.Location = new System.Drawing.Point(108, 8);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(135, 8);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
-            this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
+            this.btn_setDefault.Size = new System.Drawing.Size(101, 22);\r
             this.btn_setDefault.TabIndex = 1;\r
             this.btn_setDefault.TabStop = false;\r
             this.btn_setDefault.Text = "Set Default";\r
@@ -526,7 +527,7 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_1.Location = new System.Drawing.Point(333, 52);\r
+            this.drp_audmix_1.Location = new System.Drawing.Point(333, 47);\r
             this.drp_audmix_1.Name = "drp_audmix_1";\r
             this.drp_audmix_1.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_1.TabIndex = 7;\r
@@ -598,15 +599,15 @@ namespace Handbrake
             this.data_chpt.MultiSelect = false;\r
             this.data_chpt.Name = "data_chpt";\r
             this.data_chpt.RowHeadersVisible = false;\r
-            this.data_chpt.Size = new System.Drawing.Size(661, 234);\r
+            this.data_chpt.Size = new System.Drawing.Size(684, 234);\r
             this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle2.Format = "N0";\r
+            dataGridViewCellStyle2.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -621,11 +622,11 @@ namespace Handbrake
             // btn_addPreset\r
             // \r
             this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_addPreset.Location = new System.Drawing.Point(3, 8);\r
             this.btn_addPreset.Name = "btn_addPreset";\r
-            this.btn_addPreset.Size = new System.Drawing.Size(35, 22);\r
+            this.btn_addPreset.Size = new System.Drawing.Size(49, 22);\r
             this.btn_addPreset.TabIndex = 3;\r
             this.btn_addPreset.TabStop = false;\r
             this.btn_addPreset.Text = "Add";\r
@@ -636,11 +637,11 @@ namespace Handbrake
             // btn_removePreset\r
             // \r
             this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_removePreset.Location = new System.Drawing.Point(44, 8);\r
+            this.btn_removePreset.Location = new System.Drawing.Point(58, 8);\r
             this.btn_removePreset.Name = "btn_removePreset";\r
-            this.btn_removePreset.Size = new System.Drawing.Size(58, 22);\r
+            this.btn_removePreset.Size = new System.Drawing.Size(71, 22);\r
             this.btn_removePreset.TabIndex = 4;\r
             this.btn_removePreset.TabStop = false;\r
             this.btn_removePreset.Text = "Remove";\r
@@ -657,7 +658,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_1.Location = new System.Drawing.Point(216, 52);\r
+            this.drp_audenc_1.Location = new System.Drawing.Point(216, 47);\r
             this.drp_audenc_1.Name = "drp_audenc_1";\r
             this.drp_audenc_1.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_1.TabIndex = 5;\r
@@ -1140,7 +1141,7 @@ namespace Handbrake
             this.lv_audioList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
             this.lv_audioList.HideSelection = false;\r
             this.lv_audioList.LabelWrap = false;\r
-            this.lv_audioList.Location = new System.Drawing.Point(16, 79);\r
+            this.lv_audioList.Location = new System.Drawing.Point(16, 74);\r
             this.lv_audioList.MultiSelect = false;\r
             this.lv_audioList.Name = "lv_audioList";\r
             this.lv_audioList.Size = new System.Drawing.Size(668, 147);\r
@@ -1227,7 +1228,7 @@ namespace Handbrake
             this.btn_RemoveAudioTrack.BackColor = System.Drawing.SystemColors.Control;\r
             this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_RemoveAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(132, 232);\r
+            this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(132, 227);\r
             this.btn_RemoveAudioTrack.Name = "btn_RemoveAudioTrack";\r
             this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(111, 23);\r
             this.btn_RemoveAudioTrack.TabIndex = 47;\r
@@ -1240,7 +1241,7 @@ namespace Handbrake
             this.btn_addAudioTrack.BackColor = System.Drawing.SystemColors.Control;\r
             this.btn_addAudioTrack.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_addAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 232);\r
+            this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 227);\r
             this.btn_addAudioTrack.Name = "btn_addAudioTrack";\r
             this.btn_addAudioTrack.Size = new System.Drawing.Size(111, 23);\r
             this.btn_addAudioTrack.TabIndex = 46;\r
@@ -1253,7 +1254,7 @@ namespace Handbrake
             this.lbl_drc.AutoSize = true;\r
             this.lbl_drc.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc.Location = new System.Drawing.Point(650, 52);\r
+            this.lbl_drc.Location = new System.Drawing.Point(650, 47);\r
             this.lbl_drc.Name = "lbl_drc";\r
             this.lbl_drc.Size = new System.Drawing.Size(14, 13);\r
             this.lbl_drc.TabIndex = 15;\r
@@ -1264,7 +1265,7 @@ namespace Handbrake
             this.label16.AutoSize = true;\r
             this.label16.BackColor = System.Drawing.Color.Transparent;\r
             this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label16.Location = new System.Drawing.Point(608, 35);\r
+            this.label16.Location = new System.Drawing.Point(608, 30);\r
             this.label16.Name = "label16";\r
             this.label16.Size = new System.Drawing.Size(28, 12);\r
             this.label16.TabIndex = 14;\r
@@ -1273,7 +1274,7 @@ namespace Handbrake
             // tb_drc\r
             // \r
             this.tb_drc.LargeChange = 0;\r
-            this.tb_drc.Location = new System.Drawing.Point(599, 47);\r
+            this.tb_drc.Location = new System.Drawing.Point(599, 42);\r
             this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r
             this.tb_drc.Maximum = 31;\r
             this.tb_drc.Name = "tb_drc";\r
@@ -1314,7 +1315,7 @@ namespace Handbrake
             this.label67.AutoSize = true;\r
             this.label67.BackColor = System.Drawing.Color.Transparent;\r
             this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label67.Location = new System.Drawing.Point(464, 35);\r
+            this.label67.Location = new System.Drawing.Point(464, 30);\r
             this.label67.Name = "label67";\r
             this.label67.Size = new System.Drawing.Size(62, 12);\r
             this.label67.TabIndex = 10;\r
@@ -1325,7 +1326,7 @@ namespace Handbrake
             this.label66.AutoSize = true;\r
             this.label66.BackColor = System.Drawing.Color.Transparent;\r
             this.label66.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label66.Location = new System.Drawing.Point(539, 35);\r
+            this.label66.Location = new System.Drawing.Point(539, 30);\r
             this.label66.Name = "label66";\r
             this.label66.Size = new System.Drawing.Size(39, 12);\r
             this.label66.TabIndex = 12;\r
@@ -1336,7 +1337,7 @@ namespace Handbrake
             this.label65.AutoSize = true;\r
             this.label65.BackColor = System.Drawing.Color.Transparent;\r
             this.label65.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label65.Location = new System.Drawing.Point(235, 35);\r
+            this.label65.Location = new System.Drawing.Point(235, 30);\r
             this.label65.Name = "label65";\r
             this.label65.Size = new System.Drawing.Size(69, 12);\r
             this.label65.TabIndex = 6;\r
@@ -1347,7 +1348,7 @@ namespace Handbrake
             this.label14.AutoSize = true;\r
             this.label14.BackColor = System.Drawing.Color.Transparent;\r
             this.label14.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label14.Location = new System.Drawing.Point(369, 35);\r
+            this.label14.Location = new System.Drawing.Point(369, 30);\r
             this.label14.Name = "label14";\r
             this.label14.Size = new System.Drawing.Size(48, 12);\r
             this.label14.TabIndex = 8;\r
@@ -1370,7 +1371,7 @@ namespace Handbrake
             this.label27.AutoSize = true;\r
             this.label27.BackColor = System.Drawing.Color.Transparent;\r
             this.label27.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label27.Location = new System.Drawing.Point(87, 35);\r
+            this.label27.Location = new System.Drawing.Point(87, 30);\r
             this.label27.Name = "label27";\r
             this.label27.Size = new System.Drawing.Size(40, 12);\r
             this.label27.TabIndex = 4;\r
@@ -1404,7 +1405,7 @@ namespace Handbrake
             this.drp_track1Audio.FormattingEnabled = true;\r
             this.drp_track1Audio.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_track1Audio.Location = new System.Drawing.Point(16, 53);\r
+            this.drp_track1Audio.Location = new System.Drawing.Point(16, 48);\r
             this.drp_track1Audio.Name = "drp_track1Audio";\r
             this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track1Audio.TabIndex = 3;\r
@@ -1544,6 +1545,7 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.Color.Transparent;\r
+            this.TabPage1.Controls.Add(this.lbl_max);\r
             this.TabPage1.Controls.Add(this.check_customCrop);\r
             this.TabPage1.Controls.Add(this.check_autoCrop);\r
             this.TabPage1.Controls.Add(this.lbl_src_res);\r
@@ -1802,7 +1804,7 @@ namespace Handbrake
             this.label24.AutoSize = true;\r
             this.label24.BackColor = System.Drawing.Color.Transparent;\r
             this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label24.Location = new System.Drawing.Point(16, 11);\r
+            this.label24.Location = new System.Drawing.Point(13, 13);\r
             this.label24.Name = "label24";\r
             this.label24.Size = new System.Drawing.Size(49, 13);\r
             this.label24.TabIndex = 22;\r
@@ -1856,48 +1858,6 @@ namespace Handbrake
             this.tab_Filters.Text = "Video Filters";\r
             this.tab_Filters.UseVisualStyleBackColor = true;\r
             // \r
-            // ctl_deinterlace\r
-            // \r
-            this.ctl_deinterlace.AutoSize = true;\r
-            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
-            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
-            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_deinterlace.TabIndex = 41;\r
-            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
-            // \r
-            // ctl_denoise\r
-            // \r
-            this.ctl_denoise.AutoSize = true;\r
-            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
-            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_denoise.Name = "ctl_denoise";\r
-            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_denoise.TabIndex = 40;\r
-            // \r
-            // ctl_decomb\r
-            // \r
-            this.ctl_decomb.AutoSize = true;\r
-            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
-            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_decomb.Name = "ctl_decomb";\r
-            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_decomb.TabIndex = 39;\r
-            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
-            // \r
-            // ctl_detelecine\r
-            // \r
-            this.ctl_detelecine.AutoSize = true;\r
-            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
-            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_detelecine.Name = "ctl_detelecine";\r
-            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_detelecine.TabIndex = 38;\r
-            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1935,14 +1895,6 @@ namespace Handbrake
             this.h264Tab.Text = "Advanced";\r
             this.h264Tab.UseVisualStyleBackColor = true;\r
             // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
-            this.x264Panel.Name = "x264Panel";\r
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
-            this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.x264Query = "";\r
-            // \r
             // tab_query\r
             // \r
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1962,7 +1914,7 @@ namespace Handbrake
             this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_clear.Location = new System.Drawing.Point(602, 75);\r
+            this.btn_clear.Location = new System.Drawing.Point(634, 75);\r
             this.btn_clear.Name = "btn_clear";\r
             this.btn_clear.Size = new System.Drawing.Size(75, 22);\r
             this.btn_clear.TabIndex = 4;\r
@@ -2009,7 +1961,7 @@ namespace Handbrake
             this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.rtf_query.Location = new System.Drawing.Point(16, 103);\r
             this.rtf_query.Name = "rtf_query";\r
-            this.rtf_query.Size = new System.Drawing.Size(661, 182);\r
+            this.rtf_query.Size = new System.Drawing.Size(693, 194);\r
             this.rtf_query.TabIndex = 5;\r
             this.rtf_query.Text = "";\r
             // \r
@@ -2242,6 +2194,16 @@ namespace Handbrake
             this.toolStripSeparator4.Name = "toolStripSeparator4";\r
             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // tb_preview\r
+            // \r
+            this.tb_preview.Image = global::Handbrake.Properties.Resources.picture;\r
+            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.tb_preview.Name = "tb_preview";\r
+            this.tb_preview.Size = new System.Drawing.Size(86, 36);\r
+            this.tb_preview.Text = "Preview";\r
+            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
+            // \r
             // btn_ActivityWindow\r
             // \r
             this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
@@ -2281,15 +2243,64 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
             this.lbl_encode.Text = "{0}";\r
             // \r
-            // tb_preview\r
+            // lbl_max\r
             // \r
-            this.tb_preview.Image = global::Handbrake.Properties.Resources.picture;\r
-            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.tb_preview.Name = "tb_preview";\r
-            this.tb_preview.Size = new System.Drawing.Size(86, 36);\r
-            this.tb_preview.Text = "Preview";\r
-            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
+            this.lbl_max.AutoSize = true;\r
+            this.lbl_max.Location = new System.Drawing.Point(568, 86);\r
+            this.lbl_max.Name = "lbl_max";\r
+            this.lbl_max.Size = new System.Drawing.Size(46, 13);\r
+            this.lbl_max.TabIndex = 35;\r
+            this.lbl_max.Text = "{max}";\r
+            // \r
+            // ctl_deinterlace\r
+            // \r
+            this.ctl_deinterlace.AutoSize = true;\r
+            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
+            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
+            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_deinterlace.TabIndex = 41;\r
+            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
+            // \r
+            // ctl_denoise\r
+            // \r
+            this.ctl_denoise.AutoSize = true;\r
+            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
+            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_denoise.Name = "ctl_denoise";\r
+            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_denoise.TabIndex = 40;\r
+            // \r
+            // ctl_decomb\r
+            // \r
+            this.ctl_decomb.AutoSize = true;\r
+            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
+            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_decomb.Name = "ctl_decomb";\r
+            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_decomb.TabIndex = 39;\r
+            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
+            // \r
+            // ctl_detelecine\r
+            // \r
+            this.ctl_detelecine.AutoSize = true;\r
+            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
+            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_detelecine.Name = "ctl_detelecine";\r
+            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_detelecine.TabIndex = 38;\r
+            // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.x264Query = "";\r
             // \r
             // frmMain\r
             // \r
@@ -2540,6 +2551,7 @@ namespace Handbrake
         internal System.Windows.Forms.RadioButton radio_targetFilesize;\r
         internal Handbrake.Controls.x264Panel x264Panel;\r
         private System.Windows.Forms.ToolStripButton tb_preview;\r
+        private System.Windows.Forms.Label lbl_max;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c6b29fc..1fbe83b 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -421,9 +421,13 @@ namespace Handbrake
         {\r
             if (treeView_presets.SelectedNode != null)\r
             {\r
-                Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text;\r
-                Properties.Settings.Default.Save();\r
-                MessageBox.Show("New default preset set.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text;\r
+                    Properties.Settings.Default.Save();\r
+                    MessageBox.Show("New default preset set.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+                }\r
             }\r
             else\r
                 MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
@@ -464,7 +468,7 @@ namespace Handbrake
                         x264Panel.reset2Defaults();\r
 \r
                         // Send the query from the file to the Query Parser class\r
-                        Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
+                        Functions.QueryParser presetQuery = QueryParser.Parse(query);\r
 \r
                         // Now load the preset\r
                         presetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);\r
@@ -472,6 +476,13 @@ namespace Handbrake
                         // The x264 widgets will need updated, so do this now:\r
                         x264Panel.X264_StandardizeOptString();\r
                         x264Panel.X264_SetCurrentSettingsInPanel();\r
+\r
+                        if (maxWidth != 0 && maxHeight != 0)\r
+                            lbl_max.Text = "Max Width / Height";\r
+                        else if (maxWidth != 0)\r
+                            lbl_max.Text = "Max Width";\r
+                        else\r
+                            lbl_max.Text = "";\r
                     }\r
                 }\r
             }\r
@@ -1166,6 +1177,7 @@ namespace Handbrake
                 text_width.BackColor = Color.White;\r
 \r
             maxWidth = 0; maxHeight = 0;  // Reset max width so that it's not using the MaxWidth -X. Quick hack to allow -X for preset usage.\r
+            lbl_max.Text = "";\r
 \r
             int width;\r
             Boolean parsed = int.TryParse(text_width.Text, out width);\r
@@ -1190,6 +1202,10 @@ namespace Handbrake
                 text_height.BackColor = Color.White;\r
 \r
             maxHeight = 0;  // Reset max height so that it's not using the MaxHeight -Y. Quick hack to allow -Y for preset usage.\r
+            if (maxWidth != 0)\r
+                lbl_max.Text = "Max Width";\r
+            else\r
+                lbl_max.Text = "";\r
 \r
             int height;\r
             Boolean parsed = int.TryParse(text_height.Text, out height);\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 77037cb..9b96457 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -152,6 +152,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>232, 15</value>\r
   </metadata>\r