WinGui:

- Changed the layout of the Options window.
- Added a "Stop" button to stop encodes.
- Moved Encode status label onto a status bar at the bottom of the window. Now includes scanning status.
- Added and Removed some png images

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index cb4fa72..43bc6c0 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -236,6 +236,10 @@
     <None Include="Resources\AddToQueue.png" />\r
     <Content Include="Resources\ActivityWindow_small.png" />\r
     <Content Include="Resources\disc_small.png" />\r
+    <None Include="Resources\hb32.png" />\r
+    <None Include="Resources\hb16.png" />\r
+    <None Include="Resources\Help16.png" />\r
+    <None Include="Resources\info16.png" />\r
     <Content Include="Resources\JobPassLarge.png" />\r
     <Content Include="Resources\Output_Small.png" />\r
     <None Include="Resources\Pause.png" />\r
@@ -243,6 +247,7 @@
     <Content Include="Resources\Pref_Small.png" />\r
     <Content Include="Resources\Queue.png" />\r
     <Content Include="Resources\Queue_Small.png" />\r
+    <None Include="Resources\stop.png" />\r
     <None Include="Resources\SplashScreen.jpg" />\r
     <None Include="Resources\Remove.png" />\r
     <None Include="Resources\Movies.png" />\r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index f7ea463..834ae79 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@ using System.Resources;
 [assembly: AssemblyConfiguration("")]\r
 [assembly: AssemblyCompany("HandBrake")]\r
 [assembly: AssemblyProduct("HandBrake")]\r
