WinGui:

- New tab layout options window.
- Small tweaks to the read dvd window and queueWindow
- hbcli.exe now renamed to HandbrakeCLI.exe to match all other platforms.
- Presets Listbox replaced with listview in preparation for future improvements.
- Update built in presets option re-enabled for the same reason.
- Few other small design tweaks here and there

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

1 files changed, 57 insertions, 57 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index d91d8fd36..de110b92c 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -60,7 +60,6 @@ namespace Handbrake
             this.drp_subtitle = new System.Windows.Forms.ComboBox();

             this.btn_presets = new System.Windows.Forms.Button();

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

-            this.ListBox_Presets = new System.Windows.Forms.ListBox();

             this.button1 = new System.Windows.Forms.Button();

             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();

             this.File_Open = new System.Windows.Forms.OpenFileDialog();

@@ -153,7 +152,6 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();

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

             this.TabPage1 = new System.Windows.Forms.TabPage();

-            this.lbl_anamorphicError = new System.Windows.Forms.Label();

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

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

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

@@ -183,6 +181,8 @@ namespace Handbrake
             this.label25 = new System.Windows.Forms.Label();

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

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

+            this.listview_presets = new System.Windows.Forms.ListView();

+            this.presetname = new System.Windows.Forms.ColumnHeader();

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

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

             this.frmMainMenu.SuspendLayout();

@@ -363,7 +363,7 @@ namespace Handbrake
             "H.264",

             "H.264 (iPod)",

             "H.264 Baseline 1.3"});

-            this.drp_videoEncoder.Location = new System.Drawing.Point(104, 21);

+            this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);

             this.drp_videoEncoder.Name = "drp_videoEncoder";

             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);

             this.drp_videoEncoder.TabIndex = 18;

@@ -579,7 +579,7 @@ namespace Handbrake
             this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

+            this.btn_setDefault.Location = new System.Drawing.Point(113, 446);

             this.btn_setDefault.Name = "btn_setDefault";

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

             this.btn_setDefault.TabIndex = 107;

@@ -590,35 +590,6 @@ namespace Handbrake
             this.btn_setDefault.UseVisualStyleBackColor = false;

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

             // 

-            // ListBox_Presets

-            // 

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

-            this.ListBox_Presets.FormattingEnabled = true;

-            this.ListBox_Presets.Items.AddRange(new object[] {

-            "Animation",

-            "AppleTV",

-            "Bedlam",

-            "Blind",

-            "Broke",

-            "Classic",

-            "Constant Quality Rate",

-            "Deux Six Quatre",

-            "Film",

-            "iPhone / iPod Touch",

-            "iPod High-Rez",

-            "iPod Low-Rez",

-            "Normal",

-            "PS3",

-            "PSP",

-            "QuickTime",

-            "Television"});

-            this.ListBox_Presets.Location = new System.Drawing.Point(11, 21);

-            this.ListBox_Presets.Name = "ListBox_Presets";

-            this.ListBox_Presets.Size = new System.Drawing.Size(174, 420);

-            this.ListBox_Presets.TabIndex = 104;

-            this.ToolTip.SetToolTip(this.ListBox_Presets, "To load a preset, simply click the preset you desire.");

-            this.ListBox_Presets.SelectedIndexChanged += new System.EventHandler(this.ListBox_Presets_SelectedIndexChanged);

-            // 

             // button1

             // 

             this.button1.BackColor = System.Drawing.SystemColors.ControlLight;

@@ -757,7 +728,6 @@ namespace Handbrake
             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.Visible = false;

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

             // 

             // toolStripSeparator4

@@ -889,7 +859,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(873, 24);

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

             this.frmMainMenu.TabIndex = 1;

             this.frmMainMenu.Text = "MenuStrip1";

             // 

@@ -1599,7 +1569,6 @@ namespace Handbrake
             // TabPage1

             // 

             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.TabPage1.Controls.Add(this.lbl_anamorphicError);

             this.TabPage1.Controls.Add(this.label24);

             this.TabPage1.Controls.Add(this.drp_deNoise);

             this.TabPage1.Controls.Add(this.label11);

@@ -1629,23 +1598,11 @@ namespace Handbrake
             this.TabPage1.Size = new System.Drawing.Size(639, 215);

             this.TabPage1.TabIndex = 0;

             this.TabPage1.Text = "Picture Settings";

-            this.TabPage1.UseVisualStyleBackColor = true;

-            // 

-            // lbl_anamorphicError

-            // 

-            this.lbl_anamorphicError.AutoSize = true;

-            this.lbl_anamorphicError.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_anamorphicError.ForeColor = System.Drawing.Color.Red;

-            this.lbl_anamorphicError.Location = new System.Drawing.Point(436, 149);

-            this.lbl_anamorphicError.Name = "lbl_anamorphicError";

-            this.lbl_anamorphicError.Size = new System.Drawing.Size(176, 24);

-            this.lbl_anamorphicError.TabIndex = 52;

-            this.lbl_anamorphicError.Text = "Must be disabled to allow width or \r\nheight to be altered";

-            this.lbl_anamorphicError.Visible = false;

             // 

             // label24

             // 

             this.label24.AutoSize = true;

+            this.label24.BackColor = System.Drawing.Color.Transparent;

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

             this.label24.Location = new System.Drawing.Point(314, 13);

             this.label24.Name = "label24";

@@ -1672,6 +1629,7 @@ namespace Handbrake
             // label11

             // 

             this.label11.AutoSize = true;

+            this.label11.BackColor = System.Drawing.Color.Transparent;

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

             this.label11.Location = new System.Drawing.Point(314, 94);

             this.label11.Name = "label11";

@@ -1682,28 +1640,31 @@ namespace Handbrake
             // check_deblock

             // 

             this.check_deblock.AutoSize = true;

+            this.check_deblock.BackColor = System.Drawing.Color.Transparent;

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

             this.check_deblock.Location = new System.Drawing.Point(416, 37);

             this.check_deblock.Name = "check_deblock";

             this.check_deblock.Size = new System.Drawing.Size(72, 17);

             this.check_deblock.TabIndex = 44;

             this.check_deblock.Text = "Deblock";

-            this.check_deblock.UseVisualStyleBackColor = true;

+            this.check_deblock.UseVisualStyleBackColor = false;

             // 

             // check_detelecine

             // 

             this.check_detelecine.AutoSize = true;

+            this.check_detelecine.BackColor = System.Drawing.Color.Transparent;

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

             this.check_detelecine.Location = new System.Drawing.Point(317, 36);

             this.check_detelecine.Name = "check_detelecine";

             this.check_detelecine.Size = new System.Drawing.Size(86, 17);

             this.check_detelecine.TabIndex = 43;

             this.check_detelecine.Text = "Detelecine";

-            this.check_detelecine.UseVisualStyleBackColor = true;

+            this.check_detelecine.UseVisualStyleBackColor = false;

             // 

             // label4

             // 

             this.label4.AutoSize = true;

+            this.label4.BackColor = System.Drawing.Color.Transparent;

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

             this.label4.Location = new System.Drawing.Point(314, 66);

             this.label4.Name = "label4";

@@ -1731,19 +1692,20 @@ namespace Handbrake
             // Check_ChapterMarkers

             // 

             this.Check_ChapterMarkers.AutoSize = true;

+            this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;

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

             this.Check_ChapterMarkers.Location = new System.Drawing.Point(317, 173);

             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";

             this.Check_ChapterMarkers.Size = new System.Drawing.Size(122, 17);

             this.Check_ChapterMarkers.TabIndex = 51;

             this.Check_ChapterMarkers.Text = "Chapter Markers";

-            this.Check_ChapterMarkers.UseVisualStyleBackColor = true;

+            this.Check_ChapterMarkers.UseVisualStyleBackColor = false;

             this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);

             // 

             // CheckPixelRatio

             // 

             this.CheckPixelRatio.AutoSize = true;

-            this.CheckPixelRatio.BackColor = System.Drawing.SystemColors.ControlLight;

+            this.CheckPixelRatio.BackColor = System.Drawing.Color.Transparent;

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

             this.CheckPixelRatio.Location = new System.Drawing.Point(317, 150);

             this.CheckPixelRatio.Name = "CheckPixelRatio";

@@ -1756,6 +1718,7 @@ namespace Handbrake
             // label6

             // 

             this.label6.AutoSize = true;

+            this.label6.BackColor = System.Drawing.Color.Transparent;

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

             this.label6.Location = new System.Drawing.Point(314, 128);

             this.label6.Name = "label6";

@@ -1766,6 +1729,7 @@ namespace Handbrake
             // lbl_RecomendedCrop

             // 

             this.lbl_RecomendedCrop.AutoSize = true;

+            this.lbl_RecomendedCrop.BackColor = System.Drawing.Color.Transparent;

             this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.lbl_RecomendedCrop.Location = new System.Drawing.Point(119, 72);

             this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";

@@ -1776,6 +1740,7 @@ namespace Handbrake
             // Label8

             // 

             this.Label8.AutoSize = true;

+            this.Label8.BackColor = System.Drawing.Color.Transparent;

             this.Label8.Location = new System.Drawing.Point(13, 71);

             this.Label8.Name = "Label8";

             this.Label8.Size = new System.Drawing.Size(70, 13);

@@ -1785,6 +1750,7 @@ namespace Handbrake
             // Label1

             // 

             this.Label1.AutoSize = true;

+            this.Label1.BackColor = System.Drawing.Color.Transparent;

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

             this.Label1.Location = new System.Drawing.Point(13, 13);

             this.Label1.Name = "Label1";

@@ -1795,6 +1761,7 @@ namespace Handbrake
             // Label53

             // 

             this.Label53.AutoSize = true;

+            this.Label53.BackColor = System.Drawing.Color.Transparent;

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

             this.Label53.Location = new System.Drawing.Point(134, 187);

             this.Label53.Name = "Label53";

@@ -1805,6 +1772,7 @@ namespace Handbrake
             // Label52

             // 

             this.Label52.AutoSize = true;

+            this.Label52.BackColor = System.Drawing.Color.Transparent;

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

             this.Label52.Location = new System.Drawing.Point(138, 96);

             this.Label52.Name = "Label52";

@@ -1815,6 +1783,7 @@ namespace Handbrake
             // Label51

             // 

             this.Label51.AutoSize = true;

+            this.Label51.BackColor = System.Drawing.Color.Transparent;

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

             this.Label51.Location = new System.Drawing.Point(247, 139);

             this.Label51.Name = "Label51";

@@ -1825,6 +1794,7 @@ namespace Handbrake
             // Label50

             // 

             this.Label50.AutoSize = true;

+            this.Label50.BackColor = System.Drawing.Color.Transparent;

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

             this.Label50.Location = new System.Drawing.Point(13, 41);

             this.Label50.Name = "Label50";

@@ -1835,6 +1805,7 @@ namespace Handbrake
             // Label15

             // 

             this.Label15.AutoSize = true;

+            this.Label15.BackColor = System.Drawing.Color.Transparent;

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

             this.Label15.Location = new System.Drawing.Point(39, 139);

             this.Label15.Name = "Label15";

@@ -1964,8 +1935,8 @@ namespace Handbrake
             // 

             // groupBox2

             // 

+            this.groupBox2.Controls.Add(this.listview_presets);

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

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

             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(674, 35);

@@ -1975,12 +1946,41 @@ namespace Handbrake
             this.groupBox2.TabStop = false;

             this.groupBox2.Text = "Presets";

             // 

+            // listview_presets

+            // 

+            this.listview_presets.Alignment = System.Windows.Forms.ListViewAlignment.SnapToGrid;

+            this.listview_presets.AllowColumnReorder = true;

+            this.listview_presets.BackColor = System.Drawing.SystemColors.ControlLightLight;

+            this.listview_presets.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

+            this.listview_presets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {

+            this.presetname});

+            this.listview_presets.ForeColor = System.Drawing.SystemColors.HotTrack;

+            this.listview_presets.FullRowSelect = true;

+            this.listview_presets.GridLines = true;

+            this.listview_presets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;

+            this.listview_presets.LabelEdit = true;

+            this.listview_presets.LabelWrap = false;

+            this.listview_presets.Location = new System.Drawing.Point(8, 19);

+            this.listview_presets.Margin = new System.Windows.Forms.Padding(5);

+            this.listview_presets.MultiSelect = false;

+            this.listview_presets.Name = "listview_presets";

+            this.listview_presets.Size = new System.Drawing.Size(177, 411);

+            this.listview_presets.TabIndex = 104;

+            this.listview_presets.UseCompatibleStateImageBehavior = false;

+            this.listview_presets.View = System.Windows.Forms.View.Details;

+            this.listview_presets.SelectedIndexChanged += new System.EventHandler(this.listview_presets_SelectedIndexChanged);

+            // 

+            // presetname

+            // 

+            this.presetname.Text = "Presets";

+            this.presetname.Width = 175;

+            // 

             // frmMain

             // 

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

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

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(873, 568);

+            this.ClientSize = new System.Drawing.Size(874, 566);

             this.Controls.Add(this.btn_presets);

             this.Controls.Add(this.groupBox2);

             this.Controls.Add(this.groupBox_dest);

@@ -2160,7 +2160,6 @@ namespace Handbrake
         private System.Windows.Forms.Label label23;

         internal System.Windows.Forms.Button btn_copy;

         private System.Windows.Forms.GroupBox groupBox2;

-        private System.Windows.Forms.ListBox ListBox_Presets;

         internal System.Windows.Forms.Button btn_presets;

         internal System.Windows.Forms.Button btn_setDefault;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;

@@ -2170,7 +2169,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;

         internal System.Windows.Forms.Button button1;

-        private System.Windows.Forms.Label lbl_anamorphicError;

         private System.Windows.Forms.TabPage tabPage4;

         internal System.Windows.Forms.Label label26;

         internal System.Windows.Forms.Label label25;

@@ -2181,6 +2179,8 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;

         private System.Windows.Forms.ToolStripMenuItem mnu_open;

         private System.Windows.Forms.ToolStripMenuItem mnu_save;

+        internal System.Windows.Forms.ListView listview_presets;

+        internal System.Windows.Forms.ColumnHeader presetname;

 

     }

 }
\ No newline at end of file