From 9b39598501f8a7b814e778744ad996719e779dfd Mon Sep 17 00:00:00 2001 From: MaxED Date: Fri, 22 Nov 2013 09:23:59 +0000 Subject: [PATCH] Forgot to commit these two files... I'm sorry :( --- .../Interface/PreferencesForm.Designer.cs | 113 ++++++++++++++++++ .../Interface/SectorDrawingOptionsPanel.cs | 28 ++--- 2 files changed, 124 insertions(+), 17 deletions(-) diff --git a/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs index 622e8a90..ec9bdbf0 100644 --- a/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs +++ b/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs @@ -30,6 +30,15 @@ namespace CodeImp.DoomBuilder.BuilderModes { this.tabs = new System.Windows.Forms.TabControl(); this.taboptions = new System.Windows.Forms.TabPage(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.label15 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.defaultfloorheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); + this.label13 = new System.Windows.Forms.Label(); + this.defaultceilheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); + this.label12 = new System.Windows.Forms.Label(); + this.defaultbrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox(); + this.label11 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.syncSelection = new System.Windows.Forms.CheckBox(); this.dontMoveGeometryOutsideBounds = new System.Windows.Forms.CheckBox(); @@ -61,6 +70,7 @@ namespace CodeImp.DoomBuilder.BuilderModes this.heightbysidedef = new System.Windows.Forms.ComboBox(); this.tabs.SuspendLayout(); this.taboptions.SuspendLayout(); + this.groupBox4.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -93,6 +103,107 @@ namespace CodeImp.DoomBuilder.BuilderModes this.taboptions.Text = "Editing"; this.taboptions.UseVisualStyleBackColor = true; // + // groupBox4 + // + this.groupBox4.Controls.Add(this.label15); + this.groupBox4.Controls.Add(this.label14); + this.groupBox4.Controls.Add(this.defaultfloorheight); + this.groupBox4.Controls.Add(this.label13); + this.groupBox4.Controls.Add(this.defaultceilheight); + this.groupBox4.Controls.Add(this.label12); + this.groupBox4.Controls.Add(this.defaultbrightness); + this.groupBox4.Controls.Add(this.label11); + this.groupBox4.Location = new System.Drawing.Point(6, 261); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(272, 130); + this.groupBox4.TabIndex = 19; + this.groupBox4.TabStop = false; + this.groupBox4.Text = " Default sector values"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(221, 28); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(27, 14); + this.label15.TabIndex = 26; + this.label15.Text = "m.u."; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(221, 58); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(27, 14); + this.label14.TabIndex = 20; + this.label14.Text = "m.u."; + // + // defaultfloorheight + // + this.defaultfloorheight.AllowDecimal = false; + this.defaultfloorheight.AllowNegative = true; + this.defaultfloorheight.AllowRelative = false; + this.defaultfloorheight.ButtonStep = 5; + this.defaultfloorheight.ButtonStepFloat = 1F; + this.defaultfloorheight.Location = new System.Drawing.Point(156, 23); + this.defaultfloorheight.Name = "defaultfloorheight"; + this.defaultfloorheight.Size = new System.Drawing.Size(59, 24); + this.defaultfloorheight.StepValues = null; + this.defaultfloorheight.TabIndex = 25; + // + // label13 + // + this.label13.Location = new System.Drawing.Point(41, 28); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(110, 14); + this.label13.TabIndex = 24; + this.label13.Text = "Default floor height:"; + this.label13.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // defaultceilheight + // + this.defaultceilheight.AllowDecimal = false; + this.defaultceilheight.AllowNegative = true; + this.defaultceilheight.AllowRelative = false; + this.defaultceilheight.ButtonStep = 5; + this.defaultceilheight.ButtonStepFloat = 1F; + this.defaultceilheight.Location = new System.Drawing.Point(156, 53); + this.defaultceilheight.Name = "defaultceilheight"; + this.defaultceilheight.Size = new System.Drawing.Size(59, 24); + this.defaultceilheight.StepValues = null; + this.defaultceilheight.TabIndex = 23; + // + // label12 + // + this.label12.Location = new System.Drawing.Point(41, 58); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(110, 14); + this.label12.TabIndex = 22; + this.label12.Text = "Default ceiling height:"; + this.label12.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // defaultbrightness + // + this.defaultbrightness.AllowDecimal = false; + this.defaultbrightness.AllowNegative = false; + this.defaultbrightness.AllowRelative = false; + this.defaultbrightness.ButtonStep = 5; + this.defaultbrightness.ButtonStepFloat = 1F; + this.defaultbrightness.Location = new System.Drawing.Point(156, 83); + this.defaultbrightness.Name = "defaultbrightness"; + this.defaultbrightness.Size = new System.Drawing.Size(59, 24); + this.defaultbrightness.StepValues = null; + this.defaultbrightness.TabIndex = 21; + // + // label11 + // + this.label11.Location = new System.Drawing.Point(41, 88); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(110, 14); + this.label11.TabIndex = 20; + this.label11.Text = "Default brightness:"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // groupBox3 // this.groupBox3.Controls.Add(this.syncSelection); @@ -435,6 +546,8 @@ namespace CodeImp.DoomBuilder.BuilderModes this.Text = "PreferencesForm"; this.tabs.ResumeLayout(false); this.taboptions.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.groupBox2.ResumeLayout(false); diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs index 9945f790..731d1510 100644 --- a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs +++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs @@ -1,12 +1,10 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; +#region Namespaces + +using System; using System.Windows.Forms; +#endregion + namespace CodeImp.DoomBuilder.BuilderModes.Interface { public partial class SectorDrawingOptionsPanel : UserControl @@ -18,10 +16,10 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface } public void Setup() { - ceilHeight.Text = General.Map.Options.DefaultCeilingHeight.ToString(); - floorHeight.Text = General.Map.Options.DefaultFloorHeight.ToString(); + ceilHeight.Text = General.Map.Options.CustomCeilingHeight.ToString(); + floorHeight.Text = General.Map.Options.CustomFloorHeight.ToString(); brightness.StepValues = General.Map.Config.BrightnessLevels; - brightness.Text = General.Map.Options.DefaultBrightness.ToString(); + brightness.Text = General.Map.Options.CustomBrightness.ToString(); ceiling.TextureName = General.Map.Options.DefaultCeilingTexture; floor.TextureName = General.Map.Options.DefaultFloorTexture; walls.TextureName = General.Map.Options.DefaultWallTexture; @@ -80,15 +78,15 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface #region Inputs Events private void ceilHeight_WhenTextChanged(object sender, EventArgs e) { - General.Map.Options.DefaultCeilingHeight = ceilHeight.GetResult(General.Map.Options.DefaultCeilingHeight); + General.Map.Options.CustomCeilingHeight = ceilHeight.GetResult(General.Map.Options.CustomCeilingHeight); } private void floorHeight_WhenTextChanged(object sender, EventArgs e) { - General.Map.Options.DefaultFloorHeight = floorHeight.GetResult(General.Map.Options.DefaultFloorHeight); + General.Map.Options.CustomFloorHeight = floorHeight.GetResult(General.Map.Options.CustomFloorHeight); } private void brightness_WhenTextChanged(object sender, EventArgs e) { - General.Map.Options.DefaultBrightness = General.Clamp(brightness.GetResult(General.Map.Options.DefaultBrightness), 0, 255); + General.Map.Options.CustomBrightness = General.Clamp(brightness.GetResult(General.Map.Options.CustomBrightness), 0, 255); } private void ceiling_OnValueChanged(object sender, EventArgs e) { @@ -103,10 +101,6 @@ namespace CodeImp.DoomBuilder.BuilderModes.Interface General.Map.Options.DefaultWallTexture = walls.TextureName; } - /*private void SectorDrawingOptionsPanel_MouseLeave(object sender, EventArgs e) { - General.Interface.FocusDisplay(); - }*/ - #endregion }