WinGui:

- Few UI updates around the Help and Presets Menus and Presets Control Bar.

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

13 files changed, 369 insertions, 365 deletions

diff --git a/win/C#/Functions/ToolStripRenderOverride.cs b/win/C#/Functions/ToolStripRenderOverride.cs
new file mode 100644
index 000000000..28845c2ed
--- /dev/null
+++ b/win/C#/Functions/ToolStripRenderOverride.cs
@@ -0,0 +1,51 @@
+/*  ToolStripRenderOverride.cs $

+    This file is part of the HandBrake source code.

+    Homepage: <http://handbrake.fr/>.

+    It may be used under the terms of the GNU General Public License. */

+

+namespace Handbrake.Functions

+{

+    using System.Windows.Forms;

+

+    public class ToolStripRenderOverride : ToolStripProfessionalRenderer

+    {

+        ToolStripSystemRenderer render = new ToolStripSystemRenderer();

+    

+        public ToolStripRenderOverride()

+        {       

+        }

+

+        /// <summary>

+        /// Fix for a bug in .NET where a white line appears at the bottom of the control.

+        /// http://connect.microsoft.com/VisualStudio/feedback/details/92862/toolstrip-always-draws-a-border-on-the-bottom-with-rendermode-system-and-docked-left-or-right

+        /// </summary>

+        /// <param name="e">

+        /// ToolStripRenderEventArgs 

+        /// </param>

+        protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)

+        {

+            //base.OnRenderToolStripBorder(e);

+        }

+

+        /// <summary>

+        /// Change the Button Hover Background style to the system button style

+        /// </summary>

+        /// <param name="e">

+        /// ToolStripRenderEventArgs

+        /// </param>

+        protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)

+        {     

+            render.DrawButtonBackground(e);

+        }

+

+        protected override void OnRenderDropDownButtonBackground(ToolStripItemRenderEventArgs e)

+        {

+            render.DrawDropDownButtonBackground(e);

+        }

+

+        protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)

+        {

+            //base.OnRenderToolStripBackground(e);

+        }  

+    }

+}

diff --git a/win/C#/HandBrake.ApplicationServices/Settings.StyleCop b/win/C#/HandBrake.ApplicationServices/Settings.StyleCop
index a691f204b..e61afbf69 100644
--- a/win/C#/HandBrake.ApplicationServices/Settings.StyleCop
+++ b/win/C#/HandBrake.ApplicationServices/Settings.StyleCop
@@ -1,7 +1,4 @@
 <StyleCopSettings Version="4.3">

-  <GlobalSettings>

-    <BooleanProperty Name="WriteCache">False</BooleanProperty>

-  </GlobalSettings>

   <Analyzers>

     <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.DocumentationRules">

       <Rules>

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index bd9e78197..6229fc46a 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -148,6 +148,10 @@
     <Reference Include="AxInterop.QTOControlLib">

       <HintPath>libraries\AxInterop.QTOControlLib.dll</HintPath>

     </Reference>

+    <Reference Include="DevExpress.Data.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />

+    <Reference Include="DevExpress.Utils.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />

+    <Reference Include="DevExpress.XtraBars.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

+    <Reference Include="DevExpress.XtraEditors.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>libraries\Growl.Connector.dll</HintPath>

@@ -207,6 +211,7 @@
     <Compile Include="Controls\x264Panel.Designer.cs">

       <DependentUpon>x264Panel.cs</DependentUpon>

     </Compile>

+    <Compile Include="Functions\ToolStripRenderOverride.cs" />

     <Compile Include="Model\ActivityLogMode.cs" />

     <Compile Include="Model\QueryPictureSettingsMode.cs" />

     <Compile Include="Model\QueryEncodeMode.cs" />

@@ -366,6 +371,7 @@
     <None Include="Resources\AddToQueue.png" />

     <Content Include="Resources\ActivityWindow_small.png" />

     <None Include="Resources\AddToQueue_small.png" />

+    <None Include="Resources\Add16.png" />

     <Content Include="Resources\copy.png" />

     <Content Include="Resources\disc_small.png" />

     <None Include="Resources\hb32.png" />

@@ -375,6 +381,9 @@
     <None Include="Resources\folder.png" />

     <None Include="Resources\download.png" />

     <None Include="Resources\ErrorX.png" />

+    <None Include="Resources\Help32.png" />

+    <None Include="Resources\Help24.png" />