-[assembly: AssemblyCopyright("Copyright ©  2007")]\r
+[assembly: AssemblyCopyright("Copyright ©  2008")]\r
 [assembly: AssemblyTrademark("")]\r
 [assembly: AssemblyCulture("")]\r
 \r

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 60a12a5..f03af93 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -81,20 +81,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 {\r
-            get {\r
-                object obj = ResourceManager.GetObject("Disc", 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
@@ -102,37 +88,37 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Emoticon {\r
+        internal static System.Drawing.Bitmap General_Preferences {\r
             get {\r
-                object obj = ResourceManager.GetObject("Emoticon", resourceCulture);\r
+                object obj = ResourceManager.GetObject("General_Preferences", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap General_Preferences {\r
+        internal static System.Drawing.Bitmap hb16 {\r
             get {\r
-                object obj = ResourceManager.GetObject("General_Preferences", resourceCulture);\r
+                object obj = ResourceManager.GetObject("hb16", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Help {\r
+        internal static System.Drawing.Bitmap hb32 {\r
             get {\r
-                object obj = ResourceManager.GetObject("Help", resourceCulture);\r
+                object obj = ResourceManager.GetObject("hb32", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap History {\r
+        internal static System.Drawing.Bitmap Help16 {\r
             get {\r
-                object obj = ResourceManager.GetObject("History", resourceCulture);\r
+                object obj = ResourceManager.GetObject("Help16", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap info {\r
+        internal static System.Drawing.Bitmap info16 {\r
             get {\r
-                object obj = ResourceManager.GetObject("info", resourceCulture);\r
+                object obj = ResourceManager.GetObject("info16", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
@@ -207,16 +193,16 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap Remove {\r
+        internal static System.Drawing.Bitmap SplashScreen {\r
             get {\r
-                object obj = ResourceManager.GetObject("Remove", resourceCulture);\r
+                object obj = ResourceManager.GetObject("SplashScreen", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap SplashScreen {\r
+        internal static System.Drawing.Bitmap stop {\r
             get {\r
-                object obj = ResourceManager.GetObject("SplashScreen", resourceCulture);\r
+                object obj = ResourceManager.GetObject("stop", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index 7f07815..4fe140e 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -124,30 +124,15 @@
   <data name="Queue" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="Disc" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Disc.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <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="History" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\History.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
-  <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="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
@@ -160,21 +145,12 @@
   <data name="Output_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Output_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="Queue_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Queue_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="Remove" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="Movies" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Movies.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="Emoticon" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Emoticon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="Movies_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Movies_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
@@ -187,4 +163,22 @@
   <data name="ActivityWindow_small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\resources\activitywindow_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="hb16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\hb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="hb32" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\hb32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Help16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Help16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="info16" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\info16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="stop" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\stop.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/Help16.png b/win/C#/Resources/Help16.png
new file mode 100644 (file)
index 0000000..bb5ef99
Binary files /dev/null and b/win/C#/Resources/Help16.png differ

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

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

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

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b2ca129..ecc8f47 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;\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 dataGridViewCellStyle3 = 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.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -91,16 +91,11 @@ namespace Handbrake
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
             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.mnu_viewDVDdata = 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
@@ -108,13 +103,10 @@ namespace Handbrake
             this.btn_new_preset = 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.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_handbrake_forums = 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.GroupBox1 = new System.Windows.Forms.GroupBox();\r
             this.Label13 = new System.Windows.Forms.Label();\r
@@ -251,22 +243,30 @@ namespace Handbrake
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.treeView_presets = new System.Windows.Forms.TreeView();\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
+            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\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
             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.mnu_dvd_drive = new System.Windows.Forms.ToolStripMenuItem();\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.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
-            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
             this.btn_minimize = new System.Windows.Forms.ToolStripButton();\r
-            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.lbl_encode = new System.Windows.Forms.ToolStripLabel();\r
-            this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
+            this.mnu_open = 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.mnu_viewDVDdata = 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_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             Label38 = new System.Windows.Forms.Label();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
@@ -293,6 +293,7 @@ namespace Handbrake
             this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
             this.toolStrip1.SuspendLayout();\r
+            this.StatusStrip.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -651,9 +652,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle3.Format = "N0";\r
+            dataGridViewCellStyle3.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -1042,16 +1043,6 @@ namespace Handbrake
             this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20);\r
             this.FileToolStripMenuItem.Text = "&File";\r
             // \r
-            // mnu_open\r
-            // \r
-            this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));\r
-            this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.mnu_open.Name = "mnu_open";\r
-            this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
-            this.mnu_open.Size = new System.Drawing.Size(210, 22);\r
-            this.mnu_open.Text = "&Import Preset";\r
-            this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);\r
-            // \r
             // toolStripSeparator2\r
             // \r
             this.toolStripSeparator2.Name = "toolStripSeparator2";\r
@@ -1081,44 +1072,11 @@ namespace Handbrake
             this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(49, 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(251, 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.Size = new System.Drawing.Size(251, 22);\r
-            this.mnu_encodeLog.Text = "Activity Window (Encode log)";\r
-            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
-            // \r
-            // mnu_viewDVDdata\r
-            // \r
-            this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
-            this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";\r
-            this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);\r
-            this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";\r
-            this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);\r
-            // \r
             // ToolStripSeparator5\r
             // \r
             this.ToolStripSeparator5.Name = "ToolStripSeparator5";\r
             this.ToolStripSeparator5.Size = new System.Drawing.Size(248, 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(251, 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
@@ -1180,20 +1138,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.Name = "mnu_user_guide";\r
-            this.mnu_user_guide.Size = new System.Drawing.Size(215, 22);\r
-            this.mnu_user_guide.Text = "HandBrake User Guide";\r
-            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click_1);\r
-            // \r
-            // mnu_handbrake_home\r
-            // \r
-            this.mnu_handbrake_home.Name = "mnu_handbrake_home";\r
-            this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);\r
-            this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
-            this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);\r
-            // \r
             // mnu_handbrake_forums\r
             // \r
             this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";\r
@@ -1218,13 +1162,6 @@ namespace Handbrake
             this.toolStripSeparator6.Name = "toolStripSeparator6";\r
             this.toolStripSeparator6.Size = new System.Drawing.Size(212, 6);\r
             // \r
-            // mnu_about\r
-            // \r
-            this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(215, 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.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -1236,7 +1173,7 @@ namespace Handbrake
             this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
-            this.frmMainMenu.Size = new System.Drawing.Size(931, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(936, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
@@ -1708,7 +1645,6 @@ namespace Handbrake
             this.drp_track1Audio.Name = "drp_track1Audio";\r
             this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track1Audio.TabIndex = 3;\r
-\r
             // \r
             // Label32\r
             // \r
@@ -2922,16 +2858,56 @@ namespace Handbrake
             this.toolStripSeparator4,\r
             this.btn_ActivityWindow,\r
             this.toolStripSeparator8,\r
-            this.btn_minimize,\r
-            this.toolStripSeparator9,\r
-            this.lbl_encode});\r
+            this.btn_minimize});\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.Size = new System.Drawing.Size(931, 39);\r
+            this.toolStrip1.Size = new System.Drawing.Size(936, 39);\r
             this.toolStrip1.TabIndex = 0;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
+            // toolStripSeparator10\r
+            // \r
+            this.toolStripSeparator10.Name = "toolStripSeparator10";\r
+            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);\r
+            // \r
+            // toolStripSeparator4\r
+            // \r
+            this.toolStripSeparator4.Name = "toolStripSeparator4";\r
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);\r
+            // \r
+            // toolStripSeparator8\r
+            // \r
+            this.toolStripSeparator8.Name = "toolStripSeparator8";\r
+            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
+            // \r
+            // notifyIcon\r
+            // \r
+            this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
+            this.notifyIcon.BalloonTipText = "HandBrake Status Here";\r
+            this.notifyIcon.BalloonTipTitle = "HandBrake";\r
+            this.notifyIcon.ContextMenuStrip = notifyIconMenu;\r
+            this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));\r
+            this.notifyIcon.Text = "HandBrake";\r
+            this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);\r
+            // \r
+            // StatusStrip\r
+            // \r
+            this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.lbl_encode});\r
+            this.StatusStrip.Location = new System.Drawing.Point(0, 619);\r
+            this.StatusStrip.Name = "StatusStrip";\r
+            this.StatusStrip.Size = new System.Drawing.Size(936, 22);\r
+            this.StatusStrip.TabIndex = 12;\r
+            this.StatusStrip.Text = "statusStrip1";\r
+            // \r
+            // lbl_encode\r
+            // \r
+            this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_encode.Name = "lbl_encode";\r
+            this.lbl_encode.Size = new System.Drawing.Size(148, 17);\r
+            this.lbl_encode.Text = "Encoding: Not Started";\r
+            // \r
             // btn_source\r
             // \r
             this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -2978,11 +2954,6 @@ namespace Handbrake
             this.mnu_dvd_drive.Visible = false;\r
             this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);\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
@@ -3016,11 +2987,6 @@ namespace Handbrake
             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
             // btn_ActivityWindow\r
             // \r
             this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
@@ -3033,47 +2999,87 @@ namespace Handbrake
                 "ently running encode.";\r
             this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
             // \r
-            // toolStripSeparator8\r
-            // \r
-            this.toolStripSeparator8.Name = "toolStripSeparator8";\r
-            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
-            // \r
             // btn_minimize\r
             // \r
-            this.btn_minimize.Image = ((System.Drawing.Image)(resources.GetObject("btn_minimize.Image")));\r
+            this.btn_minimize.Image = global::Handbrake.Properties.Resources.hb32;\r
             this.btn_minimize.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_minimize.Name = "btn_minimize";\r
             this.btn_minimize.Size = new System.Drawing.Size(122, 36);\r
             this.btn_minimize.Text = "Minimize To Taskbar";\r
             this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click);\r
             // \r
-            // toolStripSeparator9\r
+            // mnu_open\r
             // \r
-            this.toolStripSeparator9.Name = "toolStripSeparator9";\r
-            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 39);\r
+            this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));\r
+            this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.mnu_open.Name = "mnu_open";\r
+            this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
+            this.mnu_open.Size = new System.Drawing.Size(210, 22);\r
+            this.mnu_open.Text = "&Import Preset";\r
+            this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);\r
             // \r
-            // lbl_encode\r
+            // mnu_encode\r
             // \r
-            this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Name = "lbl_encode";\r
-            this.lbl_encode.Size = new System.Drawing.Size(148, 36);\r
-            this.lbl_encode.Text = "Encoding: Not Started";\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(251, 22);\r
+            this.mnu_encode.Text = "Show Queue";\r
+            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
             // \r
-            // notifyIcon\r
+            // mnu_encodeLog\r
             // \r
-            this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
-            this.notifyIcon.BalloonTipText = "HandBrake Status Here";\r
-            this.notifyIcon.BalloonTipTitle = "HandBrake";\r
-            this.notifyIcon.ContextMenuStrip = notifyIconMenu;\r
-            this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));\r
-            this.notifyIcon.Text = "HandBrake";\r
-            this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);\r
+            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
+            this.mnu_encodeLog.Name = "mnu_encodeLog";\r
+            this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22);\r
+            this.mnu_encodeLog.Text = "Activity Window (Encode log)";\r
+            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);\r
+            // \r
+            // mnu_viewDVDdata\r
+            // \r
+            this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
+            this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";\r
+            this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);\r
+            this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";\r
+            this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_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(251, 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(215, 22);\r
+            this.mnu_user_guide.Text = "HandBrake User Guide";\r
+            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click_1);\r
+            // \r
+            // mnu_handbrake_home\r
+            // \r
+            this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;\r
+            this.mnu_handbrake_home.Name = "mnu_handbrake_home";\r
+            this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);\r
+            this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
+            this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_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(215, 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(931, 617);\r
+            this.ClientSize = new System.Drawing.Size(936, 641);\r
             this.Controls.Add(this.toolStrip1);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox_dest);\r
@@ -3081,6 +3087,7 @@ namespace Handbrake
             this.Controls.Add(this.groupBox_output);\r
             this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.frmMainMenu);\r
+            this.Controls.Add(this.StatusStrip);\r
             this.DoubleBuffered = true;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MinimumSize = new System.Drawing.Size(680, 580);\r
@@ -3122,6 +3129,8 @@ namespace Handbrake
             this.groupBox2.ResumeLayout(false);\r
             this.toolStrip1.ResumeLayout(false);\r
             this.toolStrip1.PerformLayout();\r
+            this.StatusStrip.ResumeLayout(false);\r
+            this.StatusStrip.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -3337,7 +3346,6 @@ namespace Handbrake
         internal System.Windows.Forms.RichTextBox rtf_query;\r
         private System.Windows.Forms.NotifyIcon notifyIcon;\r
         private System.Windows.Forms.ToolStripButton btn_minimize;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;\r
         private System.Windows.Forms.ToolStripMenuItem btn_restore;\r
         internal System.Windows.Forms.Label lbl_src_res;\r
         internal System.Windows.Forms.Label label7;\r
@@ -3345,7 +3353,6 @@ namespace Handbrake
         internal System.Windows.Forms.Label label_duration;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;\r
         private System.Windows.Forms.ToolStripMenuItem btn_file_source;\r
-        private System.Windows.Forms.ToolStripLabel lbl_encode;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;\r
         private System.Windows.Forms.ToolStripMenuItem btn_new_preset;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_forums;\r
@@ -3357,6 +3364,8 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drop_format;\r
         internal System.Windows.Forms.Label label5;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;\r
+        private System.Windows.Forms.StatusStrip StatusStrip;\r
+        private System.Windows.Forms.ToolStripStatusLabel lbl_encode;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c352c5d..c300dc3 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -356,7 +356,7 @@ namespace Handbrake
         }\r
         private void mnu_options_Click(object sender, EventArgs e)\r
         {\r
-            Form Options = new frmOptions();\r
+            Form Options = new frmOptions(this);\r
             Options.ShowDialog();\r
         }\r
 \r
@@ -459,8 +459,13 @@ namespace Handbrake
 \r
                 ThreadPool.QueueUserWorkItem(procMonitor, query);\r
                 lbl_encode.Visible = true;\r
-                lbl_encode.Text = "Encoding in Progress";\r
+                lbl_encode.Text = "Encoding: in Progress";\r
+\r
+                btn_start.Text = "Stop";\r
+                btn_start.Image = Properties.Resources.stop;\r
             }\r
+            \r
+\r
         }\r
         private void btn_add2Queue_Click(object sender, EventArgs e)\r
         {\r
@@ -507,6 +512,7 @@ namespace Handbrake
                 {\r
                     Form frmRD = new frmReadDVD(filename, this);\r
                     text_source.Text = filename;\r
+                    lbl_encode.Text = "Scanning ...";\r
                     frmRD.ShowDialog();\r
                 }\r
                 else\r
@@ -516,6 +522,7 @@ namespace Handbrake
                 if (drp_dvdtitle.Items.Count == 0)\r
                     MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
+                lbl_encode.Text = "Encoding: Not Started";\r
             }\r
         }\r
         private void btn_file_source_Click(object sender, EventArgs e)\r
