WinGui:

- Few UI usability tweaks.

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

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index 0ac76d5..d0647a3 100644 (file)
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -137,19 +137,19 @@ namespace Handbrake.Controls
             this.toolStripSeparator2,\r
             this.audioList_remove});\r
             this.audioMenu.Name = "audioMenu";\r
-            this.audioMenu.Size = new System.Drawing.Size(142, 76);\r
+            this.audioMenu.Size = new System.Drawing.Size(139, 76);\r
             // \r
             // audioList_moveup\r
             // \r
             this.audioList_moveup.Name = "audioList_moveup";\r
-            this.audioList_moveup.Size = new System.Drawing.Size(141, 22);\r
+            this.audioList_moveup.Size = new System.Drawing.Size(138, 22);\r
             this.audioList_moveup.Text = "Move Up";\r
             this.audioList_moveup.Click += new System.EventHandler(this.audioList_moveup_Click);\r
             // \r
             // audioList_movedown\r
             // \r
             this.audioList_movedown.Name = "audioList_movedown";\r
-            this.audioList_movedown.Size = new System.Drawing.Size(141, 22);\r
+            this.audioList_movedown.Size = new System.Drawing.Size(138, 22);\r
             this.audioList_movedown.Text = "Move Down";\r
             this.audioList_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.audioList_movedown.Click += new System.EventHandler(this.audioList_movedown_Click);\r
@@ -157,12 +157,12 @@ namespace Handbrake.Controls
             // toolStripSeparator2\r
             // \r
             this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6);\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(135, 6);\r
             // \r
             // audioList_remove\r
             // \r
             this.audioList_remove.Name = "audioList_remove";\r
-            this.audioList_remove.Size = new System.Drawing.Size(141, 22);\r
+            this.audioList_remove.Size = new System.Drawing.Size(138, 22);\r
             this.audioList_remove.Text = "Remove";\r
             this.audioList_remove.Click += new System.EventHandler(this.audioList_remove_Click);\r
             // \r
@@ -214,6 +214,7 @@ namespace Handbrake.Controls
             // \r
             // tb_drc\r
             // \r
+            this.tb_drc.BackColor = System.Drawing.SystemColors.Window;\r
             this.tb_drc.LargeChange = 0;\r
             this.tb_drc.Location = new System.Drawing.Point(598, 29);\r
             this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r

diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs
index cc2346a..bdcc9c6 100644 (file)
--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -210,6 +210,7 @@
             // \r
             this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\r
                         | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;\r
             this.slider_deblock.Location = new System.Drawing.Point(71, 111);\r
             this.slider_deblock.Maximum = 15;\r
             this.slider_deblock.Minimum = 4;\r

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index 206a0b6..b78f2e0 100644 (file)
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -81,6 +81,7 @@ namespace Handbrake.Controls
             // \r
             // slider_psytrellis\r
             // \r
+            this.slider_psytrellis.BackColor = System.Drawing.SystemColors.Window;\r
             this.slider_psytrellis.Location = new System.Drawing.Point(436, 194);\r
             this.slider_psytrellis.Name = "slider_psytrellis";\r
             this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);\r
@@ -110,6 +111,7 @@ namespace Handbrake.Controls
             // \r
             // slider_psyrd\r
             // \r
+            this.slider_psyrd.BackColor = System.Drawing.SystemColors.Window;\r
             this.slider_psyrd.Location = new System.Drawing.Point(436, 153);\r
             this.slider_psyrd.Name = "slider_psyrd";\r
             this.slider_psyrd.Size = new System.Drawing.Size(131, 45);\r

diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx
index 064df4a..97759c0 100644 (file)
--- a/win/C#/Controls/x264Panel.resx
+++ b/win/C#/Controls/x264Panel.resx
@@ -120,9 +120,6 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 17</value>\r
-  </metadata>\r
   <data name="slider_psyrd.ToolTip" xml:space="preserve">\r
     <value>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, \r
 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.</value>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 0c791c2..1467b86 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,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.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -100,24 +100,30 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
+            this.lbl_QualityValue = new System.Windows.Forms.Label();\r
             this.radio_cq = new System.Windows.Forms.RadioButton();\r
             this.radio_avgBitrate = new System.Windows.Forms.RadioButton();\r
             this.radio_targetFilesize = new System.Windows.Forms.RadioButton();\r
             this.label25 = new System.Windows.Forms.Label();\r
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.Label2 = new System.Windows.Forms.Label();\r
-            this.SliderValue = new System.Windows.Forms.Label();\r
+            this.lbl_SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             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.Filters = new Handbrake.Controls.Filters();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = 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
@@ -171,11 +177,6 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
-            this.Filters = new Handbrake.Controls.Filters();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\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
@@ -306,6 +307,7 @@ namespace Handbrake
             // \r
             // slider_videoQuality\r
             // \r
