From c8fb368dc6d525536374c79d4345bf35a6d15b0c Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 30 Nov 2009 23:02:34 +0000 Subject: [PATCH] WinGui: - Few UI usability tweaks. git-svn-id: svn://localhost/HandBrake/trunk@2994 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Controls/AudioPanel.Designer.cs | 11 +- win/C#/Controls/Filters.Designer.cs | 1 + win/C#/Controls/x264Panel.Designer.cs | 2 + win/C#/Controls/x264Panel.resx | 3 - win/C#/frmMain.Designer.cs | 184 ++++++++++++++++++--------------- win/C#/frmMain.cs | 9 +- 6 files changed, 114 insertions(+), 96 deletions(-) diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs index 0ac76d5e..d0647a33 100644 --- a/win/C#/Controls/AudioPanel.Designer.cs +++ b/win/C#/Controls/AudioPanel.Designer.cs @@ -137,19 +137,19 @@ namespace Handbrake.Controls 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 @@ namespace Handbrake.Controls // 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); // @@ -214,6 +214,7 @@ namespace Handbrake.Controls // // tb_drc // + this.tb_drc.BackColor = System.Drawing.SystemColors.Window; this.tb_drc.LargeChange = 0; this.tb_drc.Location = new System.Drawing.Point(598, 29); this.tb_drc.Margin = new System.Windows.Forms.Padding(0); diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs index cc2346ae..bdcc9c6e 100644 --- a/win/C#/Controls/Filters.Designer.cs +++ b/win/C#/Controls/Filters.Designer.cs @@ -210,6 +210,7 @@ // this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.slider_deblock.BackColor = System.Drawing.SystemColors.Window; this.slider_deblock.Location = new System.Drawing.Point(71, 111); this.slider_deblock.Maximum = 15; this.slider_deblock.Minimum = 4; diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs index 206a0b6d..b78f2e01 100644 --- a/win/C#/Controls/x264Panel.Designer.cs +++ b/win/C#/Controls/x264Panel.Designer.cs @@ -81,6 +81,7 @@ namespace Handbrake.Controls // // slider_psytrellis // + this.slider_psytrellis.BackColor = System.Drawing.SystemColors.Window; this.slider_psytrellis.Location = new System.Drawing.Point(436, 194); this.slider_psytrellis.Name = "slider_psytrellis"; this.slider_psytrellis.Size = new System.Drawing.Size(131, 45); @@ -110,6 +111,7 @@ namespace Handbrake.Controls // // slider_psyrd // + this.slider_psyrd.BackColor = System.Drawing.SystemColors.Window; this.slider_psyrd.Location = new System.Drawing.Point(436, 153); this.slider_psyrd.Name = "slider_psyrd"; this.slider_psyrd.Size = new System.Drawing.Size(131, 45); diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx index 064df4a5..97759c0c 100644 --- a/win/C#/Controls/x264Panel.resx +++ b/win/C#/Controls/x264Panel.resx @@ -120,9 +120,6 @@ 17, 17 - - 17, 17 - Psychovisual Rate Distortion Optimization sure is a mouthful, isn't it? Basically, it means x264 tries to retain detail, for better quality to the human eye, as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise. diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 0c791c24..1467b864 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -40,7 +40,7 @@ namespace Handbrake 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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); @@ -100,24 +100,30 @@ namespace Handbrake this.Label47 = new System.Windows.Forms.Label(); this.Label3 = new System.Windows.Forms.Label(); this.tab_audio = new System.Windows.Forms.TabPage(); + this.AudioSettings = new Handbrake.Controls.AudioPanel(); this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components); this.tab_video = new System.Windows.Forms.TabPage(); + this.lbl_QualityValue = new System.Windows.Forms.Label(); this.radio_cq = new System.Windows.Forms.RadioButton(); this.radio_avgBitrate = new System.Windows.Forms.RadioButton(); this.radio_targetFilesize = new System.Windows.Forms.RadioButton(); this.label25 = new System.Windows.Forms.Label(); this.check_2PassEncode = new System.Windows.Forms.CheckBox(); this.Label2 = new System.Windows.Forms.Label(); - this.SliderValue = new System.Windows.Forms.Label(); + this.lbl_SliderValue = new System.Windows.Forms.Label(); this.Label46 = new System.Windows.Forms.Label(); this.tab_picture = new System.Windows.Forms.TabPage(); + this.PictureSettings = new Handbrake.Controls.PictureSettings(); this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox(); this.tabs_panel = new System.Windows.Forms.TabControl(); this.tab_filters = new System.Windows.Forms.TabPage(); + this.Filters = new Handbrake.Controls.Filters(); this.tab_subtitles = new System.Windows.Forms.TabPage(); + this.Subtitles = new Handbrake.Controls.Subtitles(); this.tab_chapters = new System.Windows.Forms.TabPage(); this.label31 = new System.Windows.Forms.Label(); this.tab_advanced = new System.Windows.Forms.TabPage(); + this.x264Panel = new Handbrake.Controls.x264Panel(); this.tab_query = new System.Windows.Forms.TabPage(); this.btn_clear = new System.Windows.Forms.Button(); this.label34 = new System.Windows.Forms.Label(); @@ -171,11 +177,6 @@ namespace Handbrake this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.openPreset = new System.Windows.Forms.OpenFileDialog(); this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog(); - this.PictureSettings = new Handbrake.Controls.PictureSettings(); - this.Filters = new Handbrake.Controls.Filters(); - this.AudioSettings = new Handbrake.Controls.AudioPanel(); - this.Subtitles = new Handbrake.Controls.Subtitles(); - this.x264Panel = new Handbrake.Controls.x264Panel(); notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); notifyIconMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); @@ -306,6 +307,7 @@ namespace Handbrake // // slider_videoQuality // + this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window; this.slider_videoQuality.Enabled = false; this.slider_videoQuality.Location = new System.Drawing.Point(347, 120); this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0); @@ -314,8 +316,7 @@ namespace Handbrake this.slider_videoQuality.Size = new System.Drawing.Size(322, 45); this.slider_videoQuality.TabIndex = 14; this.slider_videoQuality.TickFrequency = 17; - this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. Typical sane values are between 59~63%. \r\n>70" + - "% will likely result in the output file being larger than the input file."); + this.ToolTip.SetToolTip(this.slider_videoQuality, resources.GetString("slider_videoQuality.ToolTip")); this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll); // // text_filesize @@ -400,9 +401,9 @@ namespace Handbrake // // number // - dataGridViewCellStyle1.Format = "N0"; - dataGridViewCellStyle1.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle2; this.number.Frozen = true; this.number.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; @@ -564,7 +565,7 @@ namespace Handbrake // mnu_killCLI // this.mnu_killCLI.Name = "mnu_killCLI"; - this.mnu_killCLI.Size = new System.Drawing.Size(138, 22); + this.mnu_killCLI.Size = new System.Drawing.Size(152, 22); this.mnu_killCLI.Text = "Cancel Scan"; this.mnu_killCLI.Visible = false; this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click); @@ -572,7 +573,7 @@ namespace Handbrake // mnu_exit // this.mnu_exit.Name = "mnu_exit"; - this.mnu_exit.Size = new System.Drawing.Size(138, 22); + this.mnu_exit.Size = new System.Drawing.Size(152, 22); this.mnu_exit.Text = "E&xit"; this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click); // @@ -594,7 +595,7 @@ namespace Handbrake // // mnu_encode // - this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small; + this.mnu_encode.Image = ((System.Drawing.Image)(resources.GetObject("mnu_encode.Image"))); 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(184, 22); @@ -603,7 +604,7 @@ namespace Handbrake // // mnu_encodeLog // - this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small; + this.mnu_encodeLog.Image = ((System.Drawing.Image)(resources.GetObject("mnu_encodeLog.Image"))); this.mnu_encodeLog.Name = "mnu_encodeLog"; this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22); this.mnu_encodeLog.Text = "Activity Window"; @@ -616,7 +617,7 @@ namespace Handbrake // // mnu_options // - this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small; + this.mnu_options.Image = ((System.Drawing.Image)(resources.GetObject("mnu_options.Image"))); this.mnu_options.Name = "mnu_options"; this.mnu_options.Size = new System.Drawing.Size(184, 22); this.mnu_options.Text = "Options"; @@ -693,7 +694,7 @@ namespace Handbrake // // mnu_user_guide // - this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16; + this.mnu_user_guide.Image = ((System.Drawing.Image)(resources.GetObject("mnu_user_guide.Image"))); this.mnu_user_guide.Name = "mnu_user_guide"; this.mnu_user_guide.Size = new System.Drawing.Size(194, 22); this.mnu_user_guide.Text = "HandBrake User Guide"; @@ -701,7 +702,7 @@ namespace Handbrake // // mnu_handbrake_home // - this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16; + this.mnu_handbrake_home.Image = ((System.Drawing.Image)(resources.GetObject("mnu_handbrake_home.Image"))); this.mnu_handbrake_home.Name = "mnu_handbrake_home"; this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22); this.mnu_handbrake_home.Text = "HandBrake Homepage"; @@ -733,7 +734,7 @@ namespace Handbrake // // mnu_about // - this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16; + this.mnu_about.Image = ((System.Drawing.Image)(resources.GetObject("mnu_about.Image"))); this.mnu_about.Name = "mnu_about"; this.mnu_about.Size = new System.Drawing.Size(194, 22); this.mnu_about.Text = "About..."; @@ -798,6 +799,15 @@ namespace Handbrake this.tab_audio.Text = "Audio"; this.tab_audio.UseVisualStyleBackColor = true; // + // AudioSettings + // + this.AudioSettings.BackColor = System.Drawing.Color.Transparent; + this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.AudioSettings.Location = new System.Drawing.Point(0, 0); + this.AudioSettings.Name = "AudioSettings"; + this.AudioSettings.Size = new System.Drawing.Size(715, 310); + this.AudioSettings.TabIndex = 0; + // // AudioMenuRowHeightHack // this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; @@ -807,6 +817,7 @@ namespace Handbrake // tab_video // this.tab_video.BackColor = System.Drawing.Color.Transparent; + this.tab_video.Controls.Add(this.lbl_QualityValue); this.tab_video.Controls.Add(this.radio_cq); this.tab_video.Controls.Add(this.radio_avgBitrate); this.tab_video.Controls.Add(this.radio_targetFilesize); @@ -819,7 +830,7 @@ namespace Handbrake this.tab_video.Controls.Add(this.text_filesize); this.tab_video.Controls.Add(this.slider_videoQuality); this.tab_video.Controls.Add(this.text_bitrate); - this.tab_video.Controls.Add(this.SliderValue); + this.tab_video.Controls.Add(this.lbl_SliderValue); this.tab_video.Controls.Add(this.Label46); this.tab_video.Controls.Add(this.drp_videoFramerate); this.tab_video.Location = new System.Drawing.Point(4, 22); @@ -830,6 +841,16 @@ namespace Handbrake this.tab_video.Text = "Video"; this.tab_video.UseVisualStyleBackColor = true; // + // lbl_QualityValue + // + this.lbl_QualityValue.AutoSize = true; + this.lbl_QualityValue.BackColor = System.Drawing.Color.Transparent; + this.lbl_QualityValue.Location = new System.Drawing.Point(541, 100); + this.lbl_QualityValue.Name = "lbl_QualityValue"; + this.lbl_QualityValue.Size = new System.Drawing.Size(24, 13); + this.lbl_QualityValue.TabIndex = 19; + this.lbl_QualityValue.Text = "0%"; + // // radio_cq // this.radio_cq.AutoSize = true; @@ -902,15 +923,16 @@ namespace Handbrake this.Label2.TabIndex = 8; this.Label2.Text = "Quality"; // - // SliderValue + // lbl_SliderValue // - this.SliderValue.AutoSize = true; - this.SliderValue.BackColor = System.Drawing.Color.Transparent; - this.SliderValue.Location = new System.Drawing.Point(480, 100); - this.SliderValue.Name = "SliderValue"; - this.SliderValue.Size = new System.Drawing.Size(24, 13); - this.SliderValue.TabIndex = 15; - this.SliderValue.Text = "0%"; + this.lbl_SliderValue.AutoSize = true; + this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent; + this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_SliderValue.Location = new System.Drawing.Point(480, 100); + this.lbl_SliderValue.Name = "lbl_SliderValue"; + this.lbl_SliderValue.Size = new System.Drawing.Size(24, 13); + this.lbl_SliderValue.TabIndex = 15; + this.lbl_SliderValue.Text = "RF:"; // // Label46 // @@ -934,6 +956,16 @@ namespace Handbrake this.tab_picture.Text = "Picture"; this.tab_picture.UseVisualStyleBackColor = true; // + // PictureSettings + // + this.PictureSettings.BackColor = System.Drawing.Color.Transparent; + this.PictureSettings.Enabled = false; + 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.Name = "PictureSettings"; + this.PictureSettings.Size = new System.Drawing.Size(666, 279); + this.PictureSettings.TabIndex = 0; + // // Check_ChapterMarkers // this.Check_ChapterMarkers.AutoSize = true; @@ -973,6 +1005,15 @@ namespace Handbrake this.tab_filters.Text = "Video Filters"; this.tab_filters.UseVisualStyleBackColor = true; // + // Filters + // + this.Filters.BackColor = System.Drawing.Color.Transparent; + this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Filters.Location = new System.Drawing.Point(0, 0); + this.Filters.Name = "Filters"; + this.Filters.Size = new System.Drawing.Size(713, 310); + this.Filters.TabIndex = 0; + // // tab_subtitles // this.tab_subtitles.Controls.Add(this.Subtitles); @@ -984,6 +1025,15 @@ namespace Handbrake this.tab_subtitles.Text = "Subtitles"; this.tab_subtitles.UseVisualStyleBackColor = true; // + // Subtitles + // + this.Subtitles.BackColor = System.Drawing.Color.Transparent; + this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Subtitles.Location = new System.Drawing.Point(0, 0); + this.Subtitles.Name = "Subtitles"; + this.Subtitles.Size = new System.Drawing.Size(722, 310); + this.Subtitles.TabIndex = 0; + // // tab_chapters // this.tab_chapters.BackColor = System.Drawing.Color.Transparent; @@ -1021,6 +1071,16 @@ namespace Handbrake this.tab_advanced.Text = "Advanced"; this.tab_advanced.UseVisualStyleBackColor = true; // + // x264Panel + // + this.x264Panel.BackColor = System.Drawing.Color.Transparent; + this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.x264Panel.Location = new System.Drawing.Point(0, 0); + this.x264Panel.Name = "x264Panel"; + this.x264Panel.Size = new System.Drawing.Size(720, 306); + this.x264Panel.TabIndex = 0; + this.x264Panel.x264Query = ""; + // // tab_query // this.tab_query.Controls.Add(this.btn_clear); @@ -1226,7 +1286,7 @@ namespace Handbrake this.btn_dvd_source, this.toolStripSeparator1, this.mnu_dvd_drive}); - this.btn_source.Image = global::Handbrake.Properties.Resources.Movies; + this.btn_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_source.Image"))); this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_source.Name = "btn_source"; @@ -1237,7 +1297,7 @@ namespace Handbrake // // btn_file_source // - this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small; + this.btn_file_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_file_source.Image"))); this.btn_file_source.Name = "btn_file_source"; this.btn_file_source.Size = new System.Drawing.Size(192, 22); this.btn_file_source.Text = "Video File"; @@ -1259,7 +1319,7 @@ namespace Handbrake // // mnu_dvd_drive // - this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small; + this.mnu_dvd_drive.Image = ((System.Drawing.Image)(resources.GetObject("mnu_dvd_drive.Image"))); this.mnu_dvd_drive.Name = "mnu_dvd_drive"; this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22); this.mnu_dvd_drive.Text = "[No DVD Drive Ready]"; @@ -1273,7 +1333,7 @@ namespace Handbrake // // btn_start // - this.btn_start.Image = global::Handbrake.Properties.Resources.Play; + this.btn_start.Image = ((System.Drawing.Image)(resources.GetObject("btn_start.Image"))); this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_start.Name = "btn_start"; @@ -1284,7 +1344,7 @@ namespace Handbrake // // btn_add2Queue // - this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue; + this.btn_add2Queue.Image = ((System.Drawing.Image)(resources.GetObject("btn_add2Queue.Image"))); this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_add2Queue.Name = "btn_add2Queue"; @@ -1295,7 +1355,7 @@ namespace Handbrake // // btn_showQueue // - this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue; + this.btn_showQueue.Image = ((System.Drawing.Image)(resources.GetObject("btn_showQueue.Image"))); this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_showQueue.Name = "btn_showQueue"; @@ -1311,7 +1371,7 @@ namespace Handbrake // // tb_preview // - this.tb_preview.Image = global::Handbrake.Properties.Resources.window; + this.tb_preview.Image = ((System.Drawing.Image)(resources.GetObject("tb_preview.Image"))); this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta; this.tb_preview.Name = "tb_preview"; @@ -1321,7 +1381,7 @@ namespace Handbrake // // btn_ActivityWindow // - this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow; + this.btn_ActivityWindow.Image = ((System.Drawing.Image)(resources.GetObject("btn_ActivityWindow.Image"))); this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_ActivityWindow.Name = "btn_ActivityWindow"; @@ -1594,53 +1654,6 @@ namespace Handbrake // this.File_ChapterImport.Filter = "CSV Files|*.csv"; // - // PictureSettings - // - this.PictureSettings.BackColor = System.Drawing.Color.Transparent; - this.PictureSettings.Enabled = false; - 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.Name = "PictureSettings"; - this.PictureSettings.Size = new System.Drawing.Size(666, 279); - this.PictureSettings.TabIndex = 0; - // - // Filters - // - this.Filters.BackColor = System.Drawing.Color.Transparent; - this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Filters.Location = new System.Drawing.Point(0, 0); - this.Filters.Name = "Filters"; - this.Filters.Size = new System.Drawing.Size(713, 310); - this.Filters.TabIndex = 0; - // - // AudioSettings - // - this.AudioSettings.BackColor = System.Drawing.Color.Transparent; - this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.AudioSettings.Location = new System.Drawing.Point(0, 0); - this.AudioSettings.Name = "AudioSettings"; - this.AudioSettings.Size = new System.Drawing.Size(715, 310); - this.AudioSettings.TabIndex = 0; - // - // Subtitles - // - this.Subtitles.BackColor = System.Drawing.Color.Transparent; - this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Subtitles.Location = new System.Drawing.Point(0, 0); - this.Subtitles.Name = "Subtitles"; - this.Subtitles.Size = new System.Drawing.Size(722, 310); - this.Subtitles.TabIndex = 0; - // - // x264Panel - // - this.x264Panel.BackColor = System.Drawing.Color.Transparent; - this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.x264Panel.Location = new System.Drawing.Point(0, 0); - this.x264Panel.Name = "x264Panel"; - this.x264Panel.Size = new System.Drawing.Size(720, 306); - this.x264Panel.TabIndex = 0; - this.x264Panel.x264Query = ""; - // // frmMain // this.AllowDrop = true; @@ -1732,7 +1745,7 @@ namespace Handbrake internal System.Windows.Forms.CheckBox check_largeFile; internal System.Windows.Forms.CheckBox check_turbo; internal System.Windows.Forms.Label Label2; - internal System.Windows.Forms.Label SliderValue; + internal System.Windows.Forms.Label lbl_SliderValue; internal System.Windows.Forms.ComboBox drp_videoFramerate; internal System.Windows.Forms.CheckBox check_2PassEncode; internal System.Windows.Forms.TrackBar slider_videoQuality; @@ -1844,5 +1857,6 @@ namespace Handbrake private ToolStripMenuItem mnu_resetChapters; private ToolStripMenuItem pmnu_import; private ToolStripSeparator toolStripSeparator2; + internal Label lbl_QualityValue; } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 7be3a9ce..e23e285b 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -1312,7 +1312,8 @@ namespace Handbrake double max = slider_videoQuality.Maximum; double min = slider_videoQuality.Minimum; double val = ((max - min) - (rfValue - min)) / (max - min); - SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + (32 - slider_videoQuality.Value); + lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value); + lbl_QualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%"; break; case "H.264 (x264)": rfValue = 51.0 - slider_videoQuality.Value * cqStep; @@ -1320,12 +1321,14 @@ namespace Handbrake min = slider_videoQuality.Minimum; val = ((max - min) - (rfValue - min)) / (max - min); rfValue = Math.Round(rfValue, 2); - SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% RF:" + rfValue.ToString(new CultureInfo("en-US")); + lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US")); + lbl_QualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%"; break; case "VP3 (Theora)": rfValue = slider_videoQuality.Value; double value = rfValue / 63; - SliderValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + slider_videoQuality.Value; + lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value; + lbl_QualityValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "%"; break; } } -- 2.11.0