@@ -534,6 +541,7 @@ namespace Handbrake
                 {\r
                     Form frmRD = new frmReadDVD(filename, this);\r
                     text_source.Text = filename;\r
+                    lbl_encode.Text = "Scanning ...";\r
                     frmRD.ShowDialog();\r
                 }\r
                 else\r
@@ -543,6 +551,7 @@ namespace Handbrake
                 if (drp_dvdtitle.Items.Count == 0)\r
                     MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
+                lbl_encode.Text = "Encoding: Not Started";\r
             }\r
         }\r
         private void mnu_dvd_drive_Click(object sender, EventArgs e)\r
@@ -552,6 +561,7 @@ namespace Handbrake
             {\r
                 string[] path = mnu_dvd_drive.Text.Split(' ');\r
                 filename = path[0];\r
+                lbl_encode.Text = "Scanning ...";\r
                 Form frmRD = new frmReadDVD(filename, this);\r
                 text_source.Text = filename;\r
                 frmRD.ShowDialog();\r
@@ -561,6 +571,7 @@ namespace Handbrake
             if (drp_dvdtitle.Items.Count == 0)\r
                 MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
 \r
+            lbl_encode.Text = "Encoding: Not Started";\r
         }\r
 \r
         private void drp_dvdtitle_Click(object sender, EventArgs e)\r
@@ -729,7 +740,7 @@ namespace Handbrake
         // Output Settings\r
         private void drop_format_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            \r
+\r
             if (drop_format.SelectedIndex == 0)\r
                 setExtension(".mp4");\r
             else if (drop_format.SelectedIndex == 1)\r
@@ -1968,7 +1979,9 @@ namespace Handbrake
         {\r
             // Make sure we are not already encoding and if we are then display an error.\r
             if (hbProc != null)\r
-                MessageBox.Show("Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            {\r
+                hbProc.CloseMainWindow();\r
+            }\r
             else\r
             {\r
                 hbProc = cliObj.runCli(this, (string)state);\r
@@ -1996,7 +2009,9 @@ namespace Handbrake
                 this.BeginInvoke(new UpdateUIHandler(setEncodeLabelFinished));\r
                 return;\r
             }\r
-            lbl_encode.Text = "Encoding Finished";\r
+            lbl_encode.Text = "Encoding: Finished";\r
+            btn_start.Text = "Start";\r
+            btn_start.Image = Properties.Resources.Play;\r
         }\r
         public Boolean isEncoding()\r
         {\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 1da887c..dd4fda4 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,6 +155,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r
@@ -164,65 +170,16 @@ Note: Do not change any of the chapter numbers!</value>
   <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>329, 15</value>\r
   </metadata>\r
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
-  <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I\r
-        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC\r
-        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p\r
-        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0\r
-        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr\r
-        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG\r
-        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5\r
-        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS\r
-        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt\r
-        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp\r
-        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W\r
-        AAAAAElFTkSuQmCC\r
-</value>\r
-  </data>\r
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>106, 15</value>\r
   </metadata>\r
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r
-  <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I\r
-        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC\r
-        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p\r
-        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0\r
-        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr\r
-        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG\r
-        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5\r
-        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS\r
-        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt\r
-        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp\r
-        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W\r
-        AAAAAElFTkSuQmCC\r
-</value>\r
-  </data>\r
-  <data name="btn_minimize.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL\r
-        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI\r
-        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ\r
-        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4\r
-        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9\r
-        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j\r
-        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR\r
-        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb\r
-        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE\r
-        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC\r
-</value>\r
-  </data>\r
   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>830, 18</value>\r
   </metadata>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
@@ -602,6 +559,43 @@ Note: Do not change any of the chapter numbers!</value>
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==\r
 </value>\r
   </data>\r
+  <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>1060, 18</value>\r
+  </metadata>\r
+  <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I\r
+        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC\r
+        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p\r
+        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0\r
+        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr\r
+        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG\r
+        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5\r
+        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS\r
+        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt\r
+        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp\r
+        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W\r
+        AAAAAElFTkSuQmCC\r
+</value>\r
+  </data>\r
+  <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I\r
+        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC\r
+        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p\r
+        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0\r
+        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr\r
+        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG\r
+        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5\r
+        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS\r
+        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt\r
+        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp\r
+        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W\r
+        AAAAAElFTkSuQmCC\r
+</value>\r
+  </data>\r
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>56</value>\r
   </metadata>\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 6bcf91a..b2f2152 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -34,41 +34,40 @@ namespace Handbrake
         /// </summary>\r
         private void InitializeComponent()\r
         {\r
+            this.components = new System.ComponentModel.Container();\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions));\r
             this.btn_close = new System.Windows.Forms.Button();\r
             this.drp_completeOption = new System.Windows.Forms.ComboBox();\r
-            this.label5 = new System.Windows.Forms.Label();\r
             this.tab_options = new System.Windows.Forms.TabControl();\r
             this.tab_general = new System.Windows.Forms.TabPage();\r
-            this.check_tooltip = new System.Windows.Forms.CheckBox();\r
-            this.check_updateCheck = new System.Windows.Forms.CheckBox();\r
-            this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();\r
-            this.label1 = new System.Windows.Forms.Label();\r
-            this.tabPage1 = new System.Windows.Forms.TabPage();\r
-            this.btn_drive_detect = new System.Windows.Forms.CheckBox();\r
-            this.label6 = new System.Windows.Forms.Label();\r
             this.btn_browse = new System.Windows.Forms.Button();\r
             this.label10 = new System.Windows.Forms.Label();\r
             this.text_an_path = new System.Windows.Forms.TextBox();\r
             this.check_autoNaming = new System.Windows.Forms.CheckBox();\r
-            this.label9 = new System.Windows.Forms.Label();\r
+            this.label13 = new System.Windows.Forms.Label();\r
+            this.check_tooltip = new System.Windows.Forms.CheckBox();\r
+            this.check_updateCheck = new System.Windows.Forms.CheckBox();\r
+            this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();\r
+            this.label1 = new System.Windows.Forms.Label();\r
             this.label2 = new System.Windows.Forms.Label();\r
-            this.tab_debug = new System.Windows.Forms.TabPage();\r
-            this.label3 = new System.Windows.Forms.Label();\r
+            this.tab_cli = new System.Windows.Forms.TabPage();\r
+            this.check_cli_minimized = new System.Windows.Forms.CheckBox();\r
+            this.label12 = new System.Windows.Forms.Label();\r
             this.drp_Priority = new System.Windows.Forms.ComboBox();\r
             this.Label11 = new System.Windows.Forms.Label();\r
             this.drp_processors = new System.Windows.Forms.ComboBox();\r
             this.Label4 = new System.Windows.Forms.Label();\r
+            this.tab_advanced = new System.Windows.Forms.TabPage();\r
+            this.btn_drive_detect = new System.Windows.Forms.CheckBox();\r
+            this.label6 = new System.Windows.Forms.Label();\r
             this.label8 = new System.Windows.Forms.Label();\r
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
-            this.label7 = new System.Windows.Forms.Label();\r
             this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();\r
-            this.check_cli_minimized = new System.Windows.Forms.CheckBox();\r
-            this.label12 = new System.Windows.Forms.Label();\r
+            this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
-            this.tabPage1.SuspendLayout();\r
-            this.tab_debug.SuspendLayout();\r
+            this.tab_cli.SuspendLayout();\r
+            this.tab_advanced.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -78,7 +77,7 @@ namespace Handbrake
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(320, 383);\r
+            this.btn_close.Location = new System.Drawing.Point(395, 344);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(107, 22);\r
             this.btn_close.TabIndex = 53;\r
@@ -99,57 +98,110 @@ namespace Handbrake
             "Lock System",\r
             "Log Off",\r
             "Quit HandBrake"});\r
-            this.drp_completeOption.Location = new System.Drawing.Point(193, 39);\r
+            this.drp_completeOption.Location = new System.Drawing.Point(114, 103);\r
             this.drp_completeOption.Name = "drp_completeOption";\r
-            this.drp_completeOption.Size = new System.Drawing.Size(111, 21);\r
+            this.drp_completeOption.Size = new System.Drawing.Size(166, 21);\r
             this.drp_completeOption.TabIndex = 43;\r
+            this.ToolTip.SetToolTip(this.drp_completeOption, "Performs an action when an encode or queue has completed.");\r
             this.drp_completeOption.SelectedIndexChanged += new System.EventHandler(this.drp_completeOption_SelectedIndexChanged);\r
             // \r
-            // label5\r
-            // \r
-            this.label5.AutoSize = true;\r
-            this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label5.Location = new System.Drawing.Point(14, 42);\r
-            this.label5.Name = "label5";\r
-            this.label5.Size = new System.Drawing.Size(173, 13);\r
-            this.label5.TabIndex = 42;\r
-            this.label5.Text = "When the encode completes:";\r
-            // \r
             // tab_options\r
             // \r
             this.tab_options.Controls.Add(this.tab_general);\r
-            this.tab_options.Controls.Add(this.tabPage1);\r
-            this.tab_options.Controls.Add(this.tab_debug);\r
-            this.tab_options.Location = new System.Drawing.Point(12, 63);\r
+            this.tab_options.Controls.Add(this.tab_cli);\r
+            this.tab_options.Controls.Add(this.tab_advanced);\r
+            this.tab_options.Location = new System.Drawing.Point(12, 55);\r
             this.tab_options.Name = "tab_options";\r
             this.tab_options.SelectedIndex = 0;\r
-            this.tab_options.Size = new System.Drawing.Size(419, 314);\r
+            this.tab_options.Size = new System.Drawing.Size(490, 278);\r
             this.tab_options.TabIndex = 58;\r
             // \r
             // tab_general\r
             // \r
+            this.tab_general.Controls.Add(this.btn_browse);\r
+            this.tab_general.Controls.Add(this.label10);\r
+            this.tab_general.Controls.Add(this.text_an_path);\r
+            this.tab_general.Controls.Add(this.check_autoNaming);\r
+            this.tab_general.Controls.Add(this.label13);\r
             this.tab_general.Controls.Add(this.check_tooltip);\r
             this.tab_general.Controls.Add(this.check_updateCheck);\r
             this.tab_general.Controls.Add(this.check_userDefaultSettings);\r
             this.tab_general.Controls.Add(this.label1);\r
+            this.tab_general.Controls.Add(this.label2);\r
+            this.tab_general.Controls.Add(this.drp_completeOption);\r
             this.tab_general.Location = new System.Drawing.Point(4, 22);\r
             this.tab_general.Name = "tab_general";\r
-            this.tab_general.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_general.Size = new System.Drawing.Size(411, 232);\r
-            this.tab_general.TabIndex = 0;\r
-            this.tab_general.Text = "Startup";\r
+            this.tab_general.Size = new System.Drawing.Size(482, 252);\r
+            this.tab_general.TabIndex = 3;\r
+            this.tab_general.Text = "General";\r
             this.tab_general.UseVisualStyleBackColor = true;\r
             // \r
+            // btn_browse\r
+            // \r
+            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_browse.Location = new System.Drawing.Point(386, 174);\r
+            this.btn_browse.Name = "btn_browse";\r
+            this.btn_browse.Size = new System.Drawing.Size(68, 22);\r
+            this.btn_browse.TabIndex = 78;\r
+            this.btn_browse.Text = "Browse";\r
+            this.btn_browse.UseVisualStyleBackColor = true;\r
+            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);\r
+            // \r
+            // label10\r
+            // \r
+            this.label10.AutoSize = true;\r
+            this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label10.Location = new System.Drawing.Point(111, 177);\r
+            this.label10.Name = "label10";\r
+            this.label10.Size = new System.Drawing.Size(82, 13);\r
+            this.label10.TabIndex = 77;\r
+            this.label10.Text = "Default Path:";\r
+            // \r
+            // text_an_path\r
+            // \r
+            this.text_an_path.Location = new System.Drawing.Point(199, 174);\r
+            this.text_an_path.Name = "text_an_path";\r
+            this.text_an_path.Size = new System.Drawing.Size(181, 21);\r
+            this.text_an_path.TabIndex = 76;\r
+            this.ToolTip.SetToolTip(this.text_an_path, "Default location where Auto named files are stored.");\r
+            this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);\r
+            // \r
+            // check_autoNaming\r
+            // \r
+            this.check_autoNaming.AutoSize = true;\r
+            this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_autoNaming.Location = new System.Drawing.Point(114, 151);\r
+            this.check_autoNaming.Name = "check_autoNaming";\r
+            this.check_autoNaming.Size = new System.Drawing.Size(340, 17);\r
+            this.check_autoNaming.TabIndex = 72;\r
+            this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)";\r
+            this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");\r
+            this.check_autoNaming.UseVisualStyleBackColor = true;\r
+            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);\r
+            // \r
+            // label13\r
+            // \r
+            this.label13.AutoSize = true;\r
+            this.label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label13.Location = new System.Drawing.Point(10, 152);\r
+            this.label13.Name = "label13";\r
+            this.label13.Size = new System.Drawing.Size(86, 13);\r
+            this.label13.TabIndex = 71;\r
+            this.label13.Text = "Output files:";\r
+            // \r
             // check_tooltip\r
             // \r
             this.check_tooltip.AutoSize = true;\r
             this.check_tooltip.BackColor = System.Drawing.Color.Transparent;\r
             this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_tooltip.Location = new System.Drawing.Point(16, 56);\r
+            this.check_tooltip.Location = new System.Drawing.Point(114, 41);\r
             this.check_tooltip.Name = "check_tooltip";\r
             this.check_tooltip.Size = new System.Drawing.Size(135, 17);\r
-            this.check_tooltip.TabIndex = 57;\r
+            this.check_tooltip.TabIndex = 70;\r
             this.check_tooltip.Text = "Enable GUI tooltips";\r
+            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls.");\r
             this.check_tooltip.UseVisualStyleBackColor = false;\r
             this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);\r
             // \r
@@ -158,11 +210,13 @@ namespace Handbrake
             this.check_updateCheck.AutoSize = true;\r
             this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;\r
             this.check_updateCheck.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_updateCheck.Location = new System.Drawing.Point(16, 33);\r
+            this.check_updateCheck.Location = new System.Drawing.Point(114, 18);\r
             this.check_updateCheck.Name = "check_updateCheck";\r
             this.check_updateCheck.Size = new System.Drawing.Size(131, 17);\r
-            this.check_updateCheck.TabIndex = 55;\r
+            this.check_updateCheck.TabIndex = 68;\r
             this.check_updateCheck.Text = "Check for updates";\r
+            this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +\r
+                    " starts.");\r
             this.check_updateCheck.UseVisualStyleBackColor = false;\r
             this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);\r
             // \r
@@ -171,11 +225,12 @@ namespace Handbrake
             this.check_userDefaultSettings.AutoSize = true;\r
             this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent;\r
             this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 79);\r
+            this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 64);\r
             this.check_userDefaultSettings.Name = "check_userDefaultSettings";\r
             this.check_userDefaultSettings.Size = new System.Drawing.Size(166, 17);\r
-            this.check_userDefaultSettings.TabIndex = 56;\r
+            this.check_userDefaultSettings.TabIndex = 69;\r
             this.check_userDefaultSettings.Text = "Load my default settings";\r
+            this.ToolTip.SetToolTip(this.check_userDefaultSettings, "Loads the users default settings rather than the Normal preset.");\r
             this.check_userDefaultSettings.UseVisualStyleBackColor = false;\r
             this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);\r
             // \r
@@ -184,142 +239,59 @@ namespace Handbrake
             this.label1.AutoSize = true;\r
             this.label1.BackColor = System.Drawing.Color.Transparent;\r
             this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label1.Location = new System.Drawing.Point(13, 13);\r
+            this.label1.Location = new System.Drawing.Point(21, 19);\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(76, 13);\r
-            this.label1.TabIndex = 0;\r
-            this.label1.Text = "On Startup";\r
-            // \r
-            // tabPage1\r
-            // \r
-            this.tabPage1.Controls.Add(this.check_cli_minimized);\r
-            this.tabPage1.Controls.Add(this.label12);\r
-            this.tabPage1.Controls.Add(this.btn_drive_detect);\r
-            this.tabPage1.Controls.Add(this.label6);\r
-            this.tabPage1.Controls.Add(this.btn_browse);\r
-            this.tabPage1.Controls.Add(this.label10);\r
-            this.tabPage1.Controls.Add(this.text_an_path);\r
-            this.tabPage1.Controls.Add(this.check_autoNaming);\r
-            this.tabPage1.Controls.Add(this.label9);\r
-            this.tabPage1.Controls.Add(this.label2);\r
-            this.tabPage1.Controls.Add(this.drp_completeOption);\r
-            this.tabPage1.Controls.Add(this.label5);\r
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);\r
-            this.tabPage1.Name = "tabPage1";\r
-            this.tabPage1.Size = new System.Drawing.Size(411, 288);\r
-            this.tabPage1.TabIndex = 3;\r
-            this.tabPage1.Text = "General";\r
-            this.tabPage1.UseVisualStyleBackColor = true;\r
-            // \r
-            // btn_drive_detect\r
-            // \r
-            this.btn_drive_detect.AutoSize = true;\r
-            this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_drive_detect.Location = new System.Drawing.Point(17, 204);\r
-            this.btn_drive_detect.Name = "btn_drive_detect";\r
-            this.btn_drive_detect.Size = new System.Drawing.Size(383, 17);\r
-            this.btn_drive_detect.TabIndex = 64;\r
-            this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu";\r
-            this.btn_drive_detect.UseVisualStyleBackColor = true;\r
-            this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);\r
-            // \r
-            // label6\r
-            // \r
-            this.label6.AutoSize = true;\r
-            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label6.Location = new System.Drawing.Point(14, 182);\r
-            this.label6.Name = "label6";\r
-            this.label6.Size = new System.Drawing.Size(108, 13);\r
-            this.label6.TabIndex = 63;\r
-            this.label6.Text = "Drive Detection";\r
-            // \r
-            // btn_browse\r
-            // \r
-            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_browse.Location = new System.Drawing.Point(326, 146);\r
-            this.btn_browse.Name = "btn_browse";\r
-            this.btn_browse.Size = new System.Drawing.Size(68, 22);\r
-            this.btn_browse.TabIndex = 62;\r
-            this.btn_browse.Text = "Browse";\r
-            this.btn_browse.UseVisualStyleBackColor = true;\r
-            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);\r
-            // \r
-            // label10\r
-            // \r
-            this.label10.AutoSize = true;\r
-            this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label10.Location = new System.Drawing.Point(14, 131);\r
-            this.label10.Name = "label10";\r
-            this.label10.Size = new System.Drawing.Size(145, 13);\r
-            this.label10.TabIndex = 61;\r
-            this.label10.Text = "Default AutoName Path:";\r
-            // \r
-            // text_an_path\r
-            // \r
-            this.text_an_path.Location = new System.Drawing.Point(17, 147);\r
-            this.text_an_path.Name = "text_an_path";\r
-            this.text_an_path.Size = new System.Drawing.Size(303, 21);\r
-            this.text_an_path.TabIndex = 60;\r
-            this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);\r
-            // \r
-            // check_autoNaming\r
-            // \r
-            this.check_autoNaming.AutoSize = true;\r
-            this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_autoNaming.Location = new System.Drawing.Point(17, 101);\r
-            this.check_autoNaming.Name = "check_autoNaming";\r
-            this.check_autoNaming.Size = new System.Drawing.Size(340, 17);\r
-            this.check_autoNaming.TabIndex = 56;\r
-            this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)";\r
-            this.check_autoNaming.UseVisualStyleBackColor = true;\r
-            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);\r
-            // \r
-            // label9\r
-            // \r
-            this.label9.AutoSize = true;\r
-            this.label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label9.Location = new System.Drawing.Point(14, 78);\r
-            this.label9.Name = "label9";\r
-            this.label9.Size = new System.Drawing.Size(90, 13);\r
-            this.label9.TabIndex = 55;\r
-            this.label9.Text = "Auto Naming";\r
+            this.label1.Size = new System.Drawing.Size(75, 13);\r
+            this.label1.TabIndex = 67;\r
+            this.label1.Text = "At Launch:";\r
             // \r
             // label2\r
             // \r
             this.label2.AutoSize = true;\r
             this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label2.Location = new System.Drawing.Point(14, 19);\r
+            this.label2.Location = new System.Drawing.Point(12, 106);\r
             this.label2.Name = "label2";\r
-            this.label2.Size = new System.Drawing.Size(80, 13);\r
+            this.label2.Size = new System.Drawing.Size(84, 13);\r
             this.label2.TabIndex = 54;\r
-            this.label2.Text = "When Done";\r
-            // \r
-            // tab_debug\r
-            // \r
-            this.tab_debug.Controls.Add(this.label3);\r
-            this.tab_debug.Controls.Add(this.drp_Priority);\r
-            this.tab_debug.Controls.Add(this.Label11);\r
-            this.tab_debug.Controls.Add(this.drp_processors);\r
-            this.tab_debug.Controls.Add(this.Label4);\r
-            this.tab_debug.Location = new System.Drawing.Point(4, 22);\r
-            this.tab_debug.Name = "tab_debug";\r
-            this.tab_debug.Size = new System.Drawing.Size(411, 232);\r
-            this.tab_debug.TabIndex = 2;\r
-            this.tab_debug.Text = "Performance";\r
-            this.tab_debug.UseVisualStyleBackColor = true;\r
-            // \r
-            // label3\r
-            // \r
-            this.label3.AutoSize = true;\r
-            this.label3.BackColor = System.Drawing.Color.Transparent;\r
-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(13, 13);\r
-            this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(176, 13);\r
-            this.label3.TabIndex = 44;\r
-            this.label3.Text = "Process(or) Configuration";\r
+            this.label2.Text = "When Done:";\r
+            // \r
+            // tab_cli\r
+            // \r
+            this.tab_cli.Controls.Add(this.check_cli_minimized);\r
+            this.tab_cli.Controls.Add(this.label12);\r
+            this.tab_cli.Controls.Add(this.drp_Priority);\r
+            this.tab_cli.Controls.Add(this.Label11);\r
+            this.tab_cli.Controls.Add(this.drp_processors);\r
+            this.tab_cli.Controls.Add(this.Label4);\r
+            this.tab_cli.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_cli.Name = "tab_cli";\r
+            this.tab_cli.Size = new System.Drawing.Size(482, 252);\r
+            this.tab_cli.TabIndex = 2;\r
+            this.tab_cli.Text = "CLI";\r
+            this.tab_cli.UseVisualStyleBackColor = true;\r
+            // \r
+            // check_cli_minimized\r
+            // \r
+            this.check_cli_minimized.AutoSize = true;\r
+            this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_cli_minimized.Location = new System.Drawing.Point(71, 18);\r
+            this.check_cli_minimized.Name = "check_cli_minimized";\r
+            this.check_cli_minimized.Size = new System.Drawing.Size(155, 17);\r
+            this.check_cli_minimized.TabIndex = 76;\r
+            this.check_cli_minimized.Text = "Use window minimized";\r
+            this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");\r
+            this.check_cli_minimized.UseVisualStyleBackColor = true;\r
+            this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);\r
+            // \r
+            // label12\r
+            // \r
+            this.label12.AutoSize = true;\r
+            this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label12.Location = new System.Drawing.Point(21, 19);\r
+            this.label12.Name = "label12";\r
+            this.label12.Size = new System.Drawing.Size(32, 13);\r
+            this.label12.TabIndex = 75;\r
+            this.label12.Text = "CLI:";\r
             // \r
             // drp_Priority\r
             // \r
@@ -333,10 +305,12 @@ namespace Handbrake
             "Normal",\r
             "Below Normal",\r
             "Low"});\r
-            this.drp_Priority.Location = new System.Drawing.Point(163, 68);\r
+            this.drp_Priority.Location = new System.Drawing.Point(177, 72);\r
             this.drp_Priority.Name = "drp_Priority";\r
             this.drp_Priority.Size = new System.Drawing.Size(111, 21);\r
             this.drp_Priority.TabIndex = 43;\r
+            this.ToolTip.SetToolTip(this.drp_Priority, "Set the application priority level for the CLI. \r\nIt\'s best to leave this on Belo" +\r
+                    "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n");\r
             this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);\r
             // \r
             // Label11\r
@@ -344,11 +318,11 @@ namespace Handbrake
             this.Label11.AutoSize = true;\r
             this.Label11.BackColor = System.Drawing.Color.Transparent;\r
             this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label11.Location = new System.Drawing.Point(15, 44);\r
+            this.Label11.Location = new System.Drawing.Point(68, 48);\r
             this.Label11.Name = "Label11";\r
-            this.Label11.Size = new System.Drawing.Size(142, 13);\r
+            this.Label11.Size = new System.Drawing.Size(103, 13);\r
             this.Label11.TabIndex = 40;\r
-            this.Label11.Text = "Number of processors: ";\r
+            this.Label11.Text = "Processor cores:";\r
             // \r
             // drp_processors\r
             // \r
@@ -365,10 +339,12 @@ namespace Handbrake
             "6",\r
             "7",\r
             "8"});\r
-            this.drp_processors.Location = new System.Drawing.Point(163, 41);\r
+            this.drp_processors.Location = new System.Drawing.Point(177, 45);\r
             this.drp_processors.Name = "drp_processors";\r
             this.drp_processors.Size = new System.Drawing.Size(111, 21);\r
             this.drp_processors.TabIndex = 41;\r
+            this.ToolTip.SetToolTip(this.drp_processors, "The number of processor\'s / processor cores. Unless your having problems, leave o" +\r
+                    "n Automatic.");\r
             this.drp_processors.SelectedIndexChanged += new System.EventHandler(this.drp_processors_SelectedIndexChanged);\r
             // \r
             // Label4\r
@@ -376,11 +352,47 @@ namespace Handbrake
             this.Label4.AutoSize = true;\r
             this.Label4.BackColor = System.Drawing.Color.Transparent;\r
             this.Label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label4.Location = new System.Drawing.Point(15, 71);\r
+            this.Label4.Location = new System.Drawing.Point(68, 75);\r
             this.Label4.Name = "Label4";\r
-            this.Label4.Size = new System.Drawing.Size(132, 13);\r
+            this.Label4.Size = new System.Drawing.Size(84, 13);\r
             this.Label4.TabIndex = 42;\r
-            this.Label4.Text = "Default Priority Level:";\r
+            this.Label4.Text = "Priority level:";\r
+            // \r
+            // tab_advanced\r
+            // \r
+            this.tab_advanced.Controls.Add(this.btn_drive_detect);\r
+            this.tab_advanced.Controls.Add(this.label6);\r
+            this.tab_advanced.Location = new System.Drawing.Point(4, 22);\r
+            this.tab_advanced.Name = "tab_advanced";\r
+            this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);\r
+            this.tab_advanced.Size = new System.Drawing.Size(482, 252);\r
+            this.tab_advanced.TabIndex = 4;\r
+            this.tab_advanced.Text = "Advanced";\r
+            this.tab_advanced.UseVisualStyleBackColor = true;\r
+            // \r
+            // btn_drive_detect\r
+            // \r
+            this.btn_drive_detect.AutoSize = true;\r
+            this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_drive_detect.Location = new System.Drawing.Point(62, 19);\r
+            this.btn_drive_detect.Name = "btn_drive_detect";\r
+            this.btn_drive_detect.Size = new System.Drawing.Size(383, 17);\r
+            this.btn_drive_detect.TabIndex = 72;\r
+            this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu";\r
+            this.ToolTip.SetToolTip(this.btn_drive_detect, "Enables the Source button\'s ability to detect DVD\'s.\r\nIf this option is enabled, " +\r
+                    "DVD\'s will be listed in the source menu.");\r
+            this.btn_drive_detect.UseVisualStyleBackColor = true;\r
+            this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);\r
+            // \r
+            // label6\r
+            // \r
+            this.label6.AutoSize = true;\r
+            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label6.Location = new System.Drawing.Point(21, 19);\r
+            this.label6.Name = "label6";\r
+            this.label6.Size = new System.Drawing.Size(35, 13);\r
+            this.label6.TabIndex = 71;\r
+            this.label6.Text = "GUI:";\r
             // \r
             // label8\r
             // \r
@@ -401,41 +413,16 @@ namespace Handbrake
             this.pictureBox2.TabIndex = 60;\r
             this.pictureBox2.TabStop = false;\r
             // \r
-            // label7\r
+            // ToolTip\r
             // \r
-            this.label7.AutoSize = true;\r
-            this.label7.Location = new System.Drawing.Point(50, 39);\r
-            this.label7.Name = "label7";\r
-            this.label7.Size = new System.Drawing.Size(146, 13);\r
-            this.label7.TabIndex = 59;\r
-            this.label7.Text = "Modify program options.";\r
-            // \r
-            // check_cli_minimized\r
-            // \r
-            this.check_cli_minimized.AutoSize = true;\r
-            this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_cli_minimized.Location = new System.Drawing.Point(17, 257);\r
-            this.check_cli_minimized.Name = "check_cli_minimized";\r
-            this.check_cli_minimized.Size = new System.Drawing.Size(138, 17);\r
-            this.check_cli_minimized.TabIndex = 66;\r
-            this.check_cli_minimized.Text = "Start CLI Minimized";\r
-            this.check_cli_minimized.UseVisualStyleBackColor = true;\r
-            this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);\r
-            // \r
-            // label12\r
-            // \r
-            this.label12.AutoSize = true;\r
-            this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label12.Location = new System.Drawing.Point(14, 235);\r
-            this.label12.Name = "label12";\r
-            this.label12.Size = new System.Drawing.Size(28, 13);\r
-            this.label12.TabIndex = 65;\r
-            this.label12.Text = "CLI";\r
+            this.ToolTip.Active = false;\r
+            this.ToolTip.AutomaticDelay = 1000;\r
+            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
+            this.ToolTip.ToolTipTitle = "Tooltip";\r
             // \r
             // frmOptions\r
             // \r
-            this.ClientSize = new System.Drawing.Size(443, 412);\r
-            this.Controls.Add(this.label7);\r
+            this.ClientSize = new System.Drawing.Size(521, 374);\r
             this.Controls.Add(this.label8);\r
             this.Controls.Add(this.pictureBox2);\r
             this.Controls.Add(this.tab_options);\r
@@ -451,10 +438,10 @@ namespace Handbrake
             this.tab_options.ResumeLayout(false);\r
             this.tab_general.ResumeLayout(false);\r
             this.tab_general.PerformLayout();\r
-            this.tabPage1.ResumeLayout(false);\r
-            this.tabPage1.PerformLayout();\r
-            this.tab_debug.ResumeLayout(false);\r
-            this.tab_debug.PerformLayout();\r
+            this.tab_cli.ResumeLayout(false);\r
+            this.tab_cli.PerformLayout();\r
+            this.tab_advanced.ResumeLayout(false);\r
+            this.tab_advanced.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
@@ -465,33 +452,31 @@ namespace Handbrake
 \r
         internal System.Windows.Forms.Button btn_close;\r
         internal System.Windows.Forms.ComboBox drp_completeOption;\r
-        internal System.Windows.Forms.Label label5;\r
         private System.Windows.Forms.TabControl tab_options;\r
-        private System.Windows.Forms.TabPage tab_general;\r
         private System.Windows.Forms.Label label2;\r
-        private System.Windows.Forms.Label label1;\r
-        internal System.Windows.Forms.CheckBox check_tooltip;\r
-        internal System.Windows.Forms.CheckBox check_updateCheck;\r
-        internal System.Windows.Forms.CheckBox check_userDefaultSettings;\r
-        private System.Windows.Forms.TabPage tab_debug;\r
+        private System.Windows.Forms.TabPage tab_cli;\r
         private System.Windows.Forms.Label label8;\r
         private System.Windows.Forms.PictureBox pictureBox2;\r
-        private System.Windows.Forms.Label label7;\r
-        private System.Windows.Forms.TabPage tabPage1;\r
-        private System.Windows.Forms.Label label9;\r
-        internal System.Windows.Forms.CheckBox check_autoNaming;\r
-        private System.Windows.Forms.TextBox text_an_path;\r
-        internal System.Windows.Forms.Button btn_browse;\r
-        internal System.Windows.Forms.Label label10;\r
+        private System.Windows.Forms.TabPage tab_general;\r
         private System.Windows.Forms.FolderBrowserDialog pathFinder;\r
-        private System.Windows.Forms.Label label3;\r
         internal System.Windows.Forms.ComboBox drp_Priority;\r
         internal System.Windows.Forms.Label Label11;\r
         internal System.Windows.Forms.Label Label4;\r
         internal System.Windows.Forms.ComboBox drp_processors;\r
+        internal System.Windows.Forms.CheckBox check_tooltip;\r
+        internal System.Windows.Forms.CheckBox check_updateCheck;\r
+        internal System.Windows.Forms.CheckBox check_userDefaultSettings;\r
+        private System.Windows.Forms.Label label1;\r
+        private System.Windows.Forms.TabPage tab_advanced;\r
         internal System.Windows.Forms.CheckBox btn_drive_detect;\r
         private System.Windows.Forms.Label label6;\r
+        private System.Windows.Forms.Label label13;\r
+        internal System.Windows.Forms.Button btn_browse;\r
+        internal System.Windows.Forms.Label label10;\r
+        private System.Windows.Forms.TextBox text_an_path;\r
+        internal System.Windows.Forms.CheckBox check_autoNaming;\r
         internal System.Windows.Forms.CheckBox check_cli_minimized;\r
         private System.Windows.Forms.Label label12;\r
+        internal System.Windows.Forms.ToolTip ToolTip;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 66e5460..a314046 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -16,45 +16,41 @@ namespace Handbrake
 {\r
     public partial class frmOptions : Form\r
     {\r
+        private frmMain mainWindow;\r
         /// <summary>\r
         /// When the form loads, Initialise all the setting components with their correct values\r
         /// </summary>\r
-        public frmOptions()\r
+        public frmOptions(frmMain window)\r
         {\r
             InitializeComponent();\r
+            mainWindow = window;\r
+\r
+            // Enable Tooltips.\r
+            if (Properties.Settings.Default.tooltipEnable == "Checked")\r
+                ToolTip.Active = true;\r
             \r
+            // Setup Widgets to match settings.\r
             if (Properties.Settings.Default.updateStatus == "Checked")\r
-            {\r
                 check_updateCheck.CheckState = CheckState.Checked;\r
-            }\r
 \r
             if (Properties.Settings.Default.defaultSettings == "Checked")\r
-            {\r
                 check_userDefaultSettings.CheckState = CheckState.Checked;\r
-            }\r
+\r
             drp_processors.Text = Properties.Settings.Default.Processors;\r
             drp_Priority.Text = Properties.Settings.Default.processPriority;\r
             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;\r
 \r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
-            {\r
                 check_tooltip.CheckState = CheckState.Checked;\r
-            }\r
 \r
             if (Properties.Settings.Default.autoNaming == "Checked")\r
-            {\r
                 check_autoNaming.CheckState = CheckState.Checked;\r
-            }\r
 \r
             if (Properties.Settings.Default.drive_detection == "Checked")\r
-            {\r
                 btn_drive_detect.CheckState = CheckState.Checked;\r
-            }\r
 \r
             if (Properties.Settings.Default.cli_minimized == "Checked")\r
-            {\r
                check_cli_minimized.CheckState = CheckState.Checked;\r
-            }\r
 \r
             text_an_path.Text = Properties.Settings.Default.autoNamePath;\r
 \r
@@ -92,6 +88,16 @@ namespace Handbrake
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();\r
+            if (check_tooltip.Checked)\r
+            {\r
+                ToolTip.Active = true;\r
+                mainWindow.ToolTip.Active = true;\r
+            }\r
+            else\r
+            {\r
+                ToolTip.Active = false;\r
+                mainWindow.ToolTip.Active = false;\r
+            }\r
         }\r
 \r
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -132,5 +138,6 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
+\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 4935247..74bf186 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>132, 18</value>\r
+  </metadata>\r
   <metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r