+            this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window;\r
             this.slider_videoQuality.Enabled = false;\r
             this.slider_videoQuality.Location = new System.Drawing.Point(347, 120);\r
             this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0);\r
@@ -314,8 +316,7 @@ namespace Handbrake
             this.slider_videoQuality.Size = new System.Drawing.Size(322, 45);\r
             this.slider_videoQuality.TabIndex = 14;\r
             this.slider_videoQuality.TickFrequency = 17;\r
-            this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. Typical sane values are between 59~63%. \r\n>70" +\r
-                    "% will likely result in the output file being larger than the input file.");\r
+            this.ToolTip.SetToolTip(this.slider_videoQuality, resources.GetString("slider_videoQuality.ToolTip"));\r
             this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll);\r
             // \r
             // text_filesize\r
@@ -400,9 +401,9 @@ namespace Handbrake
             // \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.Frozen = true;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
@@ -564,7 +565,7 @@ namespace Handbrake
             // mnu_killCLI\r
             // \r
             this.mnu_killCLI.Name = "mnu_killCLI";\r
-            this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);\r
+            this.mnu_killCLI.Size = new System.Drawing.Size(152, 22);\r
             this.mnu_killCLI.Text = "Cancel Scan";\r
             this.mnu_killCLI.Visible = false;\r
             this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);\r
@@ -572,7 +573,7 @@ namespace Handbrake
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(138, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -594,7 +595,7 @@ namespace Handbrake
             // \r
             // mnu_encode\r
             // \r
-            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\r
+            this.mnu_encode.Image = ((System.Drawing.Image)(resources.GetObject("mnu_encode.Image")));\r
             this.mnu_encode.Name = "mnu_encode";\r
             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));\r
             this.mnu_encode.Size = new System.Drawing.Size(184, 22);\r
@@ -603,7 +604,7 @@ namespace Handbrake
             // \r
             // mnu_encodeLog\r
             // \r
-            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
+            this.mnu_encodeLog.Image = ((System.Drawing.Image)(resources.GetObject("mnu_encodeLog.Image")));\r
             this.mnu_encodeLog.Name = "mnu_encodeLog";\r
             this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22);\r
             this.mnu_encodeLog.Text = "Activity Window";\r
@@ -616,7 +617,7 @@ namespace Handbrake
             // \r
             // mnu_options\r
             // \r
-            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
+            this.mnu_options.Image = ((System.Drawing.Image)(resources.GetObject("mnu_options.Image")));\r
             this.mnu_options.Name = "mnu_options";\r
             this.mnu_options.Size = new System.Drawing.Size(184, 22);\r
             this.mnu_options.Text = "Options";\r
@@ -693,7 +694,7 @@ namespace Handbrake
             // \r
             // mnu_user_guide\r
             // \r
-            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
+            this.mnu_user_guide.Image = ((System.Drawing.Image)(resources.GetObject("mnu_user_guide.Image")));\r
             this.mnu_user_guide.Name = "mnu_user_guide";\r
             this.mnu_user_guide.Size = new System.Drawing.Size(194, 22);\r
             this.mnu_user_guide.Text = "HandBrake User Guide";\r
@@ -701,7 +702,7 @@ namespace Handbrake
             // \r
             // mnu_handbrake_home\r
             // \r
-            this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;\r
+            this.mnu_handbrake_home.Image = ((System.Drawing.Image)(resources.GetObject("mnu_handbrake_home.Image")));\r
             this.mnu_handbrake_home.Name = "mnu_handbrake_home";\r
             this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22);\r
             this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
@@ -733,7 +734,7 @@ namespace Handbrake
             // \r
             // mnu_about\r
             // \r
-            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
+            this.mnu_about.Image = ((System.Drawing.Image)(resources.GetObject("mnu_about.Image")));\r
             this.mnu_about.Name = "mnu_about";\r
             this.mnu_about.Size = new System.Drawing.Size(194, 22);\r
             this.mnu_about.Text = "About...";\r
@@ -798,6 +799,15 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -807,6 +817,7 @@ namespace Handbrake
             // tab_video\r
             // \r
             this.tab_video.BackColor = System.Drawing.Color.Transparent;\r
+            this.tab_video.Controls.Add(this.lbl_QualityValue);\r
             this.tab_video.Controls.Add(this.radio_cq);\r
             this.tab_video.Controls.Add(this.radio_avgBitrate);\r
             this.tab_video.Controls.Add(this.radio_targetFilesize);\r
@@ -819,7 +830,7 @@ namespace Handbrake
             this.tab_video.Controls.Add(this.text_filesize);\r
             this.tab_video.Controls.Add(this.slider_videoQuality);\r
             this.tab_video.Controls.Add(this.text_bitrate);\r
-            this.tab_video.Controls.Add(this.SliderValue);\r
+            this.tab_video.Controls.Add(this.lbl_SliderValue);\r
             this.tab_video.Controls.Add(this.Label46);\r
             this.tab_video.Controls.Add(this.drp_videoFramerate);\r
             this.tab_video.Location = new System.Drawing.Point(4, 22);\r
@@ -830,6 +841,16 @@ namespace Handbrake
             this.tab_video.Text = "Video";\r
             this.tab_video.UseVisualStyleBackColor = true;\r
             // \r
+            // lbl_QualityValue\r
+            // \r
+            this.lbl_QualityValue.AutoSize = true;\r
+            this.lbl_QualityValue.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_QualityValue.Location = new System.Drawing.Point(541, 100);\r
+            this.lbl_QualityValue.Name = "lbl_QualityValue";\r
+            this.lbl_QualityValue.Size = new System.Drawing.Size(24, 13);\r
+            this.lbl_QualityValue.TabIndex = 19;\r
+            this.lbl_QualityValue.Text = "0%";\r
+            // \r
             // radio_cq\r
             // \r
             this.radio_cq.AutoSize = true;\r
@@ -902,15 +923,16 @@ namespace Handbrake
             this.Label2.TabIndex = 8;\r
             this.Label2.Text = "Quality";\r
             // \r
-            // SliderValue\r
+            // lbl_SliderValue\r
             // \r
-            this.SliderValue.AutoSize = true;\r
-            this.SliderValue.BackColor = System.Drawing.Color.Transparent;\r
-            this.SliderValue.Location = new System.Drawing.Point(480, 100);\r
-            this.SliderValue.Name = "SliderValue";\r
-            this.SliderValue.Size = new System.Drawing.Size(24, 13);\r
-            this.SliderValue.TabIndex = 15;\r
-            this.SliderValue.Text = "0%";\r
+            this.lbl_SliderValue.AutoSize = true;\r
+            this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_SliderValue.Location = new System.Drawing.Point(480, 100);\r
+            this.lbl_SliderValue.Name = "lbl_SliderValue";\r
+            this.lbl_SliderValue.Size = new System.Drawing.Size(24, 13);\r
+            this.lbl_SliderValue.TabIndex = 15;\r
+            this.lbl_SliderValue.Text = "RF:";\r
             // \r
             // Label46\r
             // \r
@@ -934,6 +956,16 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
+            // PictureSettings\r
+            // \r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.PictureSettings.Enabled = false;\r
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -973,6 +1005,15 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
+            // Filters\r
+            // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -984,6 +1025,15 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";\r
             this.tab_subtitles.UseVisualStyleBackColor = true;\r
             // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
+            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1021,6 +1071,16 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\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
@@ -1226,7 +1286,7 @@ namespace Handbrake
             this.btn_dvd_source,\r
             this.toolStripSeparator1,\r
             this.mnu_dvd_drive});\r
-            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;\r
+            this.btn_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_source.Image")));\r
             this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_source.Name = "btn_source";\r
@@ -1237,7 +1297,7 @@ namespace Handbrake
             // \r
             // btn_file_source\r
             // \r
-            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
+            this.btn_file_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_file_source.Image")));\r
             this.btn_file_source.Name = "btn_file_source";\r
             this.btn_file_source.Size = new System.Drawing.Size(192, 22);\r
             this.btn_file_source.Text = "Video File";\r
@@ -1259,7 +1319,7 @@ namespace Handbrake
             // \r
             // mnu_dvd_drive\r
             // \r
-            this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;\r
+            this.mnu_dvd_drive.Image = ((System.Drawing.Image)(resources.GetObject("mnu_dvd_drive.Image")));\r
             this.mnu_dvd_drive.Name = "mnu_dvd_drive";\r
             this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";\r
@@ -1273,7 +1333,7 @@ namespace Handbrake
             // \r
             // btn_start\r
             // \r
-            this.btn_start.Image = global::Handbrake.Properties.Resources.Play;\r
+            this.btn_start.Image = ((System.Drawing.Image)(resources.GetObject("btn_start.Image")));\r
             this.btn_start.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_start.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_start.Name = "btn_start";\r
@@ -1284,7 +1344,7 @@ namespace Handbrake
             // \r
             // btn_add2Queue\r
             // \r
-            this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;\r
+            this.btn_add2Queue.Image = ((System.Drawing.Image)(resources.GetObject("btn_add2Queue.Image")));\r
             this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_add2Queue.Name = "btn_add2Queue";\r
@@ -1295,7 +1355,7 @@ namespace Handbrake
             // \r
             // btn_showQueue\r
             // \r
-            this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue;\r
+            this.btn_showQueue.Image = ((System.Drawing.Image)(resources.GetObject("btn_showQueue.Image")));\r
             this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_showQueue.Name = "btn_showQueue";\r
@@ -1311,7 +1371,7 @@ namespace Handbrake
             // \r
             // tb_preview\r
             // \r
-            this.tb_preview.Image = global::Handbrake.Properties.Resources.window;\r
+            this.tb_preview.Image = ((System.Drawing.Image)(resources.GetObject("tb_preview.Image")));\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
@@ -1321,7 +1381,7 @@ namespace Handbrake
             // \r
             // btn_ActivityWindow\r
             // \r
-            this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
+            this.btn_ActivityWindow.Image = ((System.Drawing.Image)(resources.GetObject("btn_ActivityWindow.Image")));\r
             this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_ActivityWindow.Name = "btn_ActivityWindow";\r
@@ -1594,53 +1654,6 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.PictureSettings.Enabled = false;\r
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
-            this.PictureSettings.TabIndex = 0;\r
-            // \r
-            // Filters\r
-            // \r
-            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Filters.Location = new System.Drawing.Point(0, 0);\r
-            this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(713, 310);\r
-            this.Filters.TabIndex = 0;\r
-            // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);\r
-            this.AudioSettings.TabIndex = 0;\r
-            // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
-            this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
-            this.Subtitles.TabIndex = 0;\r
-            // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\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
             this.AllowDrop = true;\r
@@ -1732,7 +1745,7 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_largeFile;\r
         internal System.Windows.Forms.CheckBox check_turbo;\r
         internal System.Windows.Forms.Label Label2;\r
-        internal System.Windows.Forms.Label SliderValue;\r
+        internal System.Windows.Forms.Label lbl_SliderValue;\r
         internal System.Windows.Forms.ComboBox drp_videoFramerate;\r
         internal System.Windows.Forms.CheckBox check_2PassEncode;\r
         internal System.Windows.Forms.TrackBar slider_videoQuality;\r
@@ -1844,5 +1857,6 @@ namespace Handbrake
         private ToolStripMenuItem mnu_resetChapters;\r
         private ToolStripMenuItem pmnu_import;\r
         private ToolStripSeparator toolStripSeparator2;\r
+        internal Label lbl_QualityValue;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 7be3a9c..e23e285 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1312,7 +1312,8 @@ namespace Handbrake
                     double max = slider_videoQuality.Maximum;\r
                     double min = slider_videoQuality.Minimum;\r
                     double val = ((max - min) - (rfValue - min)) / (max - min);\r
-                    SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + (32 - slider_videoQuality.Value);\r
+                    lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value);\r
+                    lbl_QualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
                 case "H.264 (x264)":\r
                     rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
@@ -1320,12 +1321,14 @@ namespace Handbrake
                     min = slider_videoQuality.Minimum;\r
                     val = ((max - min) - (rfValue - min)) / (max - min);\r
                     rfValue = Math.Round(rfValue, 2);\r
-                    SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% RF:" + rfValue.ToString(new CultureInfo("en-US"));\r
+                    lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US"));\r
+                    lbl_QualityValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
                 case "VP3 (Theora)":\r
                     rfValue = slider_videoQuality.Value;\r
                     double value = rfValue / 63;\r
-                    SliderValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + slider_videoQuality.Value;\r
+                    lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value;\r
+                    lbl_QualityValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "%";\r
                     break;\r
             }\r
         }\r