+    <None Include="Resources\Options24.png" />

     <Content Include="Resources\Output_Small.png" />

     <None Include="Resources\Pause.png" />

     <None Include="Resources\Play.png" />

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 1a36ab3d1..81617ccdb 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -74,6 +74,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Add16 {

+            get {

+                object obj = ResourceManager.GetObject("Add16", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap AddToQueue {

             get {

                 object obj = ResourceManager.GetObject("AddToQueue", resourceCulture);

@@ -88,6 +95,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Close {

+            get {

+                object obj = ResourceManager.GetObject("Close", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap copy {

             get {

                 object obj = ResourceManager.GetObject("copy", resourceCulture);

@@ -151,6 +165,20 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Help24 {

+            get {

+                object obj = ResourceManager.GetObject("Help24", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

+        internal static System.Drawing.Bitmap Help32 {

+            get {

+                object obj = ResourceManager.GetObject("Help32", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap info16 {

             get {

                 object obj = ResourceManager.GetObject("info16", resourceCulture);

@@ -186,6 +214,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Options24 {

+            get {

+                object obj = ResourceManager.GetObject("Options24", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap Output_Small {

             get {

                 object obj = ResourceManager.GetObject("Output_Small", resourceCulture);

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index 68312651e..9b2288d09 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -112,12 +112,12 @@
     <value>2.0</value>

   </resheader>

   <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

   <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="General_Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

@@ -208,4 +208,19 @@
   <data name="ErrorX" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\ErrorX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

+  <data name="Help24" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Help24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Help32" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Help32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Add16" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Add16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Options24" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Options24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/C#/Resources/Add16.png b/win/C#/Resources/Add16.png
new file mode 100644
index 000000000..bad13b66a
--- /dev/null
+++ b/win/C#/Resources/Add16.png
diff --git a/win/C#/Resources/Close.png b/win/C#/Resources/Close.png
new file mode 100644
index 000000000..7d84e5b80
--- /dev/null
+++ b/win/C#/Resources/Close.png
diff --git a/win/C#/Resources/Help24.png b/win/C#/Resources/Help24.png
new file mode 100644
index 000000000..1c6e13069
--- /dev/null
+++ b/win/C#/Resources/Help24.png
diff --git a/win/C#/Resources/Help32.png b/win/C#/Resources/Help32.png
new file mode 100644
index 000000000..e3dc78d0b
--- /dev/null
+++ b/win/C#/Resources/Help32.png
diff --git a/win/C#/Resources/Options24.png b/win/C#/Resources/Options24.png
new file mode 100644
index 000000000..ac5ca9678
--- /dev/null
+++ b/win/C#/Resources/Options24.png
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 91f9fa010..a5a33516b 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -39,7 +39,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -50,7 +50,6 @@ namespace Handbrake
             this.drp_videoFramerate = new System.Windows.Forms.ComboBox();

             this.slider_videoQuality = new System.Windows.Forms.TrackBar();

             this.text_bitrate = new System.Windows.Forms.TextBox();

-            this.btn_setDefault = new System.Windows.Forms.Button();

             this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();

             this.check_iPodAtom = new System.Windows.Forms.CheckBox();

             this.data_chpt = new System.Windows.Forms.DataGridView();

@@ -59,8 +58,6 @@ namespace Handbrake
             this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();

             this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();

-            this.btn_addPreset = new System.Windows.Forms.Button();

-            this.btn_removePreset = new System.Windows.Forms.Button();

             this.drop_format = new System.Windows.Forms.ComboBox();

             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();

             this.drop_chapterStart = new System.Windows.Forms.ComboBox();

@@ -91,20 +88,6 @@ namespace Handbrake
             this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();

             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();

             this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

             this.frmMainMenu = new System.Windows.Forms.MenuStrip();

             this.label5 = new System.Windows.Forms.Label();

             this.Label47 = new System.Windows.Forms.Label();

@@ -141,6 +124,16 @@ namespace Handbrake
             this.rtf_query = new System.Windows.Forms.RichTextBox();

             this.groupBox2 = new System.Windows.Forms.GroupBox();

             this.splitContainer1 = new System.Windows.Forms.SplitContainer();

+            this.presetsToolStrip = new System.Windows.Forms.ToolStrip();

+            this.BtnAddPreset = new System.Windows.Forms.ToolStripButton();

+            this.BtnRemovePreset = new System.Windows.Forms.ToolStripButton();

+            this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton();

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

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

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

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

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

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

             this.toolStrip1 = new System.Windows.Forms.ToolStrip();

             this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();

             this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();

@@ -155,6 +148,13 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();

             this.tb_preview = new System.Windows.Forms.ToolStripButton();

             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();

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

+            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();

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

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

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

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

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

             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);

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

             this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar();

@@ -199,6 +199,7 @@ namespace Handbrake
             this.splitContainer1.Panel1.SuspendLayout();

             this.splitContainer1.Panel2.SuspendLayout();

             this.splitContainer1.SuspendLayout();

+            this.presetsToolStrip.SuspendLayout();

             this.toolStrip1.SuspendLayout();

             this.StatusStrip.SuspendLayout();

             this.tableLayoutPanel2.SuspendLayout();

@@ -331,20 +332,6 @@ namespace Handbrake
             this.text_bitrate.TabIndex = 14;

             this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");

             // 

-            // btn_setDefault

-            // 

-            this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_setDefault.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_setDefault.Location = new System.Drawing.Point(135, 8);

-            this.btn_setDefault.Name = "btn_setDefault";

-            this.btn_setDefault.Size = new System.Drawing.Size(101, 22);

-            this.btn_setDefault.TabIndex = 2;

-            this.btn_setDefault.Text = "Set Default";

-            this.ToolTip.SetToolTip(this.btn_setDefault, "Set current settings as program defaults.");

-            this.btn_setDefault.UseVisualStyleBackColor = true;

-            this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);

-            // 

             // check_optimiseMP4

             // 

             this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left;

@@ -396,9 +383,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle2.Format = "N0";

+            dataGridViewCellStyle2.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle2;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

@@ -439,34 +426,6 @@ namespace Handbrake
             this.btn_file_source.Text = "Video File";

             this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);

             // 

-            // btn_addPreset

-            // 

-            this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_addPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_addPreset.Location = new System.Drawing.Point(3, 8);

-            this.btn_addPreset.Name = "btn_addPreset";

-            this.btn_addPreset.Size = new System.Drawing.Size(49, 22);

-            this.btn_addPreset.TabIndex = 0;

-            this.btn_addPreset.Text = "Add";

-            this.ToolTip.SetToolTip(this.btn_addPreset, "This option will take the current settings and add it as a new preset.");

-            this.btn_addPreset.UseVisualStyleBackColor = true;

-            this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);

-            // 

-            // btn_removePreset

-            // 

-            this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_removePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_removePreset.Location = new System.Drawing.Point(58, 8);

-            this.btn_removePreset.Name = "btn_removePreset";

-            this.btn_removePreset.Size = new System.Drawing.Size(71, 22);

-            this.btn_removePreset.TabIndex = 1;

-            this.btn_removePreset.Text = "Remove";

-            this.ToolTip.SetToolTip(this.btn_removePreset, "Remove the selected preset from the panel above.");

-            this.btn_removePreset.UseVisualStyleBackColor = true;

-            this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);

-            // 

             // drop_format

             // 

             this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

@@ -591,13 +550,13 @@ namespace Handbrake
             // treeView_presets

             // 

             this.treeView_presets.ContextMenuStrip = this.presets_menu;

-            this.treeView_presets.Dock = System.Windows.Forms.DockStyle.Fill;

             this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue;

             this.treeView_presets.FullRowSelect = true;

             this.treeView_presets.HideSelection = false;

             this.treeView_presets.ItemHeight = 21;

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

+            this.treeView_presets.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);

             this.treeView_presets.Name = "treeView_presets";

             this.treeView_presets.ShowLines = false;

             this.treeView_presets.Size = new System.Drawing.Size(240, 424);

@@ -755,125 +714,11 @@ namespace Handbrake
             this.mnu_options.Text = "Options";

             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);

             // 

-            // PresetsToolStripMenuItem

-            // 

-            this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.mnu_presetReset,

-            this.mnu_delete_preset,

-            this.toolStripSeparator7,

-            this.btn_new_preset,

-            this.mnu_importMacPreset,

-            this.mnu_exportMacPreset,

-            this.mnu_SelectDefault});

-            this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";

-            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);

-            this.PresetsToolStripMenuItem.Text = "&Presets";

-            // 

-            // mnu_presetReset

-            // 

-            this.mnu_presetReset.Name = "mnu_presetReset";

-            this.mnu_presetReset.Size = new System.Drawing.Size(194, 22);

-            this.mnu_presetReset.Text = "Update Built-in Presets";

-            this.mnu_presetReset.ToolTipText = "Resets all presets.";

-            this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);

-            // 

-            // mnu_delete_preset

-            // 

-            this.mnu_delete_preset.Name = "mnu_delete_preset";

-            this.mnu_delete_preset.Size = new System.Drawing.Size(194, 22);

-            this.mnu_delete_preset.Text = "Delete Built-in Presets";

-            this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click);

-            // 

-            // toolStripSeparator7

-            // 

-            this.toolStripSeparator7.Name = "toolStripSeparator7";

-            this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6);

-            // 

-            // btn_new_preset

-            // 

-            this.btn_new_preset.Name = "btn_new_preset";

-            this.btn_new_preset.Size = new System.Drawing.Size(194, 22);

-            this.btn_new_preset.Text = "Save Preset";

-            this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click);

-            // 

-            // mnu_importMacPreset

-            // 

-            this.mnu_importMacPreset.Name = "mnu_importMacPreset";

-            this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22);

-            this.mnu_importMacPreset.Text = "Import";

-            this.mnu_importMacPreset.ToolTipText = "Import a (plist - mac format) preset.\r\nYou can import plist presets from the Mac," +

-                " Linux and Windows GUI\'s";

-            this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click);

-            // 

-            // mnu_exportMacPreset

-            // 

-            this.mnu_exportMacPreset.Name = "mnu_exportMacPreset";

-            this.mnu_exportMacPreset.Size = new System.Drawing.Size(194, 22);

-            this.mnu_exportMacPreset.Text = "Export (Experimental)";

-            this.mnu_exportMacPreset.ToolTipText = "Export a (plist - mac format) preset.\r\nThis can be imported by Mac, Linux or Wind" +

-                "ows GUI\'s";

-            this.mnu_exportMacPreset.Click += new System.EventHandler(this.mnu_exportMacPreset_Click);

-            // 

-            // mnu_SelectDefault

-            // 

-            this.mnu_SelectDefault.Name = "mnu_SelectDefault";

-            this.mnu_SelectDefault.Size = new System.Drawing.Size(194, 22);

-            this.mnu_SelectDefault.Text = "Select Default Preset";

-            this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset";

-            this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click);

-            // 

-            // HelpToolStripMenuItem

-            // 

-            this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.mnu_user_guide,

-            this.ToolStripSeparator3,

-            this.mnu_UpdateCheck,

-            this.toolStripSeparator6,

-            this.mnu_about});

-            this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";

-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);

-            this.HelpToolStripMenuItem.Text = "&Help";

-            // 

-            // mnu_user_guide

-            // 

-            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;

-            this.mnu_user_guide.Name = "mnu_user_guide";

-            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);

-            this.mnu_user_guide.Text = "HandBrake User Guide";

-            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);

-            // 

-            // ToolStripSeparator3

-            // 

-            this.ToolStripSeparator3.Name = "ToolStripSeparator3";

-            this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);

-            // 

-            // mnu_UpdateCheck

-            // 

-            this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";

-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);

-            this.mnu_UpdateCheck.Text = "Check for Updates";

-            this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);

-            // 

-            // toolStripSeparator6

-            // 

-            this.toolStripSeparator6.Name = "toolStripSeparator6";

-            this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);

-            // 

-            // mnu_about

-            // 

-            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;

-            this.mnu_about.Name = "mnu_about";

-            this.mnu_about.Size = new System.Drawing.Size(192, 22);

-            this.mnu_about.Text = "About...";

-            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);

-            // 

             // frmMainMenu

             // 

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

             this.FileToolStripMenuItem,

-            this.ToolsToolStripMenuItem,

-            this.PresetsToolStripMenuItem,

-            this.HelpToolStripMenuItem});

+            this.ToolsToolStripMenuItem});

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

             this.frmMainMenu.Name = "frmMainMenu";

             this.frmMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

@@ -1292,13 +1137,114 @@ namespace Handbrake
             // 

             // splitContainer1.Panel2

             // 

-            this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset);

-            this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset);

-            this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault);

+            this.splitContainer1.Panel2.Controls.Add(this.presetsToolStrip);

             this.splitContainer1.Size = new System.Drawing.Size(240, 462);

             this.splitContainer1.SplitterDistance = 424;

             this.splitContainer1.TabIndex = 0;

             // 

+            // presetsToolStrip

+            // 

+            this.presetsToolStrip.CanOverflow = false;

+            this.presetsToolStrip.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.presetsToolStrip.GripMargin = new System.Windows.Forms.Padding(0);

+            this.presetsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;

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

+            this.BtnAddPreset,

+            this.BtnRemovePreset,

+            this.toolStripDropDownButton2});

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

+            this.presetsToolStrip.Name = "presetsToolStrip";

+            this.presetsToolStrip.Padding = new System.Windows.Forms.Padding(0);

+            this.presetsToolStrip.Size = new System.Drawing.Size(240, 34);

+            this.presetsToolStrip.TabIndex = 2;

+            this.presetsToolStrip.Text = "toolStrip2";

+            // 

+            // BtnAddPreset

+            // 

+            this.BtnAddPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.BtnAddPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

+            this.BtnAddPreset.Image = global::Handbrake.Properties.Resources.Add16;

+            this.BtnAddPreset.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.BtnAddPreset.Name = "BtnAddPreset";

+            this.BtnAddPreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

+            this.BtnAddPreset.Padding = new System.Windows.Forms.Padding(8, 0, 8, 0);

+            this.BtnAddPreset.Size = new System.Drawing.Size(65, 31);

+            this.BtnAddPreset.Text = "Add";

+            this.BtnAddPreset.Click += new System.EventHandler(this.BtnAddPreset_Click);

+            // 

+            // BtnRemovePreset

+            // 

+            this.BtnRemovePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.BtnRemovePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

+            this.BtnRemovePreset.Image = global::Handbrake.Properties.Resources.Close;

+            this.BtnRemovePreset.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.BtnRemovePreset.Name = "BtnRemovePreset";

+            this.BtnRemovePreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

+            this.BtnRemovePreset.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);

+            this.BtnRemovePreset.Size = new System.Drawing.Size(82, 31);

+            this.BtnRemovePreset.Text = "Remove";

+            this.BtnRemovePreset.Click += new System.EventHandler(this.BtnRemovePreset_Click);

+            // 

+            // toolStripDropDownButton2

+            // 

+            this.toolStripDropDownButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.MnuSetDefaultPreset,

+            this.toolStripSeparator3,

+            this.MnuImportPreset,

+            this.MnuExportPreset,

+            this.toolStripSeparator6,

+            this.MnuResetBuiltInPresets});

+            this.toolStripDropDownButton2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.toolStripDropDownButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

+            this.toolStripDropDownButton2.Image = global::Handbrake.Properties.Resources.Options24;

+            this.toolStripDropDownButton2.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.toolStripDropDownButton2.Name = "toolStripDropDownButton2";

+            this.toolStripDropDownButton2.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

+            this.toolStripDropDownButton2.Size = new System.Drawing.Size(79, 31);

+            this.toolStripDropDownButton2.Text = "Options";

+            // 

+            // MnuSetDefaultPreset

+            // 

+            this.MnuSetDefaultPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.MnuSetDefaultPreset.Name = "MnuSetDefaultPreset";

+            this.MnuSetDefaultPreset.Size = new System.Drawing.Size(178, 22);

+            this.MnuSetDefaultPreset.Text = "Set Default";

+            this.MnuSetDefaultPreset.Click += new System.EventHandler(this.MnuSetDefaultPreset_Click);

+            // 

+            // toolStripSeparator3

+            // 

+            this.toolStripSeparator3.Name = "toolStripSeparator3";

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

+            // 

+            // MnuImportPreset

+            // 

+            this.MnuImportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.MnuImportPreset.Name = "MnuImportPreset";

+            this.MnuImportPreset.Size = new System.Drawing.Size(178, 22);

+            this.MnuImportPreset.Text = "Import";

+            this.MnuImportPreset.Click += new System.EventHandler(this.MnuImportPreset_Click);

+            // 

+            // MnuExportPreset

+            // 

+            this.MnuExportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.MnuExportPreset.Name = "MnuExportPreset";

+            this.MnuExportPreset.Size = new System.Drawing.Size(178, 22);

+            this.MnuExportPreset.Text = "Export";

+            this.MnuExportPreset.Click += new System.EventHandler(this.MnuExportPreset_Click);

+            // 

+            // toolStripSeparator6

+            // 

+            this.toolStripSeparator6.Name = "toolStripSeparator6";

+            this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6);

+            // 

+            // MnuResetBuiltInPresets

+            // 

+            this.MnuResetBuiltInPresets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.MnuResetBuiltInPresets.Name = "MnuResetBuiltInPresets";

+            this.MnuResetBuiltInPresets.Size = new System.Drawing.Size(178, 22);

+            this.MnuResetBuiltInPresets.Text = "Reset Built-In Presets";

+            this.MnuResetBuiltInPresets.Click += new System.EventHandler(this.MnuResetBuiltInPresets_Click);

+            // 

             // toolStrip1

             // 

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

@@ -1310,7 +1256,9 @@ namespace Handbrake
             this.btn_showQueue,

             this.toolStripSeparator4,

             this.tb_preview,

-            this.btn_ActivityWindow});

+            this.btn_ActivityWindow,

+            this.toolStripSeparator8,

+            this.toolStripDropDownButton1});

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

             this.toolStrip1.Name = "toolStrip1";

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

@@ -1441,6 +1389,63 @@ namespace Handbrake
                 "ently running encode.";

             this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);

             // 

+            // toolStripSeparator8

+            // 

+            this.toolStripSeparator8.Name = "toolStripSeparator8";

+            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);

+            // 

+            // toolStripDropDownButton1

+            // 

+            this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;

+            this.toolStripDropDownButton1.AutoSize = false;

+            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.MnuUserGuide,

+            this.toolStripSeparator9,

+            this.MnuCheckForUpdates,

+            this.toolStripSeparator11,

+            this.MnuAboutHandBrake});

+            this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Help24;

+            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";

+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(69, 36);

+            this.toolStripDropDownButton1.Text = "Help";

+            // 

+            // MnuUserGuide

+            // 

+            this.MnuUserGuide.Image = global::Handbrake.Properties.Resources.info16;

+            this.MnuUserGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.MnuUserGuide.Name = "MnuUserGuide";

+            this.MnuUserGuide.Size = new System.Drawing.Size(192, 24);

+            this.MnuUserGuide.Text = "HandBrake User Guide";

+            this.MnuUserGuide.Click += new System.EventHandler(this.MnuUserGuide_Click);

+            // 

+            // toolStripSeparator9

+            // 

+            this.toolStripSeparator9.Name = "toolStripSeparator9";

+            this.toolStripSeparator9.Size = new System.Drawing.Size(189, 6);

+            // 

+            // MnuCheckForUpdates

+            // 

+            this.MnuCheckForUpdates.Name = "MnuCheckForUpdates";

+            this.MnuCheckForUpdates.Size = new System.Drawing.Size(192, 24);

+            this.MnuCheckForUpdates.Text = "Check for Updates";

+            this.MnuCheckForUpdates.Click += new System.EventHandler(this.MnuCheckForUpdates_Click);

+            // 

+            // toolStripSeparator11

+            // 

+            this.toolStripSeparator11.Name = "toolStripSeparator11";

+            this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6);

+            // 

+            // MnuAboutHandBrake

+            // 

+            this.MnuAboutHandBrake.Image = global::Handbrake.Properties.Resources.hb16;

+            this.MnuAboutHandBrake.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.MnuAboutHandBrake.Name = "MnuAboutHandBrake";

+            this.MnuAboutHandBrake.Size = new System.Drawing.Size(192, 24);

+            this.MnuAboutHandBrake.Text = "About HandBrake";

+            this.MnuAboutHandBrake.Click += new System.EventHandler(this.MnuAboutHandBrake_Click);

+            // 

             // notifyIcon

             // 

             this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;

@@ -1752,8 +1757,11 @@ namespace Handbrake
             this.groupBox2.ResumeLayout(false);

             this.splitContainer1.Panel1.ResumeLayout(false);

             this.splitContainer1.Panel2.ResumeLayout(false);

+            this.splitContainer1.Panel2.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();

             this.splitContainer1.ResumeLayout(false);

+            this.presetsToolStrip.ResumeLayout(false);

+            this.presetsToolStrip.PerformLayout();

             this.toolStrip1.ResumeLayout(false);

             this.toolStrip1.PerformLayout();

             this.StatusStrip.ResumeLayout(false);

@@ -1781,11 +1789,6 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_encode;

         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;

         internal System.Windows.Forms.ToolStripMenuItem mnu_options;

-        internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem;

-        internal System.Windows.Forms.ToolStripMenuItem mnu_presetReset;

-        internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;

-        internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;

-        internal System.Windows.Forms.ToolStripMenuItem mnu_about;

         internal System.Windows.Forms.MenuStrip frmMainMenu;

         internal System.Windows.Forms.Label Label3;

         internal System.Windows.Forms.ComboBox drp_videoEncoder;

@@ -1806,13 +1809,8 @@ namespace Handbrake
         internal System.Windows.Forms.TabControl tabs_panel;

         internal System.Windows.Forms.Label lbl_framerate;

         private System.Windows.Forms.GroupBox groupBox2;

-        internal System.Windows.Forms.Button btn_setDefault;

-        private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;

-        private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;

-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;

         private System.Windows.Forms.SaveFileDialog DVD_Save;

         private System.Windows.Forms.OpenFileDialog File_Open;

-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;

         internal System.Windows.Forms.CheckBox check_iPodAtom;

         private System.Windows.Forms.TabPage tab_chapters;

         internal System.Windows.Forms.Label label31;

@@ -1829,8 +1827,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripButton btn_showQueue;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;

         private System.Windows.Forms.ToolStripButton btn_ActivityWindow;

-        internal System.Windows.Forms.Button btn_removePreset;

-        internal System.Windows.Forms.Button btn_addPreset;

         internal System.Windows.Forms.Label label25;

         internal System.Windows.Forms.TabPage tab_advanced;

         internal System.Windows.Forms.TreeView treeView_presets;

@@ -1839,9 +1835,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem btn_restore;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;

         private System.Windows.Forms.ToolStripMenuItem btn_file_source;

-        private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;

-        private System.Windows.Forms.ToolStripMenuItem btn_new_preset;

-        private System.Windows.Forms.ToolStripMenuItem mnu_user_guide;

         private System.Windows.Forms.ToolStripDropDownButton btn_source;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;

         private System.Windows.Forms.ToolStripMenuItem btn_dvd_source;

@@ -1892,7 +1885,6 @@ namespace Handbrake
         internal Label Label10;

         private Label labelStaticSource;

         private FlowLayoutPanel SourceLayoutPanel;

-        private ToolStripMenuItem mnu_importMacPreset;

         private OpenFileDialog openPreset;

         private Button btn_importChapters;

         private OpenFileDialog File_ChapterImport;

@@ -1904,12 +1896,28 @@ namespace Handbrake
         private Button btn_export;

         private DataGridViewTextBoxColumn number;

         private DataGridViewTextBoxColumn name;

-        private ToolStripMenuItem mnu_exportMacPreset;

         private ToolStripProgressBar ProgressBarStatus;

         internal CheckBox checkMaximumFramerate;

         private ToolStripMenuItem btnTitleSpecific;

         private ToolStripMenuItem FileTitleSpecificScan;

         private ToolStripMenuItem FolderTitleSpecificScan;

         internal Label lbl_rfwarn;

+        private ToolStripSeparator toolStripSeparator8;

+        private ToolStripDropDownButton toolStripDropDownButton1;

+        private ToolStripMenuItem MnuUserGuide;

+        private ToolStripSeparator toolStripSeparator9;

+        private ToolStripMenuItem MnuCheckForUpdates;

+        private ToolStripSeparator toolStripSeparator11;

+        private ToolStripMenuItem MnuAboutHandBrake;

+        private ToolStrip presetsToolStrip;

+        private ToolStripButton BtnAddPreset;

+        private ToolStripButton BtnRemovePreset;

+        private ToolStripDropDownButton toolStripDropDownButton2;

+        private ToolStripMenuItem MnuSetDefaultPreset;

+        private ToolStripSeparator toolStripSeparator3;

+        private ToolStripMenuItem MnuImportPreset;

+        private ToolStripMenuItem MnuExportPreset;

+        private ToolStripSeparator toolStripSeparator6;

+        private ToolStripMenuItem MnuResetBuiltInPresets;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 1323ff734..184af65a6 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -15,6 +15,9 @@ namespace Handbrake
     using System.Linq;

     using System.Threading;

     using System.Windows.Forms;

+

+    using DevExpress.Utils.Menu;

+

     using Functions;

 

     using HandBrake.ApplicationServices.EventArgs;

@@ -119,6 +122,7 @@ namespace Handbrake
         public frmMain(string[] args)

         {

             InitializeComponent();

+            this.presetsToolStrip.Renderer = new ToolStripRenderOverride();

 

             // We can use LibHB, if the library hb.dll exists.

             this.SourceScan = File.Exists("hb.dll") ? (IScan)new LibScan() : new ScanService();

@@ -434,136 +438,24 @@ namespace Handbrake
 

         #endregion

 

-        #region Presets Menu

-

-        /// <summary>

-        /// Reset the Built in Presets

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_presetReset_Click(object sender, EventArgs e)

-        {

-            presetHandler.UpdateBuiltInPresets(string.Empty);

-            LoadPresetPanel();

-            if (treeView_presets.Nodes.Count == 0)

-                MessageBox.Show(

-                    "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",

-                    "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

-            else

-                MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);

-

-            treeView_presets.ExpandAll();

-        }

-

-        /// <summary>

-        /// Delete the selected preset

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_delete_preset_Click(object sender, EventArgs e)

-        {

-            presetHandler.ClearBuiltIn();

-            LoadPresetPanel(); // Reload the preset panel

-        }

+        #region Help Menu (Toolbar)

 

         /// <summary>

-        /// Select the Normal preset

+        ///  Menu - Display the User Guide Web Page

         /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_SelectDefault_Click(object sender, EventArgs e)

-        {

-            loadNormalPreset();

-        }

-

-        /// <summary>

-        /// Import a plist Preset

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_importMacPreset_Click(object sender, EventArgs e)

-        {

-            ImportPreset();

-        }

-

-        /// <summary>

-        /// Export a Plist Preset

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_exportMacPreset_Click(object sender, EventArgs e)

-        {

-            ExportPreset();

-        }

-

-        /// <summary>

-        /// Create a new Preset

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void btn_new_preset_Click(object sender, EventArgs e)

-        {

-            Form preset = new frmAddPreset(this, presetHandler);

-            if (preset.ShowDialog() == DialogResult.OK)

-            {

-                TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black };

-                treeView_presets.Nodes.Add(presetTreeview);

-                presetHandler.LastPresetAdded = null;

-            }

-        }

-

-        #endregion

-

-        #region Help Menu

-

-        /// <summary>

-        /// Menu - Display the User Guide Web Page

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_user_guide_Click(object sender, EventArgs e)

+        /// <param name="sender">The Sender</param>

+        /// <param name="e">The EventArgs</param>

+        private void MnuUserGuide_Click(object sender, EventArgs e)

         {

             Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");

         }

 

         /// <summary>

-        /// Menu - Check for Updates

+        /// Check for Updates

         /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_UpdateCheck_Click(object sender, EventArgs e)

+        /// <param name="sender">The Sender</param>

+        /// <param name="e">The EventArgs</param>

+        private void MnuCheckForUpdates_Click(object sender, EventArgs e)

         {

             lbl_updateCheck.Visible = true;

             Settings.Default.lastUpdateCheckDate = DateTime.Now;

@@ -577,13 +469,9 @@ namespace Handbrake
         /// <summary>

         /// Menu - Display the About Window

         /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void mnu_about_Click(object sender, EventArgs e)

+        /// <param name="sender">The Sender</param>

+        /// <param name="e">The EventArgs</param>

+        private void MnuAboutHandBrake_Click(object sender, EventArgs e)

         {

             using (frmAbout About = new frmAbout())

             {

@@ -708,16 +596,7 @@ namespace Handbrake
 

         // Presets Management

 

-        /// <summary>

-        /// Button - Add a preset

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void btn_addPreset_Click(object sender, EventArgs e)

+        private void BtnAddPreset_Click(object sender, EventArgs e)

         {

             Form preset = new frmAddPreset(this, presetHandler);

             if (preset.ShowDialog() == DialogResult.OK)

@@ -728,16 +607,7 @@ namespace Handbrake
             }

         }

 

-        /// <summary>

-        /// Button - remove a Preset

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void btn_removePreset_Click(object sender, EventArgs e)

+        private void BtnRemovePreset_Click(object sender, EventArgs e)

         {

             DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",

                                                   MessageBoxButtons.YesNo, MessageBoxIcon.Question);

@@ -752,16 +622,8 @@ namespace Handbrake
             treeView_presets.Select();

         }

 

-        /// <summary>

-        /// Button - Set the selected preset as the default

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void btn_setDefault_Click(object sender, EventArgs e)

+

+        private void MnuSetDefaultPreset_Click(object sender, EventArgs e)

         {

             if (treeView_presets.SelectedNode != null)

             {

@@ -778,6 +640,30 @@ namespace Handbrake
                 MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

         }

 

+        private void MnuImportPreset_Click(object sender, EventArgs e)

+        {

+            this.ImportPreset();

+        }

+

+        private void MnuExportPreset_Click(object sender, EventArgs e)

+        {

+            this.ExportPreset();

+        }

+

+        private void MnuResetBuiltInPresets_Click(object sender, EventArgs e)

+        {

+            presetHandler.UpdateBuiltInPresets(string.Empty);

+            LoadPresetPanel();

+            if (treeView_presets.Nodes.Count == 0)

+                MessageBox.Show(

+                    "Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!",

+                    "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

+            else

+                MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);

+

+            treeView_presets.ExpandAll();

+        }

+

         /// <summary>

         /// PresetBar Mouse Down event

         /// </summary>

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 4a84da4e3..2207ca2cf 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -174,7 +174,7 @@ The Following options are not 100% accurate:
 - Encode video between a start and end frame.</value>

   </data>

   <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

-    <value>1354, 15</value>

+    <value>984, 17</value>

   </metadata>

   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>232, 15</value>

@@ -197,6 +197,9 @@ Don't forget to re-generate this query if you change any GUI options.
 Note that this will also override the "Add to Queue" query as well.

 Clear the text box below to return to the internal query generation.</value>

   </data>

+  <metadata name="presetsToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>565, 54</value>

+  </metadata>

   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>767, 15</value>

   </metadata>