OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

githubのコードからのfolk


Commit MetaInfo

Revision01adcc9f552746e1c6b4503c78d4c27891d68f68 (tree)
Time2011-02-27 08:01:54
Authorsr55 <sr55@b64f...>
Commitersr55

Log Message

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

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

Change Summary

Incremental Difference

--- /dev/null
+++ b/win/C#/Functions/ToolStripRenderOverride.cs
@@ -0,0 +1,51 @@
1+/* ToolStripRenderOverride.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr/>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+namespace Handbrake.Functions
7+{
8+ using System.Windows.Forms;
9+
10+ public class ToolStripRenderOverride : ToolStripProfessionalRenderer
11+ {
12+ ToolStripSystemRenderer render = new ToolStripSystemRenderer();
13+
14+ public ToolStripRenderOverride()
15+ {
16+ }
17+
18+ /// <summary>
19+ /// Fix for a bug in .NET where a white line appears at the bottom of the control.
20+ /// http://connect.microsoft.com/VisualStudio/feedback/details/92862/toolstrip-always-draws-a-border-on-the-bottom-with-rendermode-system-and-docked-left-or-right
21+ /// </summary>
22+ /// <param name="e">
23+ /// ToolStripRenderEventArgs
24+ /// </param>
25+ protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
26+ {
27+ //base.OnRenderToolStripBorder(e);
28+ }
29+
30+ /// <summary>
31+ /// Change the Button Hover Background style to the system button style
32+ /// </summary>
33+ /// <param name="e">
34+ /// ToolStripRenderEventArgs
35+ /// </param>
36+ protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)
37+ {
38+ render.DrawButtonBackground(e);
39+ }
40+
41+ protected override void OnRenderDropDownButtonBackground(ToolStripItemRenderEventArgs e)
42+ {
43+ render.DrawDropDownButtonBackground(e);
44+ }
45+
46+ protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
47+ {
48+ //base.OnRenderToolStripBackground(e);
49+ }
50+ }
51+}
--- a/win/C#/HandBrake.ApplicationServices/Settings.StyleCop
+++ b/win/C#/HandBrake.ApplicationServices/Settings.StyleCop
@@ -1,7 +1,4 @@
11 <StyleCopSettings Version="4.3">
2- <GlobalSettings>
3- <BooleanProperty Name="WriteCache">False</BooleanProperty>
4- </GlobalSettings>
52 <Analyzers>
63 <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.DocumentationRules">
74 <Rules>
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -148,6 +148,10 @@
148148 <Reference Include="AxInterop.QTOControlLib">
149149 <HintPath>libraries\AxInterop.QTOControlLib.dll</HintPath>
150150 </Reference>
151+ <Reference Include="DevExpress.Data.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
152+ <Reference Include="DevExpress.Utils.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
153+ <Reference Include="DevExpress.XtraBars.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
154+ <Reference Include="DevExpress.XtraEditors.v10.2, Version=10.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
151155 <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">
152156 <SpecificVersion>False</SpecificVersion>
153157 <HintPath>libraries\Growl.Connector.dll</HintPath>
@@ -207,6 +211,7 @@
207211 <Compile Include="Controls\x264Panel.Designer.cs">
208212 <DependentUpon>x264Panel.cs</DependentUpon>
209213 </Compile>
214+ <Compile Include="Functions\ToolStripRenderOverride.cs" />
210215 <Compile Include="Model\ActivityLogMode.cs" />
211216 <Compile Include="Model\QueryPictureSettingsMode.cs" />
212217 <Compile Include="Model\QueryEncodeMode.cs" />
@@ -366,6 +371,7 @@
366371 <None Include="Resources\AddToQueue.png" />
367372 <Content Include="Resources\ActivityWindow_small.png" />
368373 <None Include="Resources\AddToQueue_small.png" />
374+ <None Include="Resources\Add16.png" />
369375 <Content Include="Resources\copy.png" />
370376 <Content Include="Resources\disc_small.png" />
371377 <None Include="Resources\hb32.png" />
@@ -375,6 +381,9 @@
375381 <None Include="Resources\folder.png" />
376382 <None Include="Resources\download.png" />
377383 <None Include="Resources\ErrorX.png" />
384+ <None Include="Resources\Help32.png" />
385+ <None Include="Resources\Help24.png" />
386+ <None Include="Resources\Options24.png" />
378387 <Content Include="Resources\Output_Small.png" />
379388 <None Include="Resources\Pause.png" />
380389 <None Include="Resources\Play.png" />
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -74,6 +74,13 @@ namespace Handbrake.Properties {
7474 }
7575 }
7676
77+ internal static System.Drawing.Bitmap Add16 {
78+ get {
79+ object obj = ResourceManager.GetObject("Add16", resourceCulture);
80+ return ((System.Drawing.Bitmap)(obj));
81+ }
82+ }
83+
7784 internal static System.Drawing.Bitmap AddToQueue {
7885 get {
7986 object obj = ResourceManager.GetObject("AddToQueue", resourceCulture);
@@ -88,6 +95,13 @@ namespace Handbrake.Properties {
8895 }
8996 }
9097
98+ internal static System.Drawing.Bitmap Close {
99+ get {
100+ object obj = ResourceManager.GetObject("Close", resourceCulture);
101+ return ((System.Drawing.Bitmap)(obj));
102+ }
103+ }
104+
91105 internal static System.Drawing.Bitmap copy {
92106 get {
93107 object obj = ResourceManager.GetObject("copy", resourceCulture);
@@ -151,6 +165,20 @@ namespace Handbrake.Properties {
151165 }
152166 }
153167
168+ internal static System.Drawing.Bitmap Help24 {
169+ get {
170+ object obj = ResourceManager.GetObject("Help24", resourceCulture);
171+ return ((System.Drawing.Bitmap)(obj));
172+ }
173+ }
174+
175+ internal static System.Drawing.Bitmap Help32 {
176+ get {
177+ object obj = ResourceManager.GetObject("Help32", resourceCulture);
178+ return ((System.Drawing.Bitmap)(obj));
179+ }
180+ }
181+
154182 internal static System.Drawing.Bitmap info16 {
155183 get {
156184 object obj = ResourceManager.GetObject("info16", resourceCulture);
@@ -186,6 +214,13 @@ namespace Handbrake.Properties {
186214 }
187215 }
188216
217+ internal static System.Drawing.Bitmap Options24 {
218+ get {
219+ object obj = ResourceManager.GetObject("Options24", resourceCulture);
220+ return ((System.Drawing.Bitmap)(obj));
221+ }
222+ }
223+
189224 internal static System.Drawing.Bitmap Output_Small {
190225 get {
191226 object obj = ResourceManager.GetObject("Output_Small", resourceCulture);
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -112,12 +112,12 @@
112112 <value>2.0</value>
113113 </resheader>
114114 <resheader name="reader">
115- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116 </resheader>
117117 <resheader name="writer">
118- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
120+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121 <data name="General_Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">
122122 <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123123 </data>
@@ -208,4 +208,19 @@
208208 <data name="ErrorX" type="System.Resources.ResXFileRef, System.Windows.Forms">
209209 <value>..\Resources\ErrorX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
210210 </data>
211+ <data name="Help24" type="System.Resources.ResXFileRef, System.Windows.Forms">
212+ <value>..\Resources\Help24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
213+ </data>
214+ <data name="Help32" type="System.Resources.ResXFileRef, System.Windows.Forms">
215+ <value>..\Resources\Help32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
216+ </data>
217+ <data name="Add16" type="System.Resources.ResXFileRef, System.Windows.Forms">
218+ <value>..\Resources\Add16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
219+ </data>
220+ <data name="Options24" type="System.Resources.ResXFileRef, System.Windows.Forms">
221+ <value>..\Resources\Options24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
222+ </data>
223+ <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
224+ <value>..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
225+ </data>
211226 </root>
\ No newline at end of file
Binary files /dev/null and b/win/C#/Resources/Add16.png differ
Binary files /dev/null and b/win/C#/Resources/Close.png differ
Binary files /dev/null and b/win/C#/Resources/Help24.png differ
Binary files /dev/null and b/win/C#/Resources/Help32.png differ
Binary files /dev/null and b/win/C#/Resources/Options24.png differ
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -39,7 +39,7 @@ namespace Handbrake
3939 this.components = new System.ComponentModel.Container();
4040 System.Windows.Forms.ContextMenuStrip notifyIconMenu;
4141 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
42- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
42+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
4343 this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
4444 this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
4545 this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
@@ -50,7 +50,6 @@ namespace Handbrake
5050 this.drp_videoFramerate = new System.Windows.Forms.ComboBox();
5151 this.slider_videoQuality = new System.Windows.Forms.TrackBar();
5252 this.text_bitrate = new System.Windows.Forms.TextBox();
53- this.btn_setDefault = new System.Windows.Forms.Button();
5453 this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();
5554 this.check_iPodAtom = new System.Windows.Forms.CheckBox();
5655 this.data_chpt = new System.Windows.Forms.DataGridView();
@@ -59,8 +58,6 @@ namespace Handbrake
5958 this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
6059 this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();
6160 this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();
62- this.btn_addPreset = new System.Windows.Forms.Button();
63- this.btn_removePreset = new System.Windows.Forms.Button();
6461 this.drop_format = new System.Windows.Forms.ComboBox();
6562 this.drop_chapterFinish = new System.Windows.Forms.ComboBox();
6663 this.drop_chapterStart = new System.Windows.Forms.ComboBox();
@@ -91,20 +88,6 @@ namespace Handbrake
9188 this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();
9289 this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
9390 this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();
94- this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
95- this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();
96- this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();
97- this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
98- this.btn_new_preset = new System.Windows.Forms.ToolStripMenuItem();
99- this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem();
100- this.mnu_exportMacPreset = new System.Windows.Forms.ToolStripMenuItem();
101- this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();
102- this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
103- this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();
104- this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
105- this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();
106- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
107- this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();
10891 this.frmMainMenu = new System.Windows.Forms.MenuStrip();
10992 this.label5 = new System.Windows.Forms.Label();
11093 this.Label47 = new System.Windows.Forms.Label();
@@ -141,6 +124,16 @@ namespace Handbrake
141124 this.rtf_query = new System.Windows.Forms.RichTextBox();
142125 this.groupBox2 = new System.Windows.Forms.GroupBox();
143126 this.splitContainer1 = new System.Windows.Forms.SplitContainer();
127+ this.presetsToolStrip = new System.Windows.Forms.ToolStrip();
128+ this.BtnAddPreset = new System.Windows.Forms.ToolStripButton();
129+ this.BtnRemovePreset = new System.Windows.Forms.ToolStripButton();
130+ this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton();
131+ this.MnuSetDefaultPreset = new System.Windows.Forms.ToolStripMenuItem();
132+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
133+ this.MnuImportPreset = new System.Windows.Forms.ToolStripMenuItem();
134+ this.MnuExportPreset = new System.Windows.Forms.ToolStripMenuItem();
135+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
136+ this.MnuResetBuiltInPresets = new System.Windows.Forms.ToolStripMenuItem();
144137 this.toolStrip1 = new System.Windows.Forms.ToolStrip();
145138 this.btn_source = new System.Windows.Forms.ToolStripDropDownButton();
146139 this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();
@@ -155,6 +148,13 @@ namespace Handbrake
155148 this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
156149 this.tb_preview = new System.Windows.Forms.ToolStripButton();
157150 this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();
151+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
152+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
153+ this.MnuUserGuide = new System.Windows.Forms.ToolStripMenuItem();
154+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
155+ this.MnuCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();
156+ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
157+ this.MnuAboutHandBrake = new System.Windows.Forms.ToolStripMenuItem();
158158 this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
159159 this.StatusStrip = new System.Windows.Forms.StatusStrip();
160160 this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar();
@@ -199,6 +199,7 @@ namespace Handbrake
199199 this.splitContainer1.Panel1.SuspendLayout();
200200 this.splitContainer1.Panel2.SuspendLayout();
201201 this.splitContainer1.SuspendLayout();
202+ this.presetsToolStrip.SuspendLayout();
202203 this.toolStrip1.SuspendLayout();
203204 this.StatusStrip.SuspendLayout();
204205 this.tableLayoutPanel2.SuspendLayout();
@@ -331,20 +332,6 @@ namespace Handbrake
331332 this.text_bitrate.TabIndex = 14;
332333 this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");
333334 //
334- // btn_setDefault
335- //
336- this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;
337- this.btn_setDefault.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
338- this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
339- this.btn_setDefault.Location = new System.Drawing.Point(135, 8);
340- this.btn_setDefault.Name = "btn_setDefault";
341- this.btn_setDefault.Size = new System.Drawing.Size(101, 22);
342- this.btn_setDefault.TabIndex = 2;
343- this.btn_setDefault.Text = "Set Default";
344- this.ToolTip.SetToolTip(this.btn_setDefault, "Set current settings as program defaults.");
345- this.btn_setDefault.UseVisualStyleBackColor = true;
346- this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);
347- //
348335 // check_optimiseMP4
349336 //
350337 this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -396,9 +383,9 @@ namespace Handbrake
396383 //
397384 // number
398385 //
399- dataGridViewCellStyle1.Format = "N0";
400- dataGridViewCellStyle1.NullValue = null;
401- this.number.DefaultCellStyle = dataGridViewCellStyle1;
386+ dataGridViewCellStyle2.Format = "N0";
387+ dataGridViewCellStyle2.NullValue = null;
388+ this.number.DefaultCellStyle = dataGridViewCellStyle2;
402389 this.number.Frozen = true;
403390 this.number.HeaderText = "Chapter Number";
404391 this.number.MaxInputLength = 3;
@@ -439,34 +426,6 @@ namespace Handbrake
439426 this.btn_file_source.Text = "Video File";
440427 this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);
441428 //
442- // btn_addPreset
443- //
444- this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;
445- this.btn_addPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
446- this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
447- this.btn_addPreset.Location = new System.Drawing.Point(3, 8);
448- this.btn_addPreset.Name = "btn_addPreset";
449- this.btn_addPreset.Size = new System.Drawing.Size(49, 22);
450- this.btn_addPreset.TabIndex = 0;
451- this.btn_addPreset.Text = "Add";
452- this.ToolTip.SetToolTip(this.btn_addPreset, "This option will take the current settings and add it as a new preset.");
453- this.btn_addPreset.UseVisualStyleBackColor = true;
454- this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);
455- //
456- // btn_removePreset
457- //
458- this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;
459- this.btn_removePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
460- this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
461- this.btn_removePreset.Location = new System.Drawing.Point(58, 8);
462- this.btn_removePreset.Name = "btn_removePreset";
463- this.btn_removePreset.Size = new System.Drawing.Size(71, 22);
464- this.btn_removePreset.TabIndex = 1;
465- this.btn_removePreset.Text = "Remove";
466- this.ToolTip.SetToolTip(this.btn_removePreset, "Remove the selected preset from the panel above.");
467- this.btn_removePreset.UseVisualStyleBackColor = true;
468- this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);
469- //
470429 // drop_format
471430 //
472431 this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -591,13 +550,13 @@ namespace Handbrake
591550 // treeView_presets
592551 //
593552 this.treeView_presets.ContextMenuStrip = this.presets_menu;
594- this.treeView_presets.Dock = System.Windows.Forms.DockStyle.Fill;
595553 this.treeView_presets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
596554 this.treeView_presets.ForeColor = System.Drawing.Color.DarkBlue;
597555 this.treeView_presets.FullRowSelect = true;
598556 this.treeView_presets.HideSelection = false;
599557 this.treeView_presets.ItemHeight = 21;
600558 this.treeView_presets.Location = new System.Drawing.Point(0, 0);
559+ this.treeView_presets.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
601560 this.treeView_presets.Name = "treeView_presets";
602561 this.treeView_presets.ShowLines = false;
603562 this.treeView_presets.Size = new System.Drawing.Size(240, 424);
@@ -755,125 +714,11 @@ namespace Handbrake
755714 this.mnu_options.Text = "Options";
756715 this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
757716 //
758- // PresetsToolStripMenuItem
759- //
760- this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
761- this.mnu_presetReset,
762- this.mnu_delete_preset,
763- this.toolStripSeparator7,
764- this.btn_new_preset,
765- this.mnu_importMacPreset,
766- this.mnu_exportMacPreset,
767- this.mnu_SelectDefault});
768- this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";
769- this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
770- this.PresetsToolStripMenuItem.Text = "&Presets";
771- //
772- // mnu_presetReset
773- //
774- this.mnu_presetReset.Name = "mnu_presetReset";
775- this.mnu_presetReset.Size = new System.Drawing.Size(194, 22);
776- this.mnu_presetReset.Text = "Update Built-in Presets";
777- this.mnu_presetReset.ToolTipText = "Resets all presets.";
778- this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);
779- //
780- // mnu_delete_preset
781- //
782- this.mnu_delete_preset.Name = "mnu_delete_preset";
783- this.mnu_delete_preset.Size = new System.Drawing.Size(194, 22);
784- this.mnu_delete_preset.Text = "Delete Built-in Presets";
785- this.mnu_delete_preset.Click += new System.EventHandler(this.mnu_delete_preset_Click);
786- //
787- // toolStripSeparator7
788- //
789- this.toolStripSeparator7.Name = "toolStripSeparator7";
790- this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6);
791- //
792- // btn_new_preset
793- //
794- this.btn_new_preset.Name = "btn_new_preset";
795- this.btn_new_preset.Size = new System.Drawing.Size(194, 22);
796- this.btn_new_preset.Text = "Save Preset";
797- this.btn_new_preset.Click += new System.EventHandler(this.btn_new_preset_Click);
798- //
799- // mnu_importMacPreset
800- //
801- this.mnu_importMacPreset.Name = "mnu_importMacPreset";
802- this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22);
803- this.mnu_importMacPreset.Text = "Import";
804- this.mnu_importMacPreset.ToolTipText = "Import a (plist - mac format) preset.\r\nYou can import plist presets from the Mac," +
805- " Linux and Windows GUI\'s";
806- this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click);
807- //
808- // mnu_exportMacPreset
809- //
810- this.mnu_exportMacPreset.Name = "mnu_exportMacPreset";
811- this.mnu_exportMacPreset.Size = new System.Drawing.Size(194, 22);
812- this.mnu_exportMacPreset.Text = "Export (Experimental)";
813- this.mnu_exportMacPreset.ToolTipText = "Export a (plist - mac format) preset.\r\nThis can be imported by Mac, Linux or Wind" +
814- "ows GUI\'s";
815- this.mnu_exportMacPreset.Click += new System.EventHandler(this.mnu_exportMacPreset_Click);
816- //
817- // mnu_SelectDefault
818- //
819- this.mnu_SelectDefault.Name = "mnu_SelectDefault";
820- this.mnu_SelectDefault.Size = new System.Drawing.Size(194, 22);
821- this.mnu_SelectDefault.Text = "Select Default Preset";
822- this.mnu_SelectDefault.ToolTipText = "Select HandBrake\'s default preset";
823- this.mnu_SelectDefault.Click += new System.EventHandler(this.mnu_SelectDefault_Click);
824- //
825- // HelpToolStripMenuItem
826- //
827- this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
828- this.mnu_user_guide,
829- this.ToolStripSeparator3,
830- this.mnu_UpdateCheck,
831- this.toolStripSeparator6,
832- this.mnu_about});
833- this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
834- this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
835- this.HelpToolStripMenuItem.Text = "&Help";
836- //
837- // mnu_user_guide
838- //
839- this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;
840- this.mnu_user_guide.Name = "mnu_user_guide";
841- this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);
842- this.mnu_user_guide.Text = "HandBrake User Guide";
843- this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);
844- //
845- // ToolStripSeparator3
846- //
847- this.ToolStripSeparator3.Name = "ToolStripSeparator3";
848- this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);
849- //
850- // mnu_UpdateCheck
851- //
852- this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";
853- this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);
854- this.mnu_UpdateCheck.Text = "Check for Updates";
855- this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);
856- //
857- // toolStripSeparator6
858- //
859- this.toolStripSeparator6.Name = "toolStripSeparator6";
860- this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);
861- //
862- // mnu_about
863- //
864- this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;
865- this.mnu_about.Name = "mnu_about";
866- this.mnu_about.Size = new System.Drawing.Size(192, 22);
867- this.mnu_about.Text = "About...";
868- this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
869- //
870717 // frmMainMenu
871718 //
872719 this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
873720 this.FileToolStripMenuItem,
874- this.ToolsToolStripMenuItem,
875- this.PresetsToolStripMenuItem,
876- this.HelpToolStripMenuItem});
721+ this.ToolsToolStripMenuItem});
877722 this.frmMainMenu.Location = new System.Drawing.Point(0, 0);
878723 this.frmMainMenu.Name = "frmMainMenu";
879724 this.frmMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
@@ -1292,13 +1137,114 @@ namespace Handbrake
12921137 //
12931138 // splitContainer1.Panel2
12941139 //
1295- this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset);
1296- this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset);
1297- this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault);
1140+ this.splitContainer1.Panel2.Controls.Add(this.presetsToolStrip);
12981141 this.splitContainer1.Size = new System.Drawing.Size(240, 462);
12991142 this.splitContainer1.SplitterDistance = 424;
13001143 this.splitContainer1.TabIndex = 0;
13011144 //
1145+ // presetsToolStrip
1146+ //
1147+ this.presetsToolStrip.CanOverflow = false;
1148+ this.presetsToolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
1149+ this.presetsToolStrip.GripMargin = new System.Windows.Forms.Padding(0);
1150+ this.presetsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
1151+ this.presetsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
1152+ this.BtnAddPreset,
1153+ this.BtnRemovePreset,
1154+ this.toolStripDropDownButton2});
1155+ this.presetsToolStrip.Location = new System.Drawing.Point(0, 0);
1156+ this.presetsToolStrip.Name = "presetsToolStrip";
1157+ this.presetsToolStrip.Padding = new System.Windows.Forms.Padding(0);
1158+ this.presetsToolStrip.Size = new System.Drawing.Size(240, 34);
1159+ this.presetsToolStrip.TabIndex = 2;
1160+ this.presetsToolStrip.Text = "toolStrip2";
1161+ //
1162+ // BtnAddPreset
1163+ //
1164+ this.BtnAddPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1165+ this.BtnAddPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
1166+ this.BtnAddPreset.Image = global::Handbrake.Properties.Resources.Add16;
1167+ this.BtnAddPreset.ImageTransparentColor = System.Drawing.Color.Magenta;
1168+ this.BtnAddPreset.Name = "BtnAddPreset";
1169+ this.BtnAddPreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
1170+ this.BtnAddPreset.Padding = new System.Windows.Forms.Padding(8, 0, 8, 0);
1171+ this.BtnAddPreset.Size = new System.Drawing.Size(65, 31);
1172+ this.BtnAddPreset.Text = "Add";
1173+ this.BtnAddPreset.Click += new System.EventHandler(this.BtnAddPreset_Click);
1174+ //
1175+ // BtnRemovePreset
1176+ //
1177+ this.BtnRemovePreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1178+ this.BtnRemovePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
1179+ this.BtnRemovePreset.Image = global::Handbrake.Properties.Resources.Close;
1180+ this.BtnRemovePreset.ImageTransparentColor = System.Drawing.Color.Magenta;
1181+ this.BtnRemovePreset.Name = "BtnRemovePreset";
1182+ this.BtnRemovePreset.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
1183+ this.BtnRemovePreset.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
1184+ this.BtnRemovePreset.Size = new System.Drawing.Size(82, 31);
1185+ this.BtnRemovePreset.Text = "Remove";
1186+ this.BtnRemovePreset.Click += new System.EventHandler(this.BtnRemovePreset_Click);
1187+ //
1188+ // toolStripDropDownButton2
1189+ //
1190+ this.toolStripDropDownButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
1191+ this.MnuSetDefaultPreset,
1192+ this.toolStripSeparator3,
1193+ this.MnuImportPreset,
1194+ this.MnuExportPreset,
1195+ this.toolStripSeparator6,
1196+ this.MnuResetBuiltInPresets});
1197+ this.toolStripDropDownButton2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1198+ this.toolStripDropDownButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
1199+ this.toolStripDropDownButton2.Image = global::Handbrake.Properties.Resources.Options24;
1200+ this.toolStripDropDownButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
1201+ this.toolStripDropDownButton2.Name = "toolStripDropDownButton2";
1202+ this.toolStripDropDownButton2.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
1203+ this.toolStripDropDownButton2.Size = new System.Drawing.Size(79, 31);
1204+ this.toolStripDropDownButton2.Text = "Options";
1205+ //
1206+ // MnuSetDefaultPreset
1207+ //
1208+ this.MnuSetDefaultPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1209+ this.MnuSetDefaultPreset.Name = "MnuSetDefaultPreset";
1210+ this.MnuSetDefaultPreset.Size = new System.Drawing.Size(178, 22);
1211+ this.MnuSetDefaultPreset.Text = "Set Default";
1212+ this.MnuSetDefaultPreset.Click += new System.EventHandler(this.MnuSetDefaultPreset_Click);
1213+ //
1214+ // toolStripSeparator3
1215+ //
1216+ this.toolStripSeparator3.Name = "toolStripSeparator3";
1217+ this.toolStripSeparator3.Size = new System.Drawing.Size(175, 6);
1218+ //
1219+ // MnuImportPreset
1220+ //
1221+ this.MnuImportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1222+ this.MnuImportPreset.Name = "MnuImportPreset";
1223+ this.MnuImportPreset.Size = new System.Drawing.Size(178, 22);
1224+ this.MnuImportPreset.Text = "Import";
1225+ this.MnuImportPreset.Click += new System.EventHandler(this.MnuImportPreset_Click);
1226+ //
1227+ // MnuExportPreset
1228+ //
1229+ this.MnuExportPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1230+ this.MnuExportPreset.Name = "MnuExportPreset";
1231+ this.MnuExportPreset.Size = new System.Drawing.Size(178, 22);
1232+ this.MnuExportPreset.Text = "Export";
1233+ this.MnuExportPreset.Click += new System.EventHandler(this.MnuExportPreset_Click);
1234+ //
1235+ // toolStripSeparator6
1236+ //
1237+ this.toolStripSeparator6.Name = "toolStripSeparator6";
1238+ this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6);
1239+ //
1240+ // MnuResetBuiltInPresets
1241+ //
1242+ this.MnuResetBuiltInPresets.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
1243+ this.MnuResetBuiltInPresets.Name = "MnuResetBuiltInPresets";
1244+ this.MnuResetBuiltInPresets.Size = new System.Drawing.Size(178, 22);
1245+ this.MnuResetBuiltInPresets.Text = "Reset Built-In Presets";
1246+ this.MnuResetBuiltInPresets.Click += new System.EventHandler(this.MnuResetBuiltInPresets_Click);
1247+ //
13021248 // toolStrip1
13031249 //
13041250 this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
@@ -1310,7 +1256,9 @@ namespace Handbrake
13101256 this.btn_showQueue,
13111257 this.toolStripSeparator4,
13121258 this.tb_preview,
1313- this.btn_ActivityWindow});
1259+ this.btn_ActivityWindow,
1260+ this.toolStripSeparator8,
1261+ this.toolStripDropDownButton1});
13141262 this.toolStrip1.Location = new System.Drawing.Point(0, 24);
13151263 this.toolStrip1.Name = "toolStrip1";
13161264 this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
@@ -1441,6 +1389,63 @@ namespace Handbrake
14411389 "ently running encode.";
14421390 this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);
14431391 //
1392+ // toolStripSeparator8
1393+ //
1394+ this.toolStripSeparator8.Name = "toolStripSeparator8";
1395+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);
1396+ //
1397+ // toolStripDropDownButton1
1398+ //
1399+ this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
1400+ this.toolStripDropDownButton1.AutoSize = false;
1401+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
1402+ this.MnuUserGuide,
1403+ this.toolStripSeparator9,
1404+ this.MnuCheckForUpdates,
1405+ this.toolStripSeparator11,
1406+ this.MnuAboutHandBrake});
1407+ this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Help24;
1408+ this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
1409+ this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
1410+ this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
1411+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(69, 36);
1412+ this.toolStripDropDownButton1.Text = "Help";
1413+ //
1414+ // MnuUserGuide
1415+ //
1416+ this.MnuUserGuide.Image = global::Handbrake.Properties.Resources.info16;
1417+ this.MnuUserGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
1418+ this.MnuUserGuide.Name = "MnuUserGuide";
1419+ this.MnuUserGuide.Size = new System.Drawing.Size(192, 24);
1420+ this.MnuUserGuide.Text = "HandBrake User Guide";
1421+ this.MnuUserGuide.Click += new System.EventHandler(this.MnuUserGuide_Click);
1422+ //
1423+ // toolStripSeparator9
1424+ //
1425+ this.toolStripSeparator9.Name = "toolStripSeparator9";
1426+ this.toolStripSeparator9.Size = new System.Drawing.Size(189, 6);
1427+ //
1428+ // MnuCheckForUpdates
1429+ //
1430+ this.MnuCheckForUpdates.Name = "MnuCheckForUpdates";
1431+ this.MnuCheckForUpdates.Size = new System.Drawing.Size(192, 24);
1432+ this.MnuCheckForUpdates.Text = "Check for Updates";
1433+ this.MnuCheckForUpdates.Click += new System.EventHandler(this.MnuCheckForUpdates_Click);
1434+ //
1435+ // toolStripSeparator11
1436+ //
1437+ this.toolStripSeparator11.Name = "toolStripSeparator11";
1438+ this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6);
1439+ //
1440+ // MnuAboutHandBrake
1441+ //
1442+ this.MnuAboutHandBrake.Image = global::Handbrake.Properties.Resources.hb16;
1443+ this.MnuAboutHandBrake.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
1444+ this.MnuAboutHandBrake.Name = "MnuAboutHandBrake";
1445+ this.MnuAboutHandBrake.Size = new System.Drawing.Size(192, 24);
1446+ this.MnuAboutHandBrake.Text = "About HandBrake";
1447+ this.MnuAboutHandBrake.Click += new System.EventHandler(this.MnuAboutHandBrake_Click);
1448+ //
14441449 // notifyIcon
14451450 //
14461451 this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
@@ -1752,8 +1757,11 @@ namespace Handbrake
17521757 this.groupBox2.ResumeLayout(false);
17531758 this.splitContainer1.Panel1.ResumeLayout(false);
17541759 this.splitContainer1.Panel2.ResumeLayout(false);
1760+ this.splitContainer1.Panel2.PerformLayout();
17551761 ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
17561762 this.splitContainer1.ResumeLayout(false);
1763+ this.presetsToolStrip.ResumeLayout(false);
1764+ this.presetsToolStrip.PerformLayout();
17571765 this.toolStrip1.ResumeLayout(false);
17581766 this.toolStrip1.PerformLayout();
17591767 this.StatusStrip.ResumeLayout(false);
@@ -1781,11 +1789,6 @@ namespace Handbrake
17811789 internal System.Windows.Forms.ToolStripMenuItem mnu_encode;
17821790 internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;
17831791 internal System.Windows.Forms.ToolStripMenuItem mnu_options;
1784- internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem;
1785- internal System.Windows.Forms.ToolStripMenuItem mnu_presetReset;
1786- internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;
1787- internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;
1788- internal System.Windows.Forms.ToolStripMenuItem mnu_about;
17891792 internal System.Windows.Forms.MenuStrip frmMainMenu;
17901793 internal System.Windows.Forms.Label Label3;
17911794 internal System.Windows.Forms.ComboBox drp_videoEncoder;
@@ -1806,13 +1809,8 @@ namespace Handbrake
18061809 internal System.Windows.Forms.TabControl tabs_panel;
18071810 internal System.Windows.Forms.Label lbl_framerate;
18081811 private System.Windows.Forms.GroupBox groupBox2;
1809- internal System.Windows.Forms.Button btn_setDefault;
1810- private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;
1811- private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;
1812- private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
18131812 private System.Windows.Forms.SaveFileDialog DVD_Save;
18141813 private System.Windows.Forms.OpenFileDialog File_Open;
1815- private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
18161814 internal System.Windows.Forms.CheckBox check_iPodAtom;
18171815 private System.Windows.Forms.TabPage tab_chapters;
18181816 internal System.Windows.Forms.Label label31;
@@ -1829,8 +1827,6 @@ namespace Handbrake
18291827 private System.Windows.Forms.ToolStripButton btn_showQueue;
18301828 private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
18311829 private System.Windows.Forms.ToolStripButton btn_ActivityWindow;
1832- internal System.Windows.Forms.Button btn_removePreset;
1833- internal System.Windows.Forms.Button btn_addPreset;
18341830 internal System.Windows.Forms.Label label25;
18351831 internal System.Windows.Forms.TabPage tab_advanced;
18361832 internal System.Windows.Forms.TreeView treeView_presets;
@@ -1839,9 +1835,6 @@ namespace Handbrake
18391835 private System.Windows.Forms.ToolStripMenuItem btn_restore;
18401836 private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
18411837 private System.Windows.Forms.ToolStripMenuItem btn_file_source;
1842- private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;
1843- private System.Windows.Forms.ToolStripMenuItem btn_new_preset;
1844- private System.Windows.Forms.ToolStripMenuItem mnu_user_guide;
18451838 private System.Windows.Forms.ToolStripDropDownButton btn_source;
18461839 private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
18471840 private System.Windows.Forms.ToolStripMenuItem btn_dvd_source;
@@ -1892,7 +1885,6 @@ namespace Handbrake
18921885 internal Label Label10;
18931886 private Label labelStaticSource;
18941887 private FlowLayoutPanel SourceLayoutPanel;
1895- private ToolStripMenuItem mnu_importMacPreset;
18961888 private OpenFileDialog openPreset;
18971889 private Button btn_importChapters;
18981890 private OpenFileDialog File_ChapterImport;
@@ -1904,12 +1896,28 @@ namespace Handbrake
19041896 private Button btn_export;
19051897 private DataGridViewTextBoxColumn number;
19061898 private DataGridViewTextBoxColumn name;
1907- private ToolStripMenuItem mnu_exportMacPreset;
19081899 private ToolStripProgressBar ProgressBarStatus;
19091900 internal CheckBox checkMaximumFramerate;
19101901 private ToolStripMenuItem btnTitleSpecific;
19111902 private ToolStripMenuItem FileTitleSpecificScan;
19121903 private ToolStripMenuItem FolderTitleSpecificScan;
19131904 internal Label lbl_rfwarn;
1905+ private ToolStripSeparator toolStripSeparator8;
1906+ private ToolStripDropDownButton toolStripDropDownButton1;
1907+ private ToolStripMenuItem MnuUserGuide;
1908+ private ToolStripSeparator toolStripSeparator9;
1909+ private ToolStripMenuItem MnuCheckForUpdates;
1910+ private ToolStripSeparator toolStripSeparator11;
1911+ private ToolStripMenuItem MnuAboutHandBrake;
1912+ private ToolStrip presetsToolStrip;
1913+ private ToolStripButton BtnAddPreset;
1914+ private ToolStripButton BtnRemovePreset;
1915+ private ToolStripDropDownButton toolStripDropDownButton2;
1916+ private ToolStripMenuItem MnuSetDefaultPreset;
1917+ private ToolStripSeparator toolStripSeparator3;
1918+ private ToolStripMenuItem MnuImportPreset;
1919+ private ToolStripMenuItem MnuExportPreset;
1920+ private ToolStripSeparator toolStripSeparator6;
1921+ private ToolStripMenuItem MnuResetBuiltInPresets;
19141922 }
19151923 }
\ No newline at end of file
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -15,6 +15,9 @@ namespace Handbrake
1515 using System.Linq;
1616 using System.Threading;
1717 using System.Windows.Forms;
18+
19+ using DevExpress.Utils.Menu;
20+
1821 using Functions;
1922
2023 using HandBrake.ApplicationServices.EventArgs;
@@ -119,6 +122,7 @@ namespace Handbrake
119122 public frmMain(string[] args)
120123 {
121124 InitializeComponent();
125+ this.presetsToolStrip.Renderer = new ToolStripRenderOverride();
122126
123127 // We can use LibHB, if the library hb.dll exists.
124128 this.SourceScan = File.Exists("hb.dll") ? (IScan)new LibScan() : new ScanService();
@@ -434,136 +438,24 @@ namespace Handbrake
434438
435439 #endregion
436440
437- #region Presets Menu
438-
439- /// <summary>
440- /// Reset the Built in Presets
441- /// </summary>
442- /// <param name="sender">
443- /// The sender.
444- /// </param>
445- /// <param name="e">
446- /// The e.
447- /// </param>
448- private void mnu_presetReset_Click(object sender, EventArgs e)
449- {
450- presetHandler.UpdateBuiltInPresets(string.Empty);
451- LoadPresetPanel();
452- if (treeView_presets.Nodes.Count == 0)
453- MessageBox.Show(
454- "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!",
455- "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
456- else
457- MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);
458-
459- treeView_presets.ExpandAll();
460- }
461-
462- /// <summary>
463- /// Delete the selected preset
464- /// </summary>
465- /// <param name="sender">
466- /// The sender.
467- /// </param>
468- /// <param name="e">
469- /// The e.
470- /// </param>
471- private void mnu_delete_preset_Click(object sender, EventArgs e)
472- {
473- presetHandler.ClearBuiltIn();
474- LoadPresetPanel(); // Reload the preset panel
475- }
441+ #region Help Menu (Toolbar)
476442
477443 /// <summary>
478- /// Select the Normal preset
444+ /// Menu - Display the User Guide Web Page
479445 /// </summary>
480- /// <param name="sender">
481- /// The sender.
482- /// </param>
483- /// <param name="e">
484- /// The e.
485- /// </param>
486- private void mnu_SelectDefault_Click(object sender, EventArgs e)
487- {
488- loadNormalPreset();
489- }
490-
491- /// <summary>
492- /// Import a plist Preset
493- /// </summary>
494- /// <param name="sender">
495- /// The sender.
496- /// </param>
497- /// <param name="e">
498- /// The e.
499- /// </param>
500- private void mnu_importMacPreset_Click(object sender, EventArgs e)
501- {
502- ImportPreset();
503- }
504-
505- /// <summary>
506- /// Export a Plist Preset
507- /// </summary>
508- /// <param name="sender">
509- /// The sender.
510- /// </param>
511- /// <param name="e">
512- /// The e.
513- /// </param>
514- private void mnu_exportMacPreset_Click(object sender, EventArgs e)
515- {
516- ExportPreset();
517- }
518-
519- /// <summary>
520- /// Create a new Preset
521- /// </summary>
522- /// <param name="sender">
523- /// The sender.
524- /// </param>
525- /// <param name="e">
526- /// The e.
527- /// </param>
528- private void btn_new_preset_Click(object sender, EventArgs e)
529- {
530- Form preset = new frmAddPreset(this, presetHandler);
531- if (preset.ShowDialog() == DialogResult.OK)
532- {
533- TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black };
534- treeView_presets.Nodes.Add(presetTreeview);
535- presetHandler.LastPresetAdded = null;
536- }
537- }
538-
539- #endregion
540-
541- #region Help Menu
542-
543- /// <summary>
544- /// Menu - Display the User Guide Web Page
545- /// </summary>
546- /// <param name="sender">
547- /// The sender.
548- /// </param>
549- /// <param name="e">
550- /// The e.
551- /// </param>
552- private void mnu_user_guide_Click(object sender, EventArgs e)
446+ /// <param name="sender">The Sender</param>
447+ /// <param name="e">The EventArgs</param>
448+ private void MnuUserGuide_Click(object sender, EventArgs e)
553449 {
554450 Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide");
555451 }
556452
557453 /// <summary>
558- /// Menu - Check for Updates
454+ /// Check for Updates
559455 /// </summary>
560- /// <param name="sender">
561- /// The sender.
562- /// </param>
563- /// <param name="e">
564- /// The e.
565- /// </param>
566- private void mnu_UpdateCheck_Click(object sender, EventArgs e)
456+ /// <param name="sender">The Sender</param>
457+ /// <param name="e">The EventArgs</param>
458+ private void MnuCheckForUpdates_Click(object sender, EventArgs e)
567459 {
568460 lbl_updateCheck.Visible = true;
569461 Settings.Default.lastUpdateCheckDate = DateTime.Now;
@@ -577,13 +469,9 @@ namespace Handbrake
577469 /// <summary>
578470 /// Menu - Display the About Window
579471 /// </summary>
580- /// <param name="sender">
581- /// The sender.
582- /// </param>
583- /// <param name="e">
584- /// The e.
585- /// </param>
586- private void mnu_about_Click(object sender, EventArgs e)
472+ /// <param name="sender">The Sender</param>
473+ /// <param name="e">The EventArgs</param>
474+ private void MnuAboutHandBrake_Click(object sender, EventArgs e)
587475 {
588476 using (frmAbout About = new frmAbout())
589477 {
@@ -708,16 +596,7 @@ namespace Handbrake
708596
709597 // Presets Management
710598
711- /// <summary>
712- /// Button - Add a preset
713- /// </summary>
714- /// <param name="sender">
715- /// The sender.
716- /// </param>
717- /// <param name="e">
718- /// The e.
719- /// </param>
720- private void btn_addPreset_Click(object sender, EventArgs e)
599+ private void BtnAddPreset_Click(object sender, EventArgs e)
721600 {
722601 Form preset = new frmAddPreset(this, presetHandler);
723602 if (preset.ShowDialog() == DialogResult.OK)
@@ -728,16 +607,7 @@ namespace Handbrake
728607 }
729608 }
730609
731- /// <summary>
732- /// Button - remove a Preset
733- /// </summary>
734- /// <param name="sender">
735- /// The sender.
736- /// </param>
737- /// <param name="e">
738- /// The e.
739- /// </param>
740- private void btn_removePreset_Click(object sender, EventArgs e)
610+ private void BtnRemovePreset_Click(object sender, EventArgs e)
741611 {
742612 DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset",
743613 MessageBoxButtons.YesNo, MessageBoxIcon.Question);
@@ -752,16 +622,8 @@ namespace Handbrake
752622 treeView_presets.Select();
753623 }
754624
755- /// <summary>
756- /// Button - Set the selected preset as the default
757- /// </summary>
758- /// <param name="sender">
759- /// The sender.
760- /// </param>
761- /// <param name="e">
762- /// The e.
763- /// </param>
764- private void btn_setDefault_Click(object sender, EventArgs e)
625+
626+ private void MnuSetDefaultPreset_Click(object sender, EventArgs e)
765627 {
766628 if (treeView_presets.SelectedNode != null)
767629 {
@@ -778,6 +640,30 @@ namespace Handbrake
778640 MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
779641 }
780642
643+ private void MnuImportPreset_Click(object sender, EventArgs e)
644+ {
645+ this.ImportPreset();
646+ }
647+
648+ private void MnuExportPreset_Click(object sender, EventArgs e)
649+ {
650+ this.ExportPreset();
651+ }
652+
653+ private void MnuResetBuiltInPresets_Click(object sender, EventArgs e)
654+ {
655+ presetHandler.UpdateBuiltInPresets(string.Empty);
656+ LoadPresetPanel();
657+ if (treeView_presets.Nodes.Count == 0)
658+ MessageBox.Show(
659+ "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!",
660+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
661+ else
662+ MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);
663+
664+ treeView_presets.ExpandAll();
665+ }
666+
781667 /// <summary>
782668 /// PresetBar Mouse Down event
783669 /// </summary>
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -174,7 +174,7 @@ The Following options are not 100% accurate:
174174 - Encode video between a start and end frame.</value>
175175 </data>
176176 <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
177- <value>1354, 15</value>
177+ <value>984, 17</value>
178178 </metadata>
179179 <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
180180 <value>232, 15</value>
@@ -197,6 +197,9 @@ Don't forget to re-generate this query if you change any GUI options.
197197 Note that this will also override the "Add to Queue" query as well.
198198 Clear the text box below to return to the internal query generation.</value>
199199 </data>
200+ <metadata name="presetsToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
201+ <value>565, 54</value>
202+ </metadata>
200203 <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
201204 <value>767, 15</value>
202205 </metadata>