WinGui:

- Nested Presets bar (Built-in presets only)
- Both user and built-in presets are now stored in XML files
- Preset bar now has right-click menu with: Expand All, Collapse All and Delete

Known Issues: 
- When a preset is removed, all items in the preset bar with child presets are collapsed. 
- Right Click menu only works if the preset was selected before right clicking.

Code is probably a bit buggy so all feedback on this new bar is welcome.



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

1 files changed, 65 insertions, 15 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index ec9953948..32fa4ab6d 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -254,6 +254,11 @@ namespace Handbrake
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);

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

             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();

+            this.presets_menu = new System.Windows.Forms.ContextMenuStrip(this.components);

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

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

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

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

             Label38 = new System.Windows.Forms.Label();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

@@ -282,6 +287,7 @@ namespace Handbrake
             this.groupBox2.SuspendLayout();

             this.toolStrip1.SuspendLayout();

             this.StatusStrip.SuspendLayout();

+            this.presets_menu.SuspendLayout();

             this.SuspendLayout();

             // 

             // Label38

@@ -301,12 +307,12 @@ namespace Handbrake
             this.btn_restore});

             notifyIconMenu.Name = "notifyIconMenu";

             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

-            notifyIconMenu.Size = new System.Drawing.Size(129, 26);

+            notifyIconMenu.Size = new System.Drawing.Size(153, 48);

             // 

             // btn_restore

             // 

             this.btn_restore.Name = "btn_restore";

-            this.btn_restore.Size = new System.Drawing.Size(128, 22);

+            this.btn_restore.Size = new System.Drawing.Size(152, 22);

             this.btn_restore.Text = "Restore";

             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);

             // 

@@ -543,7 +549,7 @@ namespace Handbrake
             this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, 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(115, 508);

+            this.btn_setDefault.Location = new System.Drawing.Point(873, 584);

             this.btn_setDefault.Name = "btn_setDefault";

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

             this.btn_setDefault.TabIndex = 1;

@@ -660,7 +666,7 @@ namespace Handbrake
             this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, 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(10, 508);

+            this.btn_addPreset.Location = new System.Drawing.Point(768, 584);

             this.btn_addPreset.Name = "btn_addPreset";

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

             this.btn_addPreset.TabIndex = 3;

@@ -675,7 +681,7 @@ namespace Handbrake
             this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, 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(51, 508);

+            this.btn_removePreset.Location = new System.Drawing.Point(809, 584);

             this.btn_removePreset.Name = "btn_removePreset";

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

             this.btn_removePreset.TabIndex = 4;

@@ -1628,7 +1634,7 @@ namespace Handbrake
             this.HelpToolStripMenuItem});

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

             this.frmMainMenu.Name = "frmMainMenu";

-            this.frmMainMenu.Size = new System.Drawing.Size(958, 24);

+            this.frmMainMenu.Size = new System.Drawing.Size(985, 24);

             this.frmMainMenu.TabIndex = 0;

             this.frmMainMenu.Text = "MenuStrip1";

             // 

@@ -2933,29 +2939,28 @@ namespace Handbrake
             // 

             // groupBox2

             // 

-            this.groupBox2.Controls.Add(this.btn_removePreset);

-            this.groupBox2.Controls.Add(this.btn_addPreset);

             this.groupBox2.Controls.Add(this.treeView_presets);

-            this.groupBox2.Controls.Add(this.btn_setDefault);

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

             this.groupBox2.ForeColor = System.Drawing.Color.Black;

             this.groupBox2.Location = new System.Drawing.Point(728, 70);

             this.groupBox2.Name = "groupBox2";

-            this.groupBox2.Size = new System.Drawing.Size(218, 546);

+            this.groupBox2.Size = new System.Drawing.Size(245, 508);

             this.groupBox2.TabIndex = 6;

             this.groupBox2.TabStop = false;

             this.groupBox2.Text = "Presets";

             // 

             // treeView_presets

             // 

+            this.treeView_presets.ContextMenuStrip = this.presets_menu;

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

             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(10, 23);

+            this.treeView_presets.Location = new System.Drawing.Point(3, 17);

             this.treeView_presets.Name = "treeView_presets";

             this.treeView_presets.ShowLines = false;

-            this.treeView_presets.Size = new System.Drawing.Size(198, 473);

+            this.treeView_presets.Size = new System.Drawing.Size(239, 488);

             this.treeView_presets.TabIndex = 0;

             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);

             this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);

@@ -2976,7 +2981,7 @@ namespace Handbrake
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);

             this.toolStrip1.Name = "toolStrip1";

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

-            this.toolStrip1.Size = new System.Drawing.Size(958, 39);

+            this.toolStrip1.Size = new System.Drawing.Size(985, 39);

             this.toolStrip1.TabIndex = 1;

             this.toolStrip1.Text = "toolStrip1";

             // 

@@ -3112,7 +3117,7 @@ namespace Handbrake
             this.lbl_encode});

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

             this.StatusStrip.Name = "StatusStrip";

-            this.StatusStrip.Size = new System.Drawing.Size(958, 22);

+            this.StatusStrip.Size = new System.Drawing.Size(985, 22);

             this.StatusStrip.TabIndex = 7;

             this.StatusStrip.Text = "statusStrip1";

             // 

@@ -3123,13 +3128,52 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);

             this.lbl_encode.Text = "{0}";

             // 

+            // presets_menu

+            // 

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

+            this.pmnu_expandAll,

+            this.pmnu_collapse,

+            this.sep1,

+            this.pmnu_delete});

+            this.presets_menu.Name = "presets_menu";

+            this.presets_menu.Size = new System.Drawing.Size(146, 76);

+            // 

+            // pmnu_delete

+            // 

+            this.pmnu_delete.Name = "pmnu_delete";

+            this.pmnu_delete.Size = new System.Drawing.Size(145, 22);

+            this.pmnu_delete.Text = "Delete";

+            this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_Click);

+            // 

+            // pmnu_expandAll

+            // 

+            this.pmnu_expandAll.Name = "pmnu_expandAll";

+            this.pmnu_expandAll.Size = new System.Drawing.Size(145, 22);

+            this.pmnu_expandAll.Text = "Expand All";

+            this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);

+            // 

+            // sep1

+            // 

+            this.sep1.Name = "sep1";

+            this.sep1.Size = new System.Drawing.Size(142, 6);

+            // 

+            // pmnu_collapse

+            // 

+            this.pmnu_collapse.Name = "pmnu_collapse";

+            this.pmnu_collapse.Size = new System.Drawing.Size(145, 22);

+            this.pmnu_collapse.Text = "Collapse All";

+            this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);

+            // 

             // frmMain

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(958, 651);

+            this.ClientSize = new System.Drawing.Size(985, 651);

+            this.Controls.Add(this.btn_setDefault);

             this.Controls.Add(this.GroupBox1);

+            this.Controls.Add(this.btn_removePreset);

             this.Controls.Add(this.groupBox_dest);

+            this.Controls.Add(this.btn_addPreset);

             this.Controls.Add(this.groupBox_output);

             this.Controls.Add(this.groupBox2);

             this.Controls.Add(this.toolStrip1);

@@ -3180,6 +3224,7 @@ namespace Handbrake
             this.toolStrip1.PerformLayout();

             this.StatusStrip.ResumeLayout(false);

             this.StatusStrip.PerformLayout();

+            this.presets_menu.ResumeLayout(false);

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -3402,6 +3447,11 @@ namespace Handbrake
         internal System.Windows.Forms.OpenFileDialog ISO_Open;

         internal System.Windows.Forms.FolderBrowserDialog DVD_Open;

         internal System.Windows.Forms.ToolStripMenuItem mnu_dvd_drive;

+        private System.Windows.Forms.ContextMenuStrip presets_menu;

+        private System.Windows.Forms.ToolStripMenuItem pmnu_expandAll;

+        private System.Windows.Forms.ToolStripMenuItem pmnu_collapse;

+        private System.Windows.Forms.ToolStripSeparator sep1;

+        private System.Windows.Forms.ToolStripMenuItem pmnu_delete;

 

     }

 }
\ No newline at end of file