WinGui:

- Changed the presets to a treeview. This will allow presets to have child nodes for additional future presets.

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 00b12b4..bdba38b 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -176,8 +176,7 @@ namespace Handbrake
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
-            this.listview_presets = new System.Windows.Forms.ListView();\r
-            this.presetname = new System.Windows.Forms.ColumnHeader();\r
+            this.treeView_presets = new System.Windows.Forms.TreeView();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -824,6 +823,7 @@ namespace Handbrake
             // frmMainMenu\r
             // \r
             this.frmMainMenu.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.frmMainMenu.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible;\r
             this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.FileToolStripMenuItem,\r
             this.ToolsToolStripMenuItem,\r
@@ -1887,7 +1887,7 @@ namespace Handbrake
             // \r
             // groupBox2\r
             // \r
-            this.groupBox2.Controls.Add(this.listview_presets);\r
+            this.groupBox2.Controls.Add(this.treeView_presets);\r
             this.groupBox2.Controls.Add(this.btn_setDefault);\r
             this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
@@ -1898,36 +1898,23 @@ namespace Handbrake
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
             // \r
-            // listview_presets\r
-            // \r
-            this.listview_presets.Alignment = System.Windows.Forms.ListViewAlignment.SnapToGrid;\r
-            this.listview_presets.AllowColumnReorder = true;\r
-            this.listview_presets.BackColor = System.Drawing.SystemColors.ControlLightLight;\r
-            this.listview_presets.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.listview_presets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {\r
-            this.presetname});\r
-            this.listview_presets.ForeColor = System.Drawing.SystemColors.HotTrack;\r
-            this.listview_presets.FullRowSelect = true;\r
-            this.listview_presets.GridLines = true;\r
-            this.listview_presets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
-            this.listview_presets.LabelWrap = false;\r
-            this.listview_presets.Location = new System.Drawing.Point(8, 19);\r
-            this.listview_presets.Margin = new System.Windows.Forms.Padding(5);\r
-            this.listview_presets.MultiSelect = false;\r
-            this.listview_presets.Name = "listview_presets";\r
-            this.listview_presets.Size = new System.Drawing.Size(177, 411);\r
-            this.listview_presets.TabIndex = 0;\r
-            this.listview_presets.UseCompatibleStateImageBehavior = false;\r
-            this.listview_presets.View = System.Windows.Forms.View.Details;\r
-            this.listview_presets.SelectedIndexChanged += new System.EventHandler(this.listview_presets_SelectedIndexChanged);\r
-            // \r
-            // presetname\r
-            // \r
-            this.presetname.Text = "Presets";\r
-            this.presetname.Width = 175;\r
+            // treeView_presets\r
+            // \r
+            this.treeView_presets.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.treeView_presets.ForeColor = System.Drawing.Color.Navy;\r
+            this.treeView_presets.FullRowSelect = true;\r
+            this.treeView_presets.HideSelection = false;\r
+            this.treeView_presets.ItemHeight = 17;\r
+            this.treeView_presets.Location = new System.Drawing.Point(8, 19);\r
+            this.treeView_presets.Name = "treeView_presets";\r
+            this.treeView_presets.ShowLines = false;\r
+            this.treeView_presets.Size = new System.Drawing.Size(177, 421);\r
+            this.treeView_presets.TabIndex = 2;\r
+            this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             // \r
             // frmMain\r
             // \r
+            this.AllowDrop = true;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -1944,6 +1931,7 @@ namespace Handbrake
             this.Controls.Add(this.groupBox_output);\r
             this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.frmMainMenu);\r
+            this.DoubleBuffered = true;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MinimumSize = new System.Drawing.Size(680, 580);\r
             this.Name = "frmMain";\r
@@ -2120,10 +2108,9 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_open;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_save;\r
-        internal System.Windows.Forms.ListView listview_presets;\r
-        internal System.Windows.Forms.ColumnHeader presetname;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_showPresets;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
+        private System.Windows.Forms.TreeView treeView_presets;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 6c6e348..9831a10 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -291,7 +291,7 @@ namespace Handbrake
 \r
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
-            listview_presets.Items.Clear();\r
+            treeView_presets.Nodes.Clear();\r
             grabCLIPresets();\r
             updatePresets();\r
             MessageBox.Show("Presets have been updated", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
@@ -899,16 +899,14 @@ namespace Handbrake
             presets[15] = "QuickTime";\r
             presets[16] = "Television";\r
 \r
-            ListViewItem preset_listview = new ListViewItem();\r
-            string[] presetList = new string[1];\r
+            TreeNode preset_treeview = new TreeNode();\r
 \r
             foreach (string preset in presets)\r
             {\r
-                presetList[0] = preset;\r
-                preset_listview = new ListViewItem(presetList);\r
+                preset_treeview = new TreeNode(preset);\r
 \r
                 // Now Fill Out List View with Items\r
-                listview_presets.Items.Add(preset_listview);\r
+                treeView_presets.Nodes.Add(preset_treeview);\r
             }\r
         }\r
 \r
@@ -925,12 +923,20 @@ namespace Handbrake
         // Function to select the default preset.\r
         private void loadNormalPreset()\r
         {\r
-            ListViewItem item = listview_presets.FindItemWithText("Normal");\r
-            \r
-            if (item != null)\r
+\r
+            int normal = 0;\r
+            foreach(TreeNode treenode in treeView_presets.Nodes)\r
             {\r
-                item.Selected = true;\r
+                if (treenode.ToString().Equals("TreeNode: Normal"))\r
+                    normal = treenode.Index;\r
             }\r
+\r
+            TreeNode np = treeView_presets.Nodes[normal];\r
+\r
+            treeView_presets.SelectedNode = np;\r
+\r
+    \r
+\r
         }\r
 \r
         // Buttons\r
@@ -944,15 +950,12 @@ namespace Handbrake
         }\r
 \r
         // Preset Selection\r
-        private void listview_presets_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
         {\r
+            \r
 \r
             string selectedPreset = null;\r
-            ListView.SelectedListViewItemCollection name = null;\r
-            name = listview_presets.SelectedItems;\r
-\r
-            if (listview_presets.SelectedItems.Count != 0)\r
-                selectedPreset = name[0].SubItems[0].Text;\r
+            selectedPreset = treeView_presets.SelectedNode.Text;\r
 \r
             try\r
             {\r
@@ -991,7 +994,6 @@ namespace Handbrake
                 MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
-\r
         #endregion\r
 \r
         //---------------------------------------------------\r
@@ -1754,7 +1756,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file