From 8016bbda96afbda4f29c2fc9278c07bbfeeda788 Mon Sep 17 00:00:00 2001 From: sr55 Date: Wed, 22 Jul 2009 16:35:29 +0000 Subject: [PATCH] WinGui: - Possible fix for "clr20r3" error that some people have been seeing when trying to launch HB git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2722 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Controls/AudioPanel.Designer.cs | 2 +- win/C#/Controls/Subtitles.Designer.cs | 2 +- win/C#/frmOptions.Designer.cs | 101 +++++++++++++------------ win/C#/frmQueue.Designer.cs | 2 +- 4 files changed, 55 insertions(+), 52 deletions(-) diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs index fe765cf94..dd5741919 100644 --- a/win/C#/Controls/AudioPanel.Designer.cs +++ b/win/C#/Controls/AudioPanel.Designer.cs @@ -91,7 +91,7 @@ namespace Handbrake.Controls this.lv_audioList.Name = "lv_audioList"; this.lv_audioList.Size = new System.Drawing.Size(689, 147); this.lv_audioList.TabIndex = 65; - this.lv_audioList.UseCompatibleStateImageBehavior = false; + //this.lv_audioList.UseCompatibleStateImageBehavior = false; this.lv_audioList.View = System.Windows.Forms.View.Details; this.lv_audioList.SelectedIndexChanged += new System.EventHandler(this.lv_audioList_SelectedIndexChanged); // diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs index 26584ec99..0ea0875ae 100644 --- a/win/C#/Controls/Subtitles.Designer.cs +++ b/win/C#/Controls/Subtitles.Designer.cs @@ -189,7 +189,7 @@ this.lv_subList.Name = "lv_subList"; this.lv_subList.Size = new System.Drawing.Size(688, 131); this.lv_subList.TabIndex = 70; - this.lv_subList.UseCompatibleStateImageBehavior = false; + //this.lv_subList.UseCompatibleStateImageBehavior = false; this.lv_subList.View = System.Windows.Forms.View.Details; this.lv_subList.SelectedIndexChanged += new System.EventHandler(this.lb_subList_SelectedIndexChanged); // diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index b24ec2ba2..9d54c4ec2 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -62,7 +62,11 @@ namespace Handbrake this.btn_vlcPath = new System.Windows.Forms.Button(); this.txt_vlcPath = new System.Windows.Forms.TextBox(); this.tab_audio_sub = new System.Windows.Forms.TabPage(); + this.label31 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.radio_foreignAndSubs = new System.Windows.Forms.RadioButton(); this.drop_preferredLang = new System.Windows.Forms.ComboBox(); + this.radio_dub = new System.Windows.Forms.RadioButton(); this.tab_cli = new System.Windows.Forms.TabPage(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label12 = new System.Windows.Forms.Label(); @@ -130,10 +134,6 @@ namespace Handbrake this.label27 = new System.Windows.Forms.Label(); this.openFile_vlc = new System.Windows.Forms.OpenFileDialog(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.label15 = new System.Windows.Forms.Label(); - this.radio_dub = new System.Windows.Forms.RadioButton(); - this.radio_foreignAndSubs = new System.Windows.Forms.RadioButton(); - this.label31 = new System.Windows.Forms.Label(); this.tab_options.SuspendLayout(); this.tab_general.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -545,6 +545,40 @@ namespace Handbrake this.tab_audio_sub.Text = "Audio / Subtitles"; this.tab_audio_sub.UseVisualStyleBackColor = true; // + // label31 + // + this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label31.AutoSize = true; + this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label31.Location = new System.Drawing.Point(16, 19); + this.label31.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(52, 13); + this.label31.TabIndex = 91; + this.label31.Text = "Actions:"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(87, 19); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(107, 13); + this.label15.TabIndex = 88; + this.label15.Text = "Preferred Language:"; + // + // radio_foreignAndSubs + // + this.radio_foreignAndSubs.AutoSize = true; + this.radio_foreignAndSubs.Location = new System.Drawing.Point(200, 76); + this.radio_foreignAndSubs.Name = "radio_foreignAndSubs"; + this.radio_foreignAndSubs.Size = new System.Drawing.Size(358, 17); + this.radio_foreignAndSubs.TabIndex = 90; + this.radio_foreignAndSubs.TabStop = true; + this.radio_foreignAndSubs.Text = "Use foreign language audio and add first preferred language subtitle."; + this.ToolTip.SetToolTip(this.radio_foreignAndSubs, "Use foreign language audio and add first subtitle track of prefered language.\r\n"); + this.radio_foreignAndSubs.UseVisualStyleBackColor = true; + this.radio_foreignAndSubs.CheckedChanged += new System.EventHandler(this.radio_foreignAndSubs_CheckedChanged); + // // drop_preferredLang // this.drop_preferredLang.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -557,6 +591,20 @@ namespace Handbrake "n Automatic."); this.drop_preferredLang.SelectedIndexChanged += new System.EventHandler(this.drop_preferredLang_SelectedIndexChanged); // + // radio_dub + // + this.radio_dub.AutoSize = true; + this.radio_dub.Location = new System.Drawing.Point(200, 53); + this.radio_dub.Name = "radio_dub"; + this.radio_dub.Size = new System.Drawing.Size(164, 17); + this.radio_dub.TabIndex = 89; + this.radio_dub.TabStop = true; + this.radio_dub.Text = "DUB Foreign Language Audio"; + this.ToolTip.SetToolTip(this.radio_dub, "This option will select your prefered language of audio for the source if one exi" + + "sts."); + this.radio_dub.UseVisualStyleBackColor = true; + this.radio_dub.CheckedChanged += new System.EventHandler(this.radio_dub_CheckedChanged); + // // tab_cli // this.tab_cli.Controls.Add(this.tableLayoutPanel3); @@ -1456,51 +1504,6 @@ namespace Handbrake this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 405); this.tableLayoutPanel5.TabIndex = 62; // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(87, 19); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(107, 13); - this.label15.TabIndex = 88; - this.label15.Text = "Preferred Language:"; - // - // radio_dub - // - this.radio_dub.AutoSize = true; - this.radio_dub.Location = new System.Drawing.Point(200, 53); - this.radio_dub.Name = "radio_dub"; - this.radio_dub.Size = new System.Drawing.Size(164, 17); - this.radio_dub.TabIndex = 89; - this.radio_dub.TabStop = true; - this.radio_dub.Text = "DUB Foreign Language Audio"; - this.radio_dub.UseVisualStyleBackColor = true; - this.radio_dub.CheckedChanged += new System.EventHandler(this.radio_dub_CheckedChanged); - // - // radio_foreignAndSubs - // - this.radio_foreignAndSubs.AutoSize = true; - this.radio_foreignAndSubs.Location = new System.Drawing.Point(200, 76); - this.radio_foreignAndSubs.Name = "radio_foreignAndSubs"; - this.radio_foreignAndSubs.Size = new System.Drawing.Size(241, 17); - this.radio_foreignAndSubs.TabIndex = 90; - this.radio_foreignAndSubs.TabStop = true; - this.radio_foreignAndSubs.Text = "Use foreign language audio and add subtitles"; - this.radio_foreignAndSubs.UseVisualStyleBackColor = true; - this.radio_foreignAndSubs.CheckedChanged += new System.EventHandler(this.radio_foreignAndSubs_CheckedChanged); - // - // label31 - // - this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label31.AutoSize = true; - this.label31.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label31.Location = new System.Drawing.Point(16, 19); - this.label31.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(52, 13); - this.label31.TabIndex = 91; - this.label31.Text = "Actions:"; - // // frmOptions // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index f5b379cac..7d86537e2 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -349,7 +349,7 @@ namespace Handbrake this.list_queue.Name = "list_queue"; this.list_queue.Size = new System.Drawing.Size(761, 219); this.list_queue.TabIndex = 72; - this.list_queue.UseCompatibleStateImageBehavior = false; + //this.list_queue.UseCompatibleStateImageBehavior = false; this.list_queue.View = System.Windows.Forms.View.Details; this.list_queue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.list_queue_deleteKey); // -- 2.40.0