From e37449d485199f7c7aa624da1e500fd60bb7abf0 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Tue, 21 Apr 2015 10:26:12 -0400 Subject: [PATCH] Fix behavior of Require31 checkbox, label, and textbox --- .../ACME/BootstrapScript/BootstrapScriptEditor.Designer.cs | 4 +++- .../Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.cs | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.Designer.cs b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.Designer.cs index a2992191..caed23b3 100644 --- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.Designer.cs +++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.Designer.cs @@ -100,9 +100,10 @@ // chkRequire31 // this.chkRequire31.AutoSize = true; + this.chkRequire31.FlatStyle = System.Windows.Forms.FlatStyle.System; this.chkRequire31.Location = new System.Drawing.Point(19, 149); this.chkRequire31.Name = "chkRequire31"; - this.chkRequire31.Size = new System.Drawing.Size(128, 17); + this.chkRequire31.Size = new System.Drawing.Size(134, 18); this.chkRequire31.TabIndex = 3; this.chkRequire31.Text = "&Require Windows 3.1"; this.chkRequire31.UseVisualStyleBackColor = true; @@ -186,6 +187,7 @@ // lblRequire31 // this.lblRequire31.AutoSize = true; + this.lblRequire31.Enabled = false; this.lblRequire31.Location = new System.Drawing.Point(51, 175); this.lblRequire31.Name = "lblRequire31"; this.lblRequire31.Size = new System.Drawing.Size(77, 13); diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.cs b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.cs index 77043c16..2a49c38a 100644 --- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.cs +++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Microsoft.SoftwareInstallation.UserInterface.WindowsForms/Editors/Setup/Microsoft/ACME/BootstrapScript/BootstrapScriptEditor.cs @@ -34,6 +34,7 @@ namespace UniversalEditor.Editors.Setup.Microsoft.ACME.BootstrapScript private void chkRequire31_CheckedChanged(object sender, EventArgs e) { txtRequire31.ReadOnly = !chkRequire31.Checked; + lblRequire31.Enabled = chkRequire31.Checked; BootstrapScriptObjectModel script = (ObjectModel as BootstrapScriptObjectModel); if (script == null) return; @@ -56,8 +57,11 @@ namespace UniversalEditor.Editors.Setup.Microsoft.ACME.BootstrapScript txtTemporaryDirectoryName.Text = script.TemporaryDirectoryName; txtCommandLine.Text = script.CommandLine; txtWindowClassName.Text = script.WindowClassName; - chkRequire31.Enabled = script.Require31Enabled; + + chkRequire31.Checked = script.Require31Enabled; + txtRequire31.ReadOnly = !script.Require31Enabled; txtRequire31.Text = script.Require31Message; + lblRequire31.Enabled = script.Require31Enabled; } private void txtWindowTitle_TextChanged(object sender, EventArgs e)