WinGui:

- Temporary Fix for Quality slider getting reset to 0 on title or encoder change.  Changing encoders may still cause a problem.
- Much smaller splash screen. (Just in case any popup errors decide to hide behind it on launch)
- Toolstrip now uses "Professional" appearance mode. On most systems it'll stand out more.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2633 b64f7644-9d1e-0410-96f1-a4d463321fa5

10 files changed, 109 insertions, 113 deletions

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index bcc4b1b26..b34fff85d 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -161,12 +161,8 @@ namespace Handbrake.Functions
                     int value;

                     System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");

 

-                    double x264step;

+                    double x264step = Properties.Settings.Default.x264cqstep;

                     double presetValue = presetQuery.VideoQuality;

-                    double.TryParse(Properties.Settings.Default.x264cqstep,

-                                    System.Globalization.NumberStyles.Number,

-                                    culture,

-                                    out x264step);

 

                     double x = 51 / x264step;

 

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 0394df6cf..a9a923a47 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -222,12 +222,7 @@ namespace Handbrake.Functions
                         query += " -q " + value.ToString(new CultureInfo("en-US"));

                         break;

                     case "H.264 (x264)":

-                        double divided;

-                        CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");

-                        double.TryParse(Properties.Settings.Default.x264cqstep,

-                                        NumberStyles.Number,

-                                        culture,

-                                        out divided);

+                        double divided = Properties.Settings.Default.x264cqstep;

                         value = 51 - mainWindow.slider_videoQuality.Value * divided;

                         value = Math.Round(value, 2);

                         query += " -q " + value.ToString(new CultureInfo("en-US"));

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 76b8490c5..f61126209 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -302,9 +302,9 @@ namespace Handbrake.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

         [global::System.Configuration.DefaultSettingValueAttribute("0.25")]

-        public string x264cqstep {

+        public double x264cqstep {

             get {

-                return ((string)(this["x264cqstep"]));

+                return ((double)(this["x264cqstep"]));

             }

             set {

                 this["x264cqstep"] = value;

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index df43d5f66..76bf6ca5a 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -71,7 +71,7 @@
     <Setting Name="QueryEditorTab" Type="System.Boolean" Scope="User">

       <Value Profile="(Default)">False</Value>

     </Setting>

-    <Setting Name="x264cqstep" Type="System.String" Scope="User">

+    <Setting Name="x264cqstep" Type="System.Double" Scope="User">

       <Value Profile="(Default)">0.25</Value>

     </Setting>

     <Setting Name="verboseLevel" Type="System.Int32" Scope="User">

diff --git a/win/C#/Resources/SplashScreen.jpg b/win/C#/Resources/SplashScreen.jpg
index ca1072d70..f9c18270b 100644
--- a/win/C#/Resources/SplashScreen.jpg
+++ b/win/C#/Resources/SplashScreen.jpg
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b201b475c..83751198e 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1228,7 +1228,6 @@ namespace Handbrake
             // 

             // toolStrip1

             // 

-            this.toolStrip1.BackColor = System.Drawing.Color.Transparent;

             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;

             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

             this.btn_source,

@@ -1241,7 +1240,7 @@ namespace Handbrake
             this.btn_ActivityWindow});

             this.toolStrip1.Location = new System.Drawing.Point(0, 24);

             this.toolStrip1.Name = "toolStrip1";

-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;

+            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

             this.toolStrip1.Size = new System.Drawing.Size(1000, 39);

             this.toolStrip1.TabIndex = 1;

             this.toolStrip1.Text = "toolStrip1";

@@ -1437,6 +1436,7 @@ namespace Handbrake
             // 

             // PictureSettings

             // 

+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;

             this.PictureSettings.Location = new System.Drawing.Point(0, 0);

             this.PictureSettings.Name = "PictureSettings";

             this.PictureSettings.Size = new System.Drawing.Size(713, 310);

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 69e429c4b..2f2583dcc 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -45,7 +45,7 @@ namespace Handbrake
             // Load and setup the splash screen in this thread

             splash = new frmSplashScreen();

             splash.Show();

-            Label lblStatus = new Label { Size = new Size(250, 20), Location = new Point(10, 280) };

+            Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };

             splash.Controls.Add(lblStatus);

 

             InitializeComponent();

@@ -974,37 +974,32 @@ namespace Handbrake
         // Output Settings

         private void drop_format_SelectedIndexChanged(object sender, EventArgs e)

         {

-            if (drop_format.SelectedIndex == 0)

-                setExtension(".mp4");

-            else if (drop_format.SelectedIndex == 1)

-                setExtension(".m4v");

-            else if (drop_format.SelectedIndex == 2)

-                setExtension(".mkv");

+            switch (drop_format.SelectedIndex)

+            {

+                case 0:

+                    setExtension(".mp4");

+                    break;

+                case 1:

+                    setExtension(".m4v");

+                    break;

+                case 2:

+                    setExtension(".mkv");

+                    break;

+            }

 

             AudioSettings.setAudioByContainer(drop_format.Text);

             Subtitles.setContainer(drop_format.SelectedIndex);

 

-            string oldval;

             if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))

             {

-                oldval = drp_videoEncoder.Text;

-                drp_videoEncoder.Items.Clear();

-                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

-                drp_videoEncoder.Items.Add("H.264 (x264)");

-                if (oldval == "VP3 (Theora)")

+                if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))

+                {

+                    drp_videoEncoder.Items.Remove("VP3 (Theora)");

                     drp_videoEncoder.SelectedIndex = 1;

-                else

-                    drp_videoEncoder.Text = oldval;

+                }

             }

             else if (drop_format.Text.Contains("MKV"))

-            {

-                oldval = drp_videoEncoder.Text;

-                drp_videoEncoder.Items.Clear();

-                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

-                drp_videoEncoder.Items.Add("H.264 (x264)");

                 drp_videoEncoder.Items.Add("VP3 (Theora)");

-                drp_videoEncoder.Text = oldval;

-            }

         }

         private void setExtension(string newExtension)

         {

@@ -1044,18 +1039,19 @@ namespace Handbrake
             switch (drp_videoEncoder.Text)

             {

                 case "MPEG-4 (FFmpeg)":

+                    if (slider_videoQuality.Value > 31)

+                        slider_videoQuality.Value = 20;   // Just reset to 70% QP 10 on encode change.

                     slider_videoQuality.Minimum = 1;

                     slider_videoQuality.Maximum = 31;

-                    slider_videoQuality.Value = 1;

-                    SliderValue.Text = "0% QP: 31.00";

                     break;

                 case "H.264 (x264)":

                     slider_videoQuality.Minimum = 0;

-                    slider_videoQuality.Value = 0;

                     slider_videoQuality.TickFrequency = 1;

-                    SliderValue.Text = "0% RF: 51.00";

-                    String step = Properties.Settings.Default.x264cqstep;

-                    switch (step)

+

+                    double multiplier = 1.0 / Properties.Settings.Default.x264cqstep;

+                    double value = slider_videoQuality.Value*multiplier;

+                    

+                    switch (Properties.Settings.Default.x264cqstep.ToString())

                     {

                         case "0.20":

                             slider_videoQuality.Maximum = 255;

@@ -1063,11 +1059,8 @@ namespace Handbrake
                         case "0.25":

                             slider_videoQuality.Maximum = 204;

                             break;

-                        case "0.33":

-                            slider_videoQuality.Maximum = 155;

-                            break;

                         case "0.50":

-                            slider_videoQuality.Maximum = 102;

+                            slider_videoQuality.Maximum = 40;

                             break;

                         case "1.0":

                             slider_videoQuality.Maximum = 51;

@@ -1076,12 +1069,15 @@ namespace Handbrake
                             slider_videoQuality.Maximum = 51;

                             break;

                     }

+                    if (value < slider_videoQuality.Maximum)

+                        slider_videoQuality.Value = slider_videoQuality.Maximum - (int)value;

+

                     break;

                 case "VP3 (Theora)":

+                    if (slider_videoQuality.Value > 63)

+                        slider_videoQuality.Value = 45;  // Just reset to 70% QP 45 on encode change.

                     slider_videoQuality.Minimum = 0;

                     slider_videoQuality.Maximum = 63;

-                    slider_videoQuality.Value = 0;

-                    SliderValue.Text = "0% QP: 0.00";

                     break;

             }

         }

@@ -1118,12 +1114,7 @@ namespace Handbrake
                     SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);

                     break;

                 case "H.264 (x264)":

-                    double divided;

-                    System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");

-                    double.TryParse(Properties.Settings.Default.x264cqstep,

-                                    System.Globalization.NumberStyles.Number,

-                                    culture,

-                                    out divided);

+                    double divided = Properties.Settings.Default.x264cqstep;

                     rfValue = 51.0 - slider_videoQuality.Value * divided;

                     max = slider_videoQuality.Maximum * divided;

                     min = slider_videoQuality.Minimum;

@@ -1513,7 +1504,7 @@ namespace Handbrake
         {

             if (presetHandler.checkIfPresetsAreOutOfDate())

                 if (!Properties.Settings.Default.presetNotification)

-                    MessageBox.Show(

+                    MessageBox.Show(this,

                     "HandBrake has determined your built-in presets are out of date... These presets will now be updated.",

                     "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);

 

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 7529291e2..3c0a81f89 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -119,7 +119,7 @@ namespace Handbrake
             numeric_updateCheckDays.Value = Properties.Settings.Default.daysBetweenUpdateCheck;

 

             // x264 step

-            drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep;

+            drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep.ToString();

 

             // Use Experimental dvdnav

             if (Properties.Settings.Default.dvdnav)

@@ -291,7 +291,21 @@ namespace Handbrake
 

         private void x264step_SelectedIndexChanged(object sender, EventArgs e)

         {

-            Properties.Settings.Default.x264cqstep = drop_x264step.Text;

+            switch (drop_x264step.SelectedIndex)

+            {

+                case 0:

+                    Properties.Settings.Default.x264cqstep = 1.0;

+                    break;

+                case 1:

+                    Properties.Settings.Default.x264cqstep = 0.50;

+                    break;

+                case 2:

+                    Properties.Settings.Default.x264cqstep = 0.25;

+                    break;

+                case 3:

+                    Properties.Settings.Default.x264cqstep = 0.20;

+                    break;

+            }

         }

 

         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 5a82d13d0..98d04d012 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -67,6 +67,11 @@ namespace Handbrake
             this.Destination = new System.Windows.Forms.ColumnHeader();

             this.EncoderVideo = new System.Windows.Forms.ColumnHeader();

             this.Audio = new System.Windows.Forms.ColumnHeader();

+            this.mnu_queue = new System.Windows.Forms.ContextMenuStrip(this.components);

+            this.mnu_up = new System.Windows.Forms.ToolStripMenuItem();

+            this.mnu_Down = new System.Windows.Forms.ToolStripMenuItem();

+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();

+            this.mnu_delete = new System.Windows.Forms.ToolStripMenuItem();

             this.statusStrip1 = new System.Windows.Forms.StatusStrip();

             this.lbl_encodesPending = new System.Windows.Forms.ToolStripStatusLabel();

             this.OpenFile = new System.Windows.Forms.OpenFileDialog();

@@ -74,17 +79,12 @@ namespace Handbrake
             this.panel3 = new System.Windows.Forms.Panel();

             this.panel2 = new System.Windows.Forms.Panel();

             this.panel1 = new System.Windows.Forms.Panel();

-            this.mnu_queue = new System.Windows.Forms.ContextMenuStrip(this.components);

-            this.mnu_up = new System.Windows.Forms.ToolStripMenuItem();

-            this.mnu_Down = new System.Windows.Forms.ToolStripMenuItem();

-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();

-            this.mnu_delete = new System.Windows.Forms.ToolStripMenuItem();

             this.toolStrip1.SuspendLayout();

+            this.mnu_queue.SuspendLayout();

             this.statusStrip1.SuspendLayout();

             this.splitContainer1.Panel1.SuspendLayout();

             this.splitContainer1.Panel2.SuspendLayout();

             this.splitContainer1.SuspendLayout();

-            this.mnu_queue.SuspendLayout();

             this.SuspendLayout();

             // 

             // btn_down

@@ -231,7 +231,7 @@ namespace Handbrake
             this.drop_button_queue});

             this.toolStrip1.Location = new System.Drawing.Point(0, 0);

             this.toolStrip1.Name = "toolStrip1";

-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;

+            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

             this.toolStrip1.Size = new System.Drawing.Size(779, 39);

             this.toolStrip1.TabIndex = 71;

             this.toolStrip1.Text = "toolStrip1";

@@ -242,7 +242,7 @@ namespace Handbrake
             this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_encode.Name = "btn_encode";

-            this.btn_encode.Size = new System.Drawing.Size(84, 36);

+            this.btn_encode.Size = new System.Drawing.Size(78, 36);

             this.btn_encode.Text = "Encode";

             this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);

             // 

@@ -253,7 +253,7 @@ namespace Handbrake
             this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_pause.Name = "btn_pause";

             this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

-            this.btn_pause.Size = new System.Drawing.Size(75, 36);

+            this.btn_pause.Size = new System.Drawing.Size(72, 36);

             this.btn_pause.Text = "Pause";

             this.btn_pause.Visible = false;

             this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);

@@ -275,14 +275,14 @@ namespace Handbrake
             this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.drop_button_queue.Name = "drop_button_queue";

-            this.drop_button_queue.Size = new System.Drawing.Size(89, 36);

+            this.drop_button_queue.Size = new System.Drawing.Size(84, 36);

             this.drop_button_queue.Text = "Queue";

             // 

             // mnu_batch

             // 

             this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;

             this.mnu_batch.Name = "mnu_batch";

-            this.mnu_batch.Size = new System.Drawing.Size(207, 22);

+            this.mnu_batch.Size = new System.Drawing.Size(190, 22);

             this.mnu_batch.Text = "Generate Batch Script";

             this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);

             // 

@@ -290,7 +290,7 @@ namespace Handbrake
             // 

             this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;

             this.mnu_import.Name = "mnu_import";

-            this.mnu_import.Size = new System.Drawing.Size(207, 22);

+            this.mnu_import.Size = new System.Drawing.Size(190, 22);

             this.mnu_import.Text = "Import Queue";

             this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);

             // 

@@ -298,21 +298,21 @@ namespace Handbrake
             // 

             this.mnu_export.Image = global::Handbrake.Properties.Resources.save;

             this.mnu_export.Name = "mnu_export";

-            this.mnu_export.Size = new System.Drawing.Size(207, 22);

+            this.mnu_export.Size = new System.Drawing.Size(190, 22);

             this.mnu_export.Text = "Export Queue";

             this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);

             // 

             // toolStripSeparator2

             // 

             this.toolStripSeparator2.Name = "toolStripSeparator2";

-            this.toolStripSeparator2.Size = new System.Drawing.Size(204, 6);

+            this.toolStripSeparator2.Size = new System.Drawing.Size(187, 6);

             // 

             // mnu_readd

             // 

             this.mnu_readd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;

             this.mnu_readd.Image = global::Handbrake.Properties.Resources.AddToQueue_small;

             this.mnu_readd.Name = "mnu_readd";

-            this.mnu_readd.Size = new System.Drawing.Size(207, 22);

+            this.mnu_readd.Size = new System.Drawing.Size(190, 22);

             this.mnu_readd.Text = "Re-Add Current Job";

             this.mnu_readd.Click += new System.EventHandler(this.mnu_readd_Click);

             // 

@@ -373,6 +373,42 @@ namespace Handbrake
             this.Audio.Text = "Audio Encoder";

             this.Audio.Width = 94;

             // 

+            // mnu_queue

+            // 

+            this.mnu_queue.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.mnu_up,

+            this.mnu_Down,

+            this.toolStripSeparator3,

+            this.mnu_delete});

+            this.mnu_queue.Name = "mnu_queue";

+            this.mnu_queue.Size = new System.Drawing.Size(142, 76);

+            // 

+            // mnu_up

+            // 

+            this.mnu_up.Name = "mnu_up";

+            this.mnu_up.Size = new System.Drawing.Size(141, 22);

+            this.mnu_up.Text = "Move Up";

+            this.mnu_up.Click += new System.EventHandler(this.mnu_up_Click);

+            // 

+            // mnu_Down

+            // 

+            this.mnu_Down.Name = "mnu_Down";

+            this.mnu_Down.Size = new System.Drawing.Size(141, 22);

+            this.mnu_Down.Text = "Move Down";

+            this.mnu_Down.Click += new System.EventHandler(this.mnu_Down_Click);

+            // 

+            // toolStripSeparator3

+            // 

+            this.toolStripSeparator3.Name = "toolStripSeparator3";

+            this.toolStripSeparator3.Size = new System.Drawing.Size(138, 6);

+            // 

+            // mnu_delete

+            // 

+            this.mnu_delete.Name = "mnu_delete";

+            this.mnu_delete.Size = new System.Drawing.Size(141, 22);

+            this.mnu_delete.Text = "Delete";

+            this.mnu_delete.Click += new System.EventHandler(this.mnu_delete_Click);

+            // 

             // statusStrip1

             // 

             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

@@ -388,7 +424,7 @@ namespace Handbrake
             this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

             this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);

             this.lbl_encodesPending.Name = "lbl_encodesPending";

-            this.lbl_encodesPending.Size = new System.Drawing.Size(122, 17);

+            this.lbl_encodesPending.Size = new System.Drawing.Size(105, 17);

             this.lbl_encodesPending.Text = "0 encode(s) pending";

             // 

             // OpenFile

@@ -454,42 +490,6 @@ namespace Handbrake
             this.panel1.Size = new System.Drawing.Size(15, 234);

             this.panel1.TabIndex = 75;

             // 

-            // mnu_queue

-            // 

-            this.mnu_queue.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.mnu_up,

-            this.mnu_Down,

-            this.toolStripSeparator3,

-            this.mnu_delete});

-            this.mnu_queue.Name = "mnu_queue";

-            this.mnu_queue.Size = new System.Drawing.Size(153, 98);

-            // 

-            // mnu_up

-            // 

-            this.mnu_up.Name = "mnu_up";

-            this.mnu_up.Size = new System.Drawing.Size(152, 22);

-            this.mnu_up.Text = "Move Up";

-            this.mnu_up.Click += new System.EventHandler(this.mnu_up_Click);

-            // 

-            // mnu_Down

-            // 

-            this.mnu_Down.Name = "mnu_Down";

-            this.mnu_Down.Size = new System.Drawing.Size(152, 22);

-            this.mnu_Down.Text = "Move Down";

-            this.mnu_Down.Click += new System.EventHandler(this.mnu_Down_Click);

-            // 

-            // toolStripSeparator3

-            // 

-            this.toolStripSeparator3.Name = "toolStripSeparator3";

-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);

-            // 

-            // mnu_delete

-            // 

-            this.mnu_delete.Name = "mnu_delete";

-            this.mnu_delete.Size = new System.Drawing.Size(152, 22);

-            this.mnu_delete.Text = "Delete";

-            this.mnu_delete.Click += new System.EventHandler(this.mnu_delete_Click);

-            // 

             // frmQueue

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

@@ -506,13 +506,13 @@ namespace Handbrake
             this.Text = "Encode Queue";

             this.toolStrip1.ResumeLayout(false);

             this.toolStrip1.PerformLayout();

+            this.mnu_queue.ResumeLayout(false);

             this.statusStrip1.ResumeLayout(false);

             this.statusStrip1.PerformLayout();

             this.splitContainer1.Panel1.ResumeLayout(false);

             this.splitContainer1.Panel1.PerformLayout();

             this.splitContainer1.Panel2.ResumeLayout(false);

             this.splitContainer1.ResumeLayout(false);

-            this.mnu_queue.ResumeLayout(false);

             this.ResumeLayout(false);

             this.PerformLayout();

 

diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index 51891e417..350cfab47 100644
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -44,7 +44,7 @@ namespace Handbrake
             this.BackColor = System.Drawing.Color.White;

             this.BackgroundImage = global::Handbrake.Properties.Resources.SplashScreen;

             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;

-            this.ClientSize = new System.Drawing.Size(496, 303);

+            this.ClientSize = new System.Drawing.Size(400, 180);

             this.ControlBox = false;

             this.Font = new System.Drawing.Font("Corbel", 8.25F);

             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;