WinGui:

- Messed Up resources / extra image checkin. Should now be fixed.

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

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 0a1aa80..4f4a9a5 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -74,13 +74,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Add {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Add", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap AddToQueue {\r
             get {\r
                 object obj = ResourceManager.GetObject("AddToQueue", resourceCulture);\r
@@ -95,13 +88,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Bat {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Bat", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap copy {\r
             get {\r
                 object obj = ResourceManager.GetObject("copy", resourceCulture);\r
@@ -109,13 +95,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Delete {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Delete", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap disc_small {\r
             get {\r
                 object obj = ResourceManager.GetObject("disc_small", resourceCulture);\r
@@ -123,20 +102,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Down {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Down", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        internal static System.Drawing.Bitmap Down2 {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Down2", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap Download {\r
             get {\r
                 object obj = ResourceManager.GetObject("Download", resourceCulture);\r
@@ -144,13 +109,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Edit {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Edit", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap folder {\r
             get {\r
                 object obj = ResourceManager.GetObject("folder", resourceCulture);\r
@@ -277,13 +235,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Refresh {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Refresh", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap Restore {\r
             get {\r
                 object obj = ResourceManager.GetObject("Restore", resourceCulture);\r
@@ -312,13 +263,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Up {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Up", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
         internal static System.Drawing.Bitmap window {\r
             get {\r
                 object obj = ResourceManager.GetObject("window", resourceCulture);\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index 64e4a37..50c4cfe 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -124,9 +124,6 @@
   <data name="Pref_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Pref_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="logo128" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\logo128.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="ActivityWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\ActivityWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
@@ -205,31 +202,10 @@
   <data name="Download" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Bat" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Bat.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Down" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Down2" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Down2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="Restore" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Restore.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="Up" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="logo128" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\logo128.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/Resources/Restore.png b/win/C#/Resources/Restore.png
new file mode 100644 (file)
index 0000000..d0e2f3b
Binary files /dev/null and b/win/C#/Resources/Restore.png differ

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index dfff15a..5bad68d 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -77,10 +77,7 @@ namespace Handbrake
             this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
             this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -89,11 +86,9 @@ namespace Handbrake
             this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.label5 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
@@ -140,17 +135,8 @@ namespace Handbrake
             this.pmnu_saveChanges = new System.Windows.Forms.ToolStripMenuItem();\r
             this.pmnu_delete = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
-            this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();\r
-            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
             this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.btn_start = new System.Windows.Forms.ToolStripButton();\r
-            this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
-            this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
-            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
@@ -173,6 +159,20 @@ 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.btn_source = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.btn_start = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
+            this.tb_preview = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
+            this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -207,12 +207,13 @@ namespace Handbrake
             this.btn_restore});\r
             notifyIconMenu.Name = "notifyIconMenu";\r
             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
-            notifyIconMenu.Size = new System.Drawing.Size(114, 26);\r
+            notifyIconMenu.Size = new System.Drawing.Size(153, 48);\r
             // \r
             // btn_restore\r
             // \r
+            this.btn_restore.Image = global::Handbrake.Properties.Resources.Restore;\r
             this.btn_restore.Name = "btn_restore";\r
-            this.btn_restore.Size = new System.Drawing.Size(113, 22);\r
+            this.btn_restore.Size = new System.Drawing.Size(152, 22);\r
             this.btn_restore.Text = "Restore";\r
             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);\r
             // \r
@@ -618,37 +619,11 @@ namespace Handbrake
             this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);\r
             this.ToolsToolStripMenuItem.Text = "&Tools";\r
             // \r
-            // mnu_encode\r
-            // \r
-            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\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(201, 22);\r
-            this.mnu_encode.Text = "Show Queue";\r
-            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
-            // \r
-            // mnu_encodeLog\r
-            // \r
-            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
-            this.mnu_encodeLog.Name = "mnu_encodeLog";\r
-            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));\r
-            this.mnu_encodeLog.Size = new System.Drawing.Size(201, 22);\r
-            this.mnu_encodeLog.Text = "Activity Window";\r
-            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
-            // \r
             // ToolStripSeparator5\r
             // \r
             this.ToolStripSeparator5.Name = "ToolStripSeparator5";\r
             this.ToolStripSeparator5.Size = new System.Drawing.Size(198, 6);\r
             // \r
-            // mnu_options\r
-            // \r
-            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
-            this.mnu_options.Name = "mnu_options";\r
-            this.mnu_options.Size = new System.Drawing.Size(201, 22);\r
-            this.mnu_options.Text = "Options";\r
-            this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
-            // \r
             // PresetsToolStripMenuItem\r
             // \r
             this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -716,14 +691,6 @@ namespace Handbrake
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);\r
             this.HelpToolStripMenuItem.Text = "&Help";\r
             // \r
-            // mnu_user_guide\r
-            // \r
-            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
-            this.mnu_user_guide.Name = "mnu_user_guide";\r
-            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_user_guide.Text = "HandBrake User Guide";\r
-            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
-            // \r
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
@@ -741,14 +708,6 @@ namespace Handbrake
             this.toolStripSeparator6.Name = "toolStripSeparator6";\r
             this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);\r
             // \r
-            // mnu_about\r
-            // \r
-            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
-            this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(192, 22);\r
-            this.mnu_about.Text = "About...";\r
-            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
-            // \r
             // frmMainMenu\r
             // \r
             this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -1280,111 +1239,16 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 1;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
-            // btn_source\r
-            // \r
-            this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.btn_file_source,\r
-            this.btn_dvd_source,\r
-            this.toolStripSeparator1});\r
-            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;\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
-            this.btn_source.Size = new System.Drawing.Size(88, 36);\r
-            this.btn_source.Text = "Source";\r
-            this.btn_source.ToolTipText = "Open a new source file or folder.";\r
-            this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
-            // \r
-            // btn_file_source\r
-            // \r
-            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
-            this.btn_file_source.Name = "btn_file_source";\r
-            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
-            this.btn_file_source.Size = new System.Drawing.Size(182, 22);\r
-            this.btn_file_source.Text = "Video File";\r
-            this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
-            // \r
-            // btn_dvd_source\r
-            // \r
-            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;\r
-            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_dvd_source.Name = "btn_dvd_source";\r
-            this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)\r
-                        | System.Windows.Forms.Keys.O)));\r
-            this.btn_dvd_source.Size = new System.Drawing.Size(182, 22);\r
-            this.btn_dvd_source.Text = "Folder";\r
-            this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
-            // \r
-            // toolStripSeparator1\r
-            // \r
-            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(179, 6);\r
-            // \r
             // toolStripSeparator10\r
             // \r
             this.toolStripSeparator10.Name = "toolStripSeparator10";\r
             this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);\r
             // \r
-            // btn_start\r
-            // \r
-            this.btn_start.Image = global::Handbrake.Properties.Resources.Play;\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
-            this.btn_start.Size = new System.Drawing.Size(67, 36);\r
-            this.btn_start.Text = "Start";\r
-            this.btn_start.ToolTipText = "Start the encoding process";\r
-            this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
-            // \r
-            // btn_add2Queue\r
-            // \r
-            this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;\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
-            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);\r
-            this.btn_add2Queue.Text = "Add to Queue";\r
-            this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
-            this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
-            // \r
-            // btn_showQueue\r
-            // \r
-            this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue;\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
-            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);\r
-            this.btn_showQueue.Tag = "";\r
-            this.btn_showQueue.Text = "Show Queue";\r
-            this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
-            // \r
             // toolStripSeparator4\r
             // \r
             this.toolStripSeparator4.Name = "toolStripSeparator4";\r
             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);\r
             // \r
-            // tb_preview\r
-            // \r
-            this.tb_preview.Image = global::Handbrake.Properties.Resources.window;\r
-            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.tb_preview.Name = "tb_preview";\r
-            this.tb_preview.Size = new System.Drawing.Size(84, 36);\r
-            this.tb_preview.Text = "Preview";\r
-            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
-            // \r
-            // btn_ActivityWindow\r
-            // \r
-            this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
-            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
-            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);\r
-            this.btn_ActivityWindow.Text = "Activity Window";\r
-            this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
-                "ently running encode.";\r
-            this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
-            // \r
             // notifyIcon\r
             // \r
             this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
@@ -1639,6 +1503,143 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
+            // btn_source\r
+            // \r
+            this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.btn_file_source,\r
+            this.btn_dvd_source,\r
+            this.toolStripSeparator1});\r
+            this.btn_source.Image = global::Handbrake.Properties.Resources.Movies;\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
+            this.btn_source.Size = new System.Drawing.Size(88, 36);\r
+            this.btn_source.Text = "Source";\r
+            this.btn_source.ToolTipText = "Open a new source file or folder.";\r
+            this.btn_source.Click += new System.EventHandler(this.btn_source_Click);\r
+            // \r
+            // btn_file_source\r
+            // \r
+            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
+            this.btn_file_source.Name = "btn_file_source";\r
+            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
+            this.btn_file_source.Size = new System.Drawing.Size(182, 22);\r
+            this.btn_file_source.Text = "Video File";\r
+            this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);\r
+            // \r
+            // btn_dvd_source\r
+            // \r
+            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;\r
+            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_dvd_source.Name = "btn_dvd_source";\r
+            this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)\r
+                        | System.Windows.Forms.Keys.O)));\r
+            this.btn_dvd_source.Size = new System.Drawing.Size(182, 22);\r
+            this.btn_dvd_source.Text = "Folder";\r
+            this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);\r
+            // \r
+            // toolStripSeparator1\r
+            // \r
+            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(179, 6);\r
+            // \r
+            // btn_start\r
+            // \r
+            this.btn_start.Image = global::Handbrake.Properties.Resources.Play;\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
+            this.btn_start.Size = new System.Drawing.Size(67, 36);\r
+            this.btn_start.Text = "Start";\r
+            this.btn_start.ToolTipText = "Start the encoding process";\r
+            this.btn_start.Click += new System.EventHandler(this.btn_start_Click);\r
+            // \r
+            // btn_add2Queue\r
+            // \r
+            this.btn_add2Queue.Image = global::Handbrake.Properties.Resources.AddToQueue;\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
+            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);\r
+            this.btn_add2Queue.Text = "Add to Queue";\r
+            this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";\r
+            this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);\r
+            // \r
+            // btn_showQueue\r
+            // \r
+            this.btn_showQueue.Image = global::Handbrake.Properties.Resources.Queue;\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
+            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);\r
+            this.btn_showQueue.Tag = "";\r
+            this.btn_showQueue.Text = "Show Queue";\r
+            this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);\r
+            // \r
+            // tb_preview\r
+            // \r
+            this.tb_preview.Image = global::Handbrake.Properties.Resources.window;\r
+            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.tb_preview.Name = "tb_preview";\r
+            this.tb_preview.Size = new System.Drawing.Size(84, 36);\r
+            this.tb_preview.Text = "Preview";\r
+            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);\r
+            // \r
+            // btn_ActivityWindow\r
+            // \r
+            this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
+            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
+            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);\r
+            this.btn_ActivityWindow.Text = "Activity Window";\r
+            this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +\r
+                "ently running encode.";\r
+            this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
+            // \r
+            // mnu_encode\r
+            // \r
+            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\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(201, 22);\r
+            this.mnu_encode.Text = "Show Queue";\r
+            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
+            // \r
+            // mnu_encodeLog\r
+            // \r
+            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
+            this.mnu_encodeLog.Name = "mnu_encodeLog";\r
+            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));\r
+            this.mnu_encodeLog.Size = new System.Drawing.Size(201, 22);\r
+            this.mnu_encodeLog.Text = "Activity Window";\r
+            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
+            // \r
+            // mnu_options\r
+            // \r
+            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
+            this.mnu_options.Name = "mnu_options";\r
+            this.mnu_options.Size = new System.Drawing.Size(201, 22);\r
+            this.mnu_options.Text = "Options";\r
+            this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);\r
+            // \r
+            // mnu_user_guide\r
+            // \r
+            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;\r
+            this.mnu_user_guide.Name = "mnu_user_guide";\r
+            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);\r
+            this.mnu_user_guide.Text = "HandBrake User Guide";\r
+            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);\r
+            // \r
+            // mnu_about\r
+            // \r
+            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;\r
+            this.mnu_about.Name = "mnu_about";\r
+            this.mnu_about.Size = new System.Drawing.Size(192, 22);\r
+            this.mnu_about.Text = "About...";\r
+            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r