From a798655972e09b6c80351b3337b28bc02270dc5c Mon Sep 17 00:00:00 2001 From: sr55 Date: Fri, 4 Apr 2008 18:31:07 +0000 Subject: WinGui: - UI consistency issues caused by last UI update, now sorted. All windows follow the same style aspects. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1379 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/frmAbout.Designer.cs | 34 ++++++++++----------- win/C#/frmActivityWindow.Designer.cs | 9 ++---- win/C#/frmAddPreset.Designer.cs | 18 +++++------ win/C#/frmDownload.Designer.cs | 3 +- win/C#/frmDownload.resx | 59 ++++++++++++++++++++++++++++++++++++ win/C#/frmDvdInfo.Designer.cs | 6 ++-- win/C#/frmMain.Designer.cs | 38 ++++------------------- win/C#/frmMain.resx | 6 ++++ win/C#/frmOptions.Designer.cs | 17 +++-------- win/C#/frmQueue.Designer.cs | 15 +++------ win/C#/frmReadDVD.Designer.cs | 1 - win/C#/frmUpdater.Designer.cs | 6 ++-- 12 files changed, 115 insertions(+), 97 deletions(-) (limited to 'win/C#') diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs index 2a3054aa7..c289725e6 100644 --- a/win/C#/frmAbout.Designer.cs +++ b/win/C#/frmAbout.Designer.cs @@ -50,7 +50,7 @@ namespace Handbrake // this.Label4.AutoSize = true; 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(144, 58); + this.Label4.Location = new System.Drawing.Point(168, 58); this.Label4.Name = "Label4"; this.Label4.Size = new System.Drawing.Size(349, 26); this.Label4.TabIndex = 28; @@ -59,24 +59,22 @@ namespace Handbrake // // btn_close // - this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_close.Location = new System.Drawing.Point(388, 118); + this.btn_close.Location = new System.Drawing.Point(402, 114); this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(99, 22); + this.btn_close.Size = new System.Drawing.Size(115, 22); this.btn_close.TabIndex = 27; this.btn_close.Text = "Close"; - this.btn_close.UseVisualStyleBackColor = false; + this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // // Version // this.Version.AutoSize = true; this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Version.Location = new System.Drawing.Point(228, 13); + this.Version.Location = new System.Drawing.Point(266, 13); this.Version.Name = "Version"; this.Version.Size = new System.Drawing.Size(72, 13); this.Version.TabIndex = 26; @@ -86,7 +84,7 @@ namespace Handbrake // this.Label3.AutoSize = true; this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label3.Location = new System.Drawing.Point(144, 13); + this.Label3.Location = new System.Drawing.Point(168, 13); this.Label3.Name = "Label3"; this.Label3.Size = new System.Drawing.Size(78, 13); this.Label3.TabIndex = 25; @@ -96,9 +94,9 @@ namespace Handbrake // this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo128; this.PictureBox1.InitialImage = null; - this.PictureBox1.Location = new System.Drawing.Point(7, 8); + this.PictureBox1.Location = new System.Drawing.Point(8, 8); this.PictureBox1.Name = "PictureBox1"; - this.PictureBox1.Size = new System.Drawing.Size(131, 132); + this.PictureBox1.Size = new System.Drawing.Size(153, 132); this.PictureBox1.TabIndex = 23; this.PictureBox1.TabStop = false; // @@ -106,7 +104,7 @@ namespace Handbrake // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(144, 30); + this.label5.Location = new System.Drawing.Point(168, 30); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(40, 13); this.label5.TabIndex = 29; @@ -116,7 +114,7 @@ namespace Handbrake // this.lbl_build.AutoSize = true; this.lbl_build.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_build.Location = new System.Drawing.Point(228, 30); + this.lbl_build.Location = new System.Drawing.Point(266, 30); this.lbl_build.Name = "lbl_build"; this.lbl_build.Size = new System.Drawing.Size(64, 13); this.lbl_build.TabIndex = 30; @@ -124,19 +122,18 @@ namespace Handbrake // // groupBox1 // - this.groupBox1.Location = new System.Drawing.Point(147, 45); + this.groupBox1.Location = new System.Drawing.Point(171, 45); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(340, 10); + this.groupBox1.Size = new System.Drawing.Size(346, 10); this.groupBox1.TabIndex = 31; this.groupBox1.TabStop = false; // // frmAbout // this.AcceptButton = this.btn_close; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(497, 148); + this.ClientSize = new System.Drawing.Size(530, 148); this.Controls.Add(this.groupBox1); this.Controls.Add(this.lbl_build); this.Controls.Add(this.label5); @@ -145,6 +142,7 @@ namespace Handbrake this.Controls.Add(this.Version); this.Controls.Add(this.Label3); this.Controls.Add(this.PictureBox1); + this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs index a8cdfc808..6a8b4dc4e 100644 --- a/win/C#/frmActivityWindow.Designer.cs +++ b/win/C#/frmActivityWindow.Designer.cs @@ -57,7 +57,6 @@ namespace Handbrake // this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_close.Location = new System.Drawing.Point(399, 451); @@ -66,7 +65,7 @@ namespace Handbrake this.btn_close.TabIndex = 28; this.btn_close.TabStop = false; this.btn_close.Text = "Close Window"; - this.btn_close.UseVisualStyleBackColor = false; + this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // // ToolTip @@ -77,7 +76,6 @@ namespace Handbrake // this.btn_copy.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_copy.Location = new System.Drawing.Point(12, 451); @@ -85,14 +83,13 @@ namespace Handbrake this.btn_copy.Size = new System.Drawing.Size(134, 23); this.btn_copy.TabIndex = 93; this.btn_copy.Text = "Copy to Clipboard"; - this.btn_copy.UseVisualStyleBackColor = false; + this.btn_copy.UseVisualStyleBackColor = true; this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click); // // btn_refresh // this.btn_refresh.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_refresh.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_refresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_refresh.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_refresh.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_refresh.Location = new System.Drawing.Point(152, 451); @@ -100,7 +97,7 @@ namespace Handbrake this.btn_refresh.Size = new System.Drawing.Size(69, 23); this.btn_refresh.TabIndex = 94; this.btn_refresh.Text = "Refresh"; - this.btn_refresh.UseVisualStyleBackColor = false; + this.btn_refresh.UseVisualStyleBackColor = true; this.btn_refresh.Click += new System.EventHandler(this.btn_refresh_Click); // // frmActivityWindow diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs index 46b3db68e..b91ece1d8 100644 --- a/win/C#/frmAddPreset.Designer.cs +++ b/win/C#/frmAddPreset.Designer.cs @@ -44,7 +44,7 @@ namespace Handbrake // this.lbl_name.AutoSize = true; this.lbl_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_name.Location = new System.Drawing.Point(12, 20); + this.lbl_name.Location = new System.Drawing.Point(14, 20); this.lbl_name.Name = "lbl_name"; this.lbl_name.Size = new System.Drawing.Size(89, 13); this.lbl_name.TabIndex = 1; @@ -54,35 +54,35 @@ namespace Handbrake // this.txt_preset_name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txt_preset_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_preset_name.Location = new System.Drawing.Point(107, 17); + this.txt_preset_name.Location = new System.Drawing.Point(109, 17); this.txt_preset_name.Name = "txt_preset_name"; - this.txt_preset_name.Size = new System.Drawing.Size(193, 21); + this.txt_preset_name.Size = new System.Drawing.Size(241, 21); this.txt_preset_name.TabIndex = 2; // // btn_add // this.btn_add.BackColor = System.Drawing.Color.Transparent; this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_add.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_add.Location = new System.Drawing.Point(200, 44); + this.btn_add.Location = new System.Drawing.Point(233, 44); this.btn_add.Name = "btn_add"; - this.btn_add.Size = new System.Drawing.Size(100, 22); + this.btn_add.Size = new System.Drawing.Size(117, 22); this.btn_add.TabIndex = 4; this.btn_add.TabStop = false; this.btn_add.Text = "Add Preset"; - this.btn_add.UseVisualStyleBackColor = false; + this.btn_add.UseVisualStyleBackColor = true; this.btn_add.Click += new System.EventHandler(this.btn_add_Click); // // frmAddPreset // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(314, 76); + this.ClientSize = new System.Drawing.Size(366, 76); this.Controls.Add(this.btn_add); this.Controls.Add(this.txt_preset_name); this.Controls.Add(this.lbl_name); + this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; diff --git a/win/C#/frmDownload.Designer.cs b/win/C#/frmDownload.Designer.cs index 368d3d303..48ba0831f 100644 --- a/win/C#/frmDownload.Designer.cs +++ b/win/C#/frmDownload.Designer.cs @@ -74,7 +74,6 @@ namespace Handbrake // this.btn_cancel.BackColor = System.Drawing.Color.Silver; this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_cancel.Location = new System.Drawing.Point(321, 54); @@ -82,7 +81,7 @@ namespace Handbrake this.btn_cancel.Size = new System.Drawing.Size(90, 22); this.btn_cancel.TabIndex = 56; this.btn_cancel.Text = "Cancel"; - this.btn_cancel.UseVisualStyleBackColor = false; + this.btn_cancel.UseVisualStyleBackColor = true; this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click); // // frmDownload diff --git a/win/C#/frmDownload.resx b/win/C#/frmDownload.resx index 7b56d4c8f..37f92905a 100644 --- a/win/C#/frmDownload.resx +++ b/win/C#/frmDownload.resx @@ -1,5 +1,64 @@ + diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs index 0766bcb34..19bd7b317 100644 --- a/win/C#/frmDvdInfo.Designer.cs +++ b/win/C#/frmDvdInfo.Designer.cs @@ -72,7 +72,6 @@ namespace Handbrake // this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_close.Location = new System.Drawing.Point(446, 441); @@ -81,7 +80,7 @@ namespace Handbrake this.btn_close.TabIndex = 28; this.btn_close.TabStop = false; this.btn_close.Text = "Close Window"; - this.btn_close.UseVisualStyleBackColor = false; + this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // // pictureBox1 @@ -111,7 +110,6 @@ namespace Handbrake // this.btn_copy.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_copy.Location = new System.Drawing.Point(19, 441); @@ -119,7 +117,7 @@ namespace Handbrake this.btn_copy.Size = new System.Drawing.Size(134, 23); this.btn_copy.TabIndex = 93; this.btn_copy.Text = "Copy to Clipboard"; - this.btn_copy.UseVisualStyleBackColor = false; + this.btn_copy.UseVisualStyleBackColor = true; this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click); // // frmDvdInfo diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 2febb7fc7..20d4a9025 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -37,7 +37,7 @@ namespace Handbrake this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label Label38; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.File_Save = new System.Windows.Forms.SaveFileDialog(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); @@ -294,7 +294,6 @@ namespace Handbrake // // drop_chapterFinish // - this.drop_chapterFinish.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_chapterFinish.FormattingEnabled = true; this.drop_chapterFinish.Location = new System.Drawing.Point(397, 52); @@ -307,7 +306,6 @@ namespace Handbrake // // drop_chapterStart // - this.drop_chapterStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drop_chapterStart.FormattingEnabled = true; this.drop_chapterStart.Location = new System.Drawing.Point(295, 52); @@ -320,7 +318,6 @@ namespace Handbrake // // drp_dvdtitle // - this.drp_dvdtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_dvdtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_dvdtitle.FormattingEnabled = true; this.drp_dvdtitle.Items.AddRange(new object[] { @@ -336,7 +333,6 @@ namespace Handbrake // // text_source // - this.text_source.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_source.Location = new System.Drawing.Point(99, 19); this.text_source.Name = "text_source"; @@ -347,7 +343,6 @@ namespace Handbrake // // text_destination // - this.text_destination.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_destination.Location = new System.Drawing.Point(99, 19); this.text_destination.Name = "text_destination"; @@ -359,7 +354,6 @@ namespace Handbrake // drp_videoEncoder // this.drp_videoEncoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_videoEncoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_videoEncoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_videoEncoder.FormattingEnabled = true; this.drp_videoEncoder.Items.AddRange(new object[] { @@ -375,7 +369,6 @@ namespace Handbrake // // drp_audbit_1 // - this.drp_audbit_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audbit_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audbit_1.FormattingEnabled = true; this.drp_audbit_1.Items.AddRange(new object[] { @@ -398,7 +391,6 @@ namespace Handbrake // // drp_audsr_1 // - this.drp_audsr_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audsr_1.FormattingEnabled = true; this.drp_audsr_1.Items.AddRange(new object[] { @@ -419,7 +411,7 @@ namespace Handbrake this.check_largeFile.AutoSize = true; this.check_largeFile.BackColor = System.Drawing.Color.Transparent; this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_largeFile.Location = new System.Drawing.Point(261, 22); + this.check_largeFile.Location = new System.Drawing.Point(261, 23); this.check_largeFile.Name = "check_largeFile"; this.check_largeFile.Size = new System.Drawing.Size(82, 17); this.check_largeFile.TabIndex = 4; @@ -445,7 +437,6 @@ namespace Handbrake // // drp_videoFramerate // - this.drp_videoFramerate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_videoFramerate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_videoFramerate.FormattingEnabled = true; this.drp_videoFramerate.Items.AddRange(new object[] { @@ -478,7 +469,6 @@ namespace Handbrake // // text_filesize // - this.text_filesize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_filesize.Location = new System.Drawing.Point(446, 63); this.text_filesize.Name = "text_filesize"; @@ -489,7 +479,6 @@ namespace Handbrake // // text_bitrate // - this.text_bitrate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_bitrate.Location = new System.Drawing.Point(446, 36); this.text_bitrate.Name = "text_bitrate"; @@ -500,7 +489,6 @@ namespace Handbrake // // drp_subtitle // - this.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_subtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_subtitle.FormattingEnabled = true; this.drp_subtitle.Items.AddRange(new object[] { @@ -532,7 +520,6 @@ namespace Handbrake // // drp_audmix_1 // - this.drp_audmix_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audmix_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audmix_1.FormattingEnabled = true; this.drp_audmix_1.Items.AddRange(new object[] { @@ -552,7 +539,6 @@ namespace Handbrake // // text_height // - this.text_height.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_height.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_height.ForeColor = System.Drawing.SystemColors.InfoText; this.text_height.Location = new System.Drawing.Point(504, 35); @@ -564,7 +550,6 @@ namespace Handbrake // // text_width // - this.text_width.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_width.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.text_width.Location = new System.Drawing.Point(413, 35); this.text_width.Name = "text_width"; @@ -579,7 +564,7 @@ namespace Handbrake this.check_optimiseMP4.AutoSize = true; this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent; this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_optimiseMP4.Location = new System.Drawing.Point(349, 22); + this.check_optimiseMP4.Location = new System.Drawing.Point(349, 23); this.check_optimiseMP4.Name = "check_optimiseMP4"; this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17); this.check_optimiseMP4.TabIndex = 25; @@ -622,9 +607,9 @@ namespace Handbrake // // number // - dataGridViewCellStyle1.Format = "N0"; - dataGridViewCellStyle1.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle2; this.number.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; this.number.Name = "number"; @@ -670,7 +655,6 @@ namespace Handbrake // // drp_audmix_2 // - this.drp_audmix_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audmix_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audmix_2.FormattingEnabled = true; this.drp_audmix_2.Items.AddRange(new object[] { @@ -690,7 +674,6 @@ namespace Handbrake // // drp_audenc_1 // - this.drp_audenc_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audenc_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audenc_1.FormattingEnabled = true; this.drp_audenc_1.Items.AddRange(new object[] { @@ -708,7 +691,6 @@ namespace Handbrake // // drp_audenc_2 // - this.drp_audenc_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audenc_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audenc_2.FormattingEnabled = true; this.drp_audenc_2.Items.AddRange(new object[] { @@ -726,7 +708,6 @@ namespace Handbrake // // drp_audbit_2 // - this.drp_audbit_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audbit_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audbit_2.FormattingEnabled = true; this.drp_audbit_2.Items.AddRange(new object[] { @@ -749,7 +730,6 @@ namespace Handbrake // // drp_audsr_2 // - this.drp_audsr_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_audsr_2.FormattingEnabled = true; this.drp_audsr_2.Items.AddRange(new object[] { @@ -1333,7 +1313,6 @@ namespace Handbrake // // drp_track2Audio // - this.drp_track2Audio.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_track2Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_track2Audio.FormattingEnabled = true; this.drp_track2Audio.Items.AddRange(new object[] { @@ -1391,7 +1370,6 @@ namespace Handbrake // // drp_track1Audio // - this.drp_track1Audio.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_track1Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_track1Audio.FormattingEnabled = true; this.drp_track1Audio.Items.AddRange(new object[] { @@ -1619,7 +1597,6 @@ namespace Handbrake // drp_anamorphic // this.drp_anamorphic.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_anamorphic.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_anamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_anamorphic.FormattingEnabled = true; this.drp_anamorphic.Items.AddRange(new object[] { @@ -1764,7 +1741,6 @@ namespace Handbrake // drp_deNoise // this.drp_deNoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_deNoise.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_deNoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_deNoise.FormattingEnabled = true; this.drp_deNoise.Items.AddRange(new object[] { @@ -1826,7 +1802,6 @@ namespace Handbrake // drp_deInterlace_option // this.drp_deInterlace_option.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_deInterlace_option.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_deInterlace_option.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_deInterlace_option.FormattingEnabled = true; this.drp_deInterlace_option.Items.AddRange(new object[] { @@ -1929,7 +1904,6 @@ namespace Handbrake // drp_crop // this.drp_crop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.drp_crop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.drp_crop.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_crop.FormattingEnabled = true; this.drp_crop.Items.AddRange(new object[] { diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index e91100bb4..e9b8e49f4 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -149,6 +149,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise the list will not be populated with the correct amount of chapters. Note: Do not change any of the chapter numbers! + + True + + + True + 223, 15 diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 7276f6062..602dae418 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -72,7 +72,6 @@ namespace Handbrake // this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_close.Location = new System.Drawing.Point(324, 305); @@ -80,12 +79,12 @@ namespace Handbrake this.btn_close.Size = new System.Drawing.Size(107, 22); this.btn_close.TabIndex = 53; this.btn_close.Text = "Save && Close"; - this.btn_close.UseVisualStyleBackColor = false; + this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // // drp_completeOption // - this.drp_completeOption.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_completeOption.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_completeOption.FormattingEnabled = true; this.drp_completeOption.Items.AddRange(new object[] { @@ -125,7 +124,6 @@ namespace Handbrake // // tab_general // - this.tab_general.BackColor = System.Drawing.SystemColors.ControlLight; this.tab_general.Controls.Add(this.check_tooltip); this.tab_general.Controls.Add(this.check_updateCheck); this.tab_general.Controls.Add(this.check_userDefaultSettings); @@ -207,9 +205,7 @@ namespace Handbrake // // btn_browse // - this.btn_browse.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_browse.Location = new System.Drawing.Point(326, 146); @@ -217,7 +213,7 @@ namespace Handbrake this.btn_browse.Size = new System.Drawing.Size(68, 22); this.btn_browse.TabIndex = 62; this.btn_browse.Text = "Browse"; - this.btn_browse.UseVisualStyleBackColor = false; + this.btn_browse.UseVisualStyleBackColor = true; this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click); // // label10 @@ -232,7 +228,6 @@ namespace Handbrake // // text_an_path // - this.text_an_path.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.text_an_path.Location = new System.Drawing.Point(17, 147); this.text_an_path.Name = "text_an_path"; this.text_an_path.Size = new System.Drawing.Size(303, 21); @@ -273,7 +268,6 @@ namespace Handbrake // // tab_debug // - this.tab_debug.BackColor = System.Drawing.SystemColors.ControlLight; this.tab_debug.Controls.Add(this.label3); this.tab_debug.Controls.Add(this.drp_Priority); this.tab_debug.Controls.Add(this.Label11); @@ -299,7 +293,7 @@ namespace Handbrake // // drp_Priority // - this.drp_Priority.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.drp_Priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_Priority.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_Priority.FormattingEnabled = true; this.drp_Priority.Items.AddRange(new object[] { @@ -328,7 +322,7 @@ namespace Handbrake // // drp_processors // - this.drp_processors.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.drp_processors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.drp_processors.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.drp_processors.FormattingEnabled = true; this.drp_processors.Items.AddRange(new object[] { @@ -388,7 +382,6 @@ namespace Handbrake // // frmOptions // - this.BackColor = System.Drawing.SystemColors.ControlLight; this.ClientSize = new System.Drawing.Size(443, 339); this.Controls.Add(this.label7); this.Controls.Add(this.label8); diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index 3d860ce0c..cc7b9cf6a 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -72,7 +72,6 @@ namespace Handbrake // this.btn_down.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_down.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_down.Location = new System.Drawing.Point(74, 327); @@ -81,14 +80,13 @@ namespace Handbrake this.btn_down.TabIndex = 33; this.btn_down.TabStop = false; this.btn_down.Text = "Down"; - this.btn_down.UseVisualStyleBackColor = false; + this.btn_down.UseVisualStyleBackColor = true; this.btn_down.Click += new System.EventHandler(this.btn_down_Click); // // btn_up // this.btn_up.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_up.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_up.Location = new System.Drawing.Point(13, 327); @@ -97,14 +95,13 @@ namespace Handbrake this.btn_up.TabIndex = 32; this.btn_up.TabStop = false; this.btn_up.Text = "Up"; - this.btn_up.UseVisualStyleBackColor = false; + this.btn_up.UseVisualStyleBackColor = true; this.btn_up.Click += new System.EventHandler(this.btn_up_Click); // // btn_delete // this.btn_delete.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_delete.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_delete.Location = new System.Drawing.Point(144, 327); @@ -113,7 +110,7 @@ namespace Handbrake this.btn_delete.TabIndex = 31; this.btn_delete.TabStop = false; this.btn_delete.Text = "Delete"; - this.btn_delete.UseVisualStyleBackColor = false; + this.btn_delete.UseVisualStyleBackColor = true; this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click); // // list_queue @@ -145,7 +142,6 @@ namespace Handbrake // // progressBar // - this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight; this.progressBar.Location = new System.Drawing.Point(67, 360); this.progressBar.Name = "progressBar"; this.progressBar.Size = new System.Drawing.Size(616, 23); @@ -173,6 +169,7 @@ namespace Handbrake // lbl_status // this.lbl_status.AutoSize = true; + this.lbl_status.BackColor = System.Drawing.Color.Transparent; this.lbl_status.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_status.Location = new System.Drawing.Point(274, 366); this.lbl_status.Name = "lbl_status"; @@ -195,7 +192,6 @@ namespace Handbrake // this.btn_updateQuery.BackColor = System.Drawing.SystemColors.ControlLight; this.btn_updateQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_updateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_updateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_updateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.btn_updateQuery.Location = new System.Drawing.Point(649, 325); @@ -204,7 +200,7 @@ namespace Handbrake this.btn_updateQuery.TabIndex = 46; this.btn_updateQuery.TabStop = false; this.btn_updateQuery.Text = "Update"; - this.btn_updateQuery.UseVisualStyleBackColor = false; + this.btn_updateQuery.UseVisualStyleBackColor = true; this.btn_updateQuery.Click += new System.EventHandler(this.btn_updateQuery_Click); // // label4 @@ -363,7 +359,6 @@ namespace Handbrake // 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(729, 400); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.label4); diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs index b92bd3c94..7832b7521 100644 --- a/win/C#/frmReadDVD.Designer.cs +++ b/win/C#/frmReadDVD.Designer.cs @@ -75,7 +75,6 @@ namespace Handbrake // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLight; this.ClientSize = new System.Drawing.Size(360, 81); this.ControlBox = false; this.Controls.Add(this.pictureBox1); diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs index db1caa4c8..b8b2bf82c 100644 --- a/win/C#/frmUpdater.Designer.cs +++ b/win/C#/frmUpdater.Designer.cs @@ -130,7 +130,7 @@ namespace Handbrake this.btn_skip.Size = new System.Drawing.Size(133, 22); this.btn_skip.TabIndex = 54; this.btn_skip.Text = "Skip This Version"; - this.btn_skip.UseVisualStyleBackColor = false; + this.btn_skip.UseVisualStyleBackColor = true; this.btn_skip.Click += new System.EventHandler(this.btn_skip_Click); // // btn_installUpdate @@ -145,7 +145,7 @@ namespace Handbrake this.btn_installUpdate.Size = new System.Drawing.Size(133, 22); this.btn_installUpdate.TabIndex = 55; this.btn_installUpdate.Text = "Install Update"; - this.btn_installUpdate.UseVisualStyleBackColor = false; + this.btn_installUpdate.UseVisualStyleBackColor = true; this.btn_installUpdate.Click += new System.EventHandler(this.btn_installUpdate_Click); // // btn_remindLater @@ -160,7 +160,7 @@ namespace Handbrake this.btn_remindLater.Size = new System.Drawing.Size(133, 22); this.btn_remindLater.TabIndex = 56; this.btn_remindLater.Text = "Remind me Later"; - this.btn_remindLater.UseVisualStyleBackColor = false; + this.btn_remindLater.UseVisualStyleBackColor = true; this.btn_remindLater.Click += new System.EventHandler(this.btn_remindLater_Click); // // label3 -- cgit v1.2.3