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://localhost/HandBrake/trunk@2633 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index bcc4b1b..b34fff8 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -161,12 +161,8 @@ namespace Handbrake.Functions
                     int value;\r
                     System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");\r
 \r
-                    double x264step;\r
+                    double x264step = Properties.Settings.Default.x264cqstep;\r
                     double presetValue = presetQuery.VideoQuality;\r
-                    double.TryParse(Properties.Settings.Default.x264cqstep,\r
-                                    System.Globalization.NumberStyles.Number,\r
-                                    culture,\r
-                                    out x264step);\r
 \r
                     double x = 51 / x264step;\r
 \r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 0394df6..a9a923a 100644 (file)
--- 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"));\r
                         break;\r
                     case "H.264 (x264)":\r
-                        double divided;\r
-                        CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
-                        double.TryParse(Properties.Settings.Default.x264cqstep,\r
-                                        NumberStyles.Number,\r
-                                        culture,\r
-                                        out divided);\r
+                        double divided = Properties.Settings.Default.x264cqstep;\r
                         value = 51 - mainWindow.slider_videoQuality.Value * divided;\r
                         value = Math.Round(value, 2);\r
                         query += " -q " + value.ToString(new CultureInfo("en-US"));\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 76b8490..f611262 100644 (file)
--- 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()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("0.25")]\r
-        public string x264cqstep {\r
+        public double x264cqstep {\r
             get {\r
-                return ((string)(this["x264cqstep"]));\r
+                return ((double)(this["x264cqstep"]));\r
             }\r
             set {\r
                 this["x264cqstep"] = value;\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index df43d5f..76bf6ca 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -71,7 +71,7 @@
     <Setting Name="QueryEditorTab" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">False</Value>\r
     </Setting>\r
-    <Setting Name="x264cqstep" Type="System.String" Scope="User">\r
+    <Setting Name="x264cqstep" Type="System.Double" Scope="User">\r
       <Value Profile="(Default)">0.25</Value>\r
     </Setting>\r
     <Setting Name="verboseLevel" Type="System.Int32" Scope="User">\r

diff --git a/win/C#/Resources/SplashScreen.jpg b/win/C#/Resources/SplashScreen.jpg
index ca1072d..f9c1827 100644 (file)
Binary files a/win/C#/Resources/SplashScreen.jpg and b/win/C#/Resources/SplashScreen.jpg differ

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b201b47..8375119 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1228,7 +1228,6 @@ namespace Handbrake
             // \r
             // toolStrip1\r
             // \r
-            this.toolStrip1.BackColor = System.Drawing.Color.Transparent;\r
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.btn_source,\r
@@ -1241,7 +1240,7 @@ namespace Handbrake
             this.btn_ActivityWindow});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);\r
             this.toolStrip1.Name = "toolStrip1";\r
-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
+            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
             this.toolStrip1.Size = new System.Drawing.Size(1000, 39);\r
             this.toolStrip1.TabIndex = 1;\r
             this.toolStrip1.Text = "toolStrip1";\r
@@ -1437,6 +1436,7 @@ namespace Handbrake
             // \r
             // PictureSettings\r
             // \r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
             this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
             this.PictureSettings.Name = "PictureSettings";\r
             this.PictureSettings.Size = new System.Drawing.Size(713, 310);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 69e429c..2f2583d 100644 (file)
--- 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\r
             splash = new frmSplashScreen();\r
             splash.Show();\r
-            Label lblStatus = new Label { Size = new Size(250, 20), Location = new Point(10, 280) };\r
+            Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };\r
             splash.Controls.Add(lblStatus);\r
 \r
             InitializeComponent();\r
@@ -974,37 +974,32 @@ namespace Handbrake
         // Output Settings\r
         private void drop_format_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drop_format.SelectedIndex == 0)\r
-                setExtension(".mp4");\r
-            else if (drop_format.SelectedIndex == 1)\r
-                setExtension(".m4v");\r
-            else if (drop_format.SelectedIndex == 2)\r
-                setExtension(".mkv");\r
+            switch (drop_format.SelectedIndex)\r
+            {\r
+                case 0:\r
+                    setExtension(".mp4");\r
+                    break;\r
+                case 1:\r
+                    setExtension(".m4v");\r
+                    break;\r
+                case 2:\r
+                    setExtension(".mkv");\r
+                    break;\r
+            }\r
 \r
             AudioSettings.setAudioByContainer(drop_format.Text);\r
             Subtitles.setContainer(drop_format.SelectedIndex);\r
 \r
-            string oldval;\r
             if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r
             {\r
-                oldval = drp_videoEncoder.Text;\r
-                drp_videoEncoder.Items.Clear();\r
-                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");\r
-                drp_videoEncoder.Items.Add("H.264 (x264)");\r
-                if (oldval == "VP3 (Theora)")\r
+                if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))\r
+                {\r
+                    drp_videoEncoder.Items.Remove("VP3 (Theora)");\r
                     drp_videoEncoder.SelectedIndex = 1;\r
-                else\r
-                    drp_videoEncoder.Text = oldval;\r
+                }\r
             }\r
             else if (drop_format.Text.Contains("MKV"))\r
-            {\r
-                oldval = drp_videoEncoder.Text;\r
-                drp_videoEncoder.Items.Clear();\r
-                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");\r
-                drp_videoEncoder.Items.Add("H.264 (x264)");\r
                 drp_videoEncoder.Items.Add("VP3 (Theora)");\r
-                drp_videoEncoder.Text = oldval;\r
-            }\r
         }\r
         private void setExtension(string newExtension)\r
         {\r
@@ -1044,18 +1039,19 @@ namespace Handbrake
             switch (drp_videoEncoder.Text)\r
             {\r
                 case "MPEG-4 (FFmpeg)":\r
+                    if (slider_videoQuality.Value > 31)\r
+                        slider_videoQuality.Value = 20;   // Just reset to 70% QP 10 on encode change.\r
                     slider_videoQuality.Minimum = 1;\r
                     slider_videoQuality.Maximum = 31;\r
-                    slider_videoQuality.Value = 1;\r
-                    SliderValue.Text = "0% QP: 31.00";\r
                     break;\r
                 case "H.264 (x264)":\r
                     slider_videoQuality.Minimum = 0;\r
-                    slider_videoQuality.Value = 0;\r
                     slider_videoQuality.TickFrequency = 1;\r
-                    SliderValue.Text = "0% RF: 51.00";\r
-                    String step = Properties.Settings.Default.x264cqstep;\r
-                    switch (step)\r
+\r
+                    double multiplier = 1.0 / Properties.Settings.Default.x264cqstep;\r
+                    double value = slider_videoQuality.Value*multiplier;\r
+                    \r
+                    switch (Properties.Settings.Default.x264cqstep.ToString())\r
                     {\r
                         case "0.20":\r
                             slider_videoQuality.Maximum = 255;\r
@@ -1063,11 +1059,8 @@ namespace Handbrake
                         case "0.25":\r
                             slider_videoQuality.Maximum = 204;\r
                             break;\r
-                        case "0.33":\r
-                            slider_videoQuality.Maximum = 155;\r
-                            break;\r
                         case "0.50":\r
-                            slider_videoQuality.Maximum = 102;\r
+                            slider_videoQuality.Maximum = 40;\r
                             break;\r
                         case "1.0":\r
                             slider_videoQuality.Maximum = 51;\r
@@ -1076,12 +1069,15 @@ namespace Handbrake
                             slider_videoQuality.Maximum = 51;\r
                             break;\r
                     }\r
+                    if (value < slider_videoQuality.Maximum)\r
+                        slider_videoQuality.Value = slider_videoQuality.Maximum - (int)value;\r
+\r
                     break;\r
                 case "VP3 (Theora)":\r
+                    if (slider_videoQuality.Value > 63)\r
+                        slider_videoQuality.Value = 45;  // Just reset to 70% QP 45 on encode change.\r
                     slider_videoQuality.Minimum = 0;\r
                     slider_videoQuality.Maximum = 63;\r
-                    slider_videoQuality.Value = 0;\r
-                    SliderValue.Text = "0% QP: 0.00";\r
                     break;\r
             }\r
         }\r
@@ -1118,12 +1114,7 @@ namespace Handbrake
                     SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);\r
                     break;\r
                 case "H.264 (x264)":\r
-                    double divided;\r
-                    System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");\r
-                    double.TryParse(Properties.Settings.Default.x264cqstep,\r
-                                    System.Globalization.NumberStyles.Number,\r
-                                    culture,\r
-                                    out divided);\r
+                    double divided = Properties.Settings.Default.x264cqstep;\r
                     rfValue = 51.0 - slider_videoQuality.Value * divided;\r
                     max = slider_videoQuality.Maximum * divided;\r
                     min = slider_videoQuality.Minimum;\r
@@ -1513,7 +1504,7 @@ namespace Handbrake
         {\r
             if (presetHandler.checkIfPresetsAreOutOfDate())\r
                 if (!Properties.Settings.Default.presetNotification)\r
-                    MessageBox.Show(\r
+                    MessageBox.Show(this,\r
                     "HandBrake has determined your built-in presets are out of date... These presets will now be updated.",\r
                     "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
 \r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 7529291..3c0a81f 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -119,7 +119,7 @@ namespace Handbrake
             numeric_updateCheckDays.Value = Properties.Settings.Default.daysBetweenUpdateCheck;\r
 \r
             // x264 step\r
-            drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep;\r
+            drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep.ToString();\r
 \r
             // Use Experimental dvdnav\r
             if (Properties.Settings.Default.dvdnav)\r
@@ -291,7 +291,21 @@ namespace Handbrake
 \r
         private void x264step_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            Properties.Settings.Default.x264cqstep = drop_x264step.Text;\r
+            switch (drop_x264step.SelectedIndex)\r
+            {\r
+                case 0:\r
+                    Properties.Settings.Default.x264cqstep = 1.0;\r
+                    break;\r
+                case 1:\r
+                    Properties.Settings.Default.x264cqstep = 0.50;\r
+                    break;\r
+                case 2:\r
+                    Properties.Settings.Default.x264cqstep = 0.25;\r
+                    break;\r
+                case 3:\r
+                    Properties.Settings.Default.x264cqstep = 0.20;\r
+                    break;\r
+            }\r
         }\r
 \r
         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 5a82d13..98d04d0 100644 (file)
--- 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();\r
             this.EncoderVideo = new System.Windows.Forms.ColumnHeader();\r
             this.Audio = new System.Windows.Forms.ColumnHeader();\r
+            this.mnu_queue = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+            this.mnu_up = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_Down = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.mnu_delete = new System.Windows.Forms.ToolStripMenuItem();\r
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encodesPending = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.OpenFile = new System.Windows.Forms.OpenFileDialog();\r
@@ -74,17 +79,12 @@ namespace Handbrake
             this.panel3 = new System.Windows.Forms.Panel();\r
             this.panel2 = new System.Windows.Forms.Panel();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
-            this.mnu_queue = new System.Windows.Forms.ContextMenuStrip(this.components);\r
-            this.mnu_up = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_Down = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.mnu_delete = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStrip1.SuspendLayout();\r
+            this.mnu_queue.SuspendLayout();\r
             this.statusStrip1.SuspendLayout();\r
             this.splitContainer1.Panel1.SuspendLayout();\r
             this.splitContainer1.Panel2.SuspendLayout();\r
             this.splitContainer1.SuspendLayout();\r
-            this.mnu_queue.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // btn_down\r
@@ -231,7 +231,7 @@ namespace Handbrake
             this.drop_button_queue});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);\r
             this.toolStrip1.Name = "toolStrip1";\r
-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
+            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
             this.toolStrip1.Size = new System.Drawing.Size(779, 39);\r
             this.toolStrip1.TabIndex = 71;\r
             this.toolStrip1.Text = "toolStrip1";\r
@@ -242,7 +242,7 @@ namespace Handbrake
             this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_encode.Name = "btn_encode";\r
-            this.btn_encode.Size = new System.Drawing.Size(84, 36);\r
+            this.btn_encode.Size = new System.Drawing.Size(78, 36);\r
             this.btn_encode.Text = "Encode";\r
             this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);\r
             // \r
@@ -253,7 +253,7 @@ namespace Handbrake
             this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_pause.Name = "btn_pause";\r
             this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
-            this.btn_pause.Size = new System.Drawing.Size(75, 36);\r
+            this.btn_pause.Size = new System.Drawing.Size(72, 36);\r
             this.btn_pause.Text = "Pause";\r
             this.btn_pause.Visible = false;\r
             this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);\r
@@ -275,14 +275,14 @@ namespace Handbrake
             this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.drop_button_queue.Name = "drop_button_queue";\r
-            this.drop_button_queue.Size = new System.Drawing.Size(89, 36);\r
+            this.drop_button_queue.Size = new System.Drawing.Size(84, 36);\r
             this.drop_button_queue.Text = "Queue";\r
             // \r
             // mnu_batch\r
             // \r
             this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;\r
             this.mnu_batch.Name = "mnu_batch";\r
-            this.mnu_batch.Size = new System.Drawing.Size(207, 22);\r
+            this.mnu_batch.Size = new System.Drawing.Size(190, 22);\r
             this.mnu_batch.Text = "Generate Batch Script";\r
             this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);\r
             // \r
@@ -290,7 +290,7 @@ namespace Handbrake
             // \r
             this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;\r
             this.mnu_import.Name = "mnu_import";\r
-            this.mnu_import.Size = new System.Drawing.Size(207, 22);\r
+            this.mnu_import.Size = new System.Drawing.Size(190, 22);\r
             this.mnu_import.Text = "Import Queue";\r
             this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);\r
             // \r
@@ -298,21 +298,21 @@ namespace Handbrake
             // \r
             this.mnu_export.Image = global::Handbrake.Properties.Resources.save;\r
             this.mnu_export.Name = "mnu_export";\r
-            this.mnu_export.Size = new System.Drawing.Size(207, 22);\r
+            this.mnu_export.Size = new System.Drawing.Size(190, 22);\r
             this.mnu_export.Text = "Export Queue";\r
             this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);\r
             // \r
             // toolStripSeparator2\r
             // \r
             this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(204, 6);\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(187, 6);\r
             // \r
             // mnu_readd\r
             // \r
             this.mnu_readd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;\r
             this.mnu_readd.Image = global::Handbrake.Properties.Resources.AddToQueue_small;\r
             this.mnu_readd.Name = "mnu_readd";\r
-            this.mnu_readd.Size = new System.Drawing.Size(207, 22);\r
+            this.mnu_readd.Size = new System.Drawing.Size(190, 22);\r
             this.mnu_readd.Text = "Re-Add Current Job";\r
             this.mnu_readd.Click += new System.EventHandler(this.mnu_readd_Click);\r
             // \r
@@ -373,6 +373,42 @@ namespace Handbrake
             this.Audio.Text = "Audio Encoder";\r
             this.Audio.Width = 94;\r
             // \r
+            // mnu_queue\r
+            // \r
+            this.mnu_queue.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_up,\r
+            this.mnu_Down,\r
+            this.toolStripSeparator3,\r
+            this.mnu_delete});\r
+            this.mnu_queue.Name = "mnu_queue";\r
+            this.mnu_queue.Size = new System.Drawing.Size(142, 76);\r
+            // \r
+            // mnu_up\r
+            // \r
+            this.mnu_up.Name = "mnu_up";\r
+            this.mnu_up.Size = new System.Drawing.Size(141, 22);\r
+            this.mnu_up.Text = "Move Up";\r
+            this.mnu_up.Click += new System.EventHandler(this.mnu_up_Click);\r
+            // \r
+            // mnu_Down\r
+            // \r
+            this.mnu_Down.Name = "mnu_Down";\r
+            this.mnu_Down.Size = new System.Drawing.Size(141, 22);\r
+            this.mnu_Down.Text = "Move Down";\r
+            this.mnu_Down.Click += new System.EventHandler(this.mnu_Down_Click);\r
+            // \r
+            // toolStripSeparator3\r
+            // \r
+            this.toolStripSeparator3.Name = "toolStripSeparator3";\r
+            this.toolStripSeparator3.Size = new System.Drawing.Size(138, 6);\r
+            // \r
+            // mnu_delete\r
+            // \r
+            this.mnu_delete.Name = "mnu_delete";\r
+            this.mnu_delete.Size = new System.Drawing.Size(141, 22);\r
+            this.mnu_delete.Text = "Delete";\r
+            this.mnu_delete.Click += new System.EventHandler(this.mnu_delete_Click);\r
+            // \r
             // statusStrip1\r
             // \r
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -388,7 +424,7 @@ namespace Handbrake
             this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
             this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);\r
             this.lbl_encodesPending.Name = "lbl_encodesPending";\r
-            this.lbl_encodesPending.Size = new System.Drawing.Size(122, 17);\r
+            this.lbl_encodesPending.Size = new System.Drawing.Size(105, 17);\r
             this.lbl_encodesPending.Text = "0 encode(s) pending";\r
             // \r
             // OpenFile\r
@@ -454,42 +490,6 @@ namespace Handbrake
             this.panel1.Size = new System.Drawing.Size(15, 234);\r
             this.panel1.TabIndex = 75;\r
             // \r
-            // mnu_queue\r
-            // \r
-            this.mnu_queue.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_up,\r
-            this.mnu_Down,\r
-            this.toolStripSeparator3,\r
-            this.mnu_delete});\r
-            this.mnu_queue.Name = "mnu_queue";\r
-            this.mnu_queue.Size = new System.Drawing.Size(153, 98);\r
-            // \r
-            // mnu_up\r
-            // \r
-            this.mnu_up.Name = "mnu_up";\r
-            this.mnu_up.Size = new System.Drawing.Size(152, 22);\r
-            this.mnu_up.Text = "Move Up";\r
-            this.mnu_up.Click += new System.EventHandler(this.mnu_up_Click);\r
-            // \r
-            // mnu_Down\r
-            // \r
-            this.mnu_Down.Name = "mnu_Down";\r
-            this.mnu_Down.Size = new System.Drawing.Size(152, 22);\r
-            this.mnu_Down.Text = "Move Down";\r
-            this.mnu_Down.Click += new System.EventHandler(this.mnu_Down_Click);\r
-            // \r
-            // toolStripSeparator3\r
-            // \r
-            this.toolStripSeparator3.Name = "toolStripSeparator3";\r
-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);\r
-            // \r
-            // mnu_delete\r
-            // \r
-            this.mnu_delete.Name = "mnu_delete";\r
-            this.mnu_delete.Size = new System.Drawing.Size(152, 22);\r
-            this.mnu_delete.Text = "Delete";\r
-            this.mnu_delete.Click += new System.EventHandler(this.mnu_delete_Click);\r
-            // \r
             // frmQueue\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
@@ -506,13 +506,13 @@ namespace Handbrake
             this.Text = "Encode Queue";\r
             this.toolStrip1.ResumeLayout(false);\r
             this.toolStrip1.PerformLayout();\r
+            this.mnu_queue.ResumeLayout(false);\r
             this.statusStrip1.ResumeLayout(false);\r
             this.statusStrip1.PerformLayout();\r
             this.splitContainer1.Panel1.ResumeLayout(false);\r
             this.splitContainer1.Panel1.PerformLayout();\r
             this.splitContainer1.Panel2.ResumeLayout(false);\r
             this.splitContainer1.ResumeLayout(false);\r
-            this.mnu_queue.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r

diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index 51891e4..350cfab 100644 (file)
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -44,7 +44,7 @@ namespace Handbrake
             this.BackColor = System.Drawing.Color.White;\r
             this.BackgroundImage = global::Handbrake.Properties.Resources.SplashScreen;\r
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;\r
-            this.ClientSize = new System.Drawing.Size(496, 303);\r
+            this.ClientSize = new System.Drawing.Size(400, 180);\r
             this.ControlBox = false;\r
             this.Font = new System.Drawing.Font("Corbel", 8.25F);\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;\r