diff --git a/Source/BuilderModes/LinedefsMode/DragLinedefsMode.cs b/Source/BuilderModes/LinedefsMode/DragLinedefsMode.cs index 8e442d2c..f61c7dd5 100644 --- a/Source/BuilderModes/LinedefsMode/DragLinedefsMode.cs +++ b/Source/BuilderModes/LinedefsMode/DragLinedefsMode.cs @@ -119,7 +119,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing // This redraws the display public unsafe override void RedrawDisplay() { - bool viewchanged = false; + bool viewchanged = CheckViewChanged(); // Start rendering if(renderer.Start(true, viewchanged)) @@ -138,7 +138,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing */ // Redraw things when view changed - if(CheckViewChanged()) + if(viewchanged) { renderer.SetThingsRenderOrder(false); renderer.RenderThingSet(General.Map.Map.Things); diff --git a/Source/BuilderModes/SectorsMode/DragSectorsMode.cs b/Source/BuilderModes/SectorsMode/DragSectorsMode.cs index b174505c..7a27b892 100644 --- a/Source/BuilderModes/SectorsMode/DragSectorsMode.cs +++ b/Source/BuilderModes/SectorsMode/DragSectorsMode.cs @@ -121,7 +121,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing // This redraws the display public unsafe override void RedrawDisplay() { - bool viewchanged = false; + bool viewchanged = CheckViewChanged(); // Start rendering if(renderer.Start(true, viewchanged)) @@ -140,7 +140,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing */ // Redraw things when view changed - if(CheckViewChanged()) + if(viewchanged) { renderer.SetThingsRenderOrder(false); renderer.RenderThingSet(General.Map.Map.Things); diff --git a/Source/BuilderModes/VerticesMode/DragVerticesMode.cs b/Source/BuilderModes/VerticesMode/DragVerticesMode.cs index eca64a4b..03577b66 100644 --- a/Source/BuilderModes/VerticesMode/DragVerticesMode.cs +++ b/Source/BuilderModes/VerticesMode/DragVerticesMode.cs @@ -116,7 +116,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing // This redraws the display public unsafe override void RedrawDisplay() { - bool viewchanged = false; + bool viewchanged = CheckViewChanged(); // Start rendering if(renderer.Start(true, viewchanged)) @@ -135,7 +135,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.Editing */ // Redraw things when view changed - if(CheckViewChanged()) + if(viewchanged) { renderer.SetThingsRenderOrder(false); renderer.RenderThingSet(General.Map.Map.Things); diff --git a/Source/Interface/LinedefEditForm.Designer.cs b/Source/Interface/LinedefEditForm.Designer.cs index b6af2fad..0465f130 100644 --- a/Source/Interface/LinedefEditForm.Designer.cs +++ b/Source/Interface/LinedefEditForm.Designer.cs @@ -305,10 +305,10 @@ namespace CodeImp.DoomBuilder.Interface this.actiongroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.actiongroup.Controls.Add(this.hexenpanel); this.actiongroup.Controls.Add(label2); this.actiongroup.Controls.Add(this.action); this.actiongroup.Controls.Add(this.browseaction); + this.actiongroup.Controls.Add(this.hexenpanel); this.actiongroup.Controls.Add(this.doompanel); this.actiongroup.Location = new System.Drawing.Point(8, 169); this.actiongroup.Name = "actiongroup"; @@ -721,6 +721,7 @@ namespace CodeImp.DoomBuilder.Interface this.tabcustom.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tabcustom.Location = new System.Drawing.Point(4, 23); this.tabcustom.Name = "tabcustom"; + this.tabcustom.Padding = new System.Windows.Forms.Padding(3); this.tabcustom.Size = new System.Drawing.Size(533, 381); this.tabcustom.TabIndex = 2; this.tabcustom.Text = "Custom"; @@ -728,9 +729,13 @@ namespace CodeImp.DoomBuilder.Interface // // fieldslist // - this.fieldslist.Location = new System.Drawing.Point(12, 12); + this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.fieldslist.Location = new System.Drawing.Point(11, 11); + this.fieldslist.Margin = new System.Windows.Forms.Padding(8); this.fieldslist.Name = "fieldslist"; - this.fieldslist.Size = new System.Drawing.Size(508, 357); + this.fieldslist.Size = new System.Drawing.Size(511, 359); this.fieldslist.TabIndex = 0; // // LinedefEditForm diff --git a/Source/Interface/LinedefEditForm.resx b/Source/Interface/LinedefEditForm.resx index 436e3263..f7c7e4f6 100644 --- a/Source/Interface/LinedefEditForm.resx +++ b/Source/Interface/LinedefEditForm.resx @@ -219,6 +219,12 @@ True + + True + + + True + True @@ -240,12 +246,6 @@ True - - True - - - True - True @@ -255,12 +255,39 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True True + + True + True @@ -279,6 +306,36 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -321,6 +378,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True diff --git a/Source/Interface/SectorEditForm.Designer.cs b/Source/Interface/SectorEditForm.Designer.cs index 8e554fc7..b7dde8ba 100644 --- a/Source/Interface/SectorEditForm.Designer.cs +++ b/Source/Interface/SectorEditForm.Designer.cs @@ -28,106 +28,57 @@ namespace CodeImp.DoomBuilder.Interface /// private void InitializeComponent() { - System.Windows.Forms.GroupBox groupfloorceiling; - System.Windows.Forms.GroupBox groupeffect; - System.Windows.Forms.GroupBox groupaction; - System.Windows.Forms.Label label3; System.Windows.Forms.Label label1; + System.Windows.Forms.Label label3; + System.Windows.Forms.GroupBox groupaction; + System.Windows.Forms.GroupBox groupeffect; + System.Windows.Forms.GroupBox groupfloorceiling; + System.Windows.Forms.Label label2; + System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; + System.Windows.Forms.Label label6; + System.Windows.Forms.Label label7; + System.Windows.Forms.Label label8; + System.Windows.Forms.Label label9; + System.Windows.Forms.Label taglabel; + this.floortex = new CodeImp.DoomBuilder.Interface.FlatSelectorControl(); + this.ceilingtex = new CodeImp.DoomBuilder.Interface.FlatSelectorControl(); this.cancel = new System.Windows.Forms.Button(); this.apply = new System.Windows.Forms.Button(); - this.flatSelectorControl1 = new CodeImp.DoomBuilder.Interface.FlatSelectorControl(); + this.tabs = new System.Windows.Forms.TabControl(); + this.tabproperties = new System.Windows.Forms.TabPage(); + this.tabcustom = new System.Windows.Forms.TabPage(); this.flatSelectorControl2 = new CodeImp.DoomBuilder.Interface.FlatSelectorControl(); - groupfloorceiling = new System.Windows.Forms.GroupBox(); - groupeffect = new System.Windows.Forms.GroupBox(); - groupaction = new System.Windows.Forms.GroupBox(); - label3 = new System.Windows.Forms.Label(); + this.flatSelectorControl1 = new CodeImp.DoomBuilder.Interface.FlatSelectorControl(); + this.fieldslist = new CodeImp.DoomBuilder.Interface.FieldsEditorControl(); + this.floorheight = new CodeImp.DoomBuilder.Interface.NumericTextbox(); + this.ceilingheight = new CodeImp.DoomBuilder.Interface.NumericTextbox(); + this.sectorheight = new System.Windows.Forms.Label(); + this.effect = new CodeImp.DoomBuilder.Interface.ActionSelectorControl(); + this.brightness = new CodeImp.DoomBuilder.Interface.NumericTextbox(); + this.tag = new CodeImp.DoomBuilder.Interface.NumericTextbox(); + this.newtag = new System.Windows.Forms.Button(); label1 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + groupaction = new System.Windows.Forms.GroupBox(); + groupeffect = new System.Windows.Forms.GroupBox(); + groupfloorceiling = new System.Windows.Forms.GroupBox(); + label2 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); + label7 = new System.Windows.Forms.Label(); + label8 = new System.Windows.Forms.Label(); + label9 = new System.Windows.Forms.Label(); + taglabel = new System.Windows.Forms.Label(); + groupaction.SuspendLayout(); + groupeffect.SuspendLayout(); groupfloorceiling.SuspendLayout(); + this.tabs.SuspendLayout(); + this.tabproperties.SuspendLayout(); + this.tabcustom.SuspendLayout(); this.SuspendLayout(); // - // groupfloorceiling - // - groupfloorceiling.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - groupfloorceiling.Controls.Add(label1); - groupfloorceiling.Controls.Add(label3); - groupfloorceiling.Controls.Add(this.flatSelectorControl2); - groupfloorceiling.Controls.Add(this.flatSelectorControl1); - groupfloorceiling.Location = new System.Drawing.Point(12, 12); - groupfloorceiling.Name = "groupfloorceiling"; - groupfloorceiling.Size = new System.Drawing.Size(465, 161); - groupfloorceiling.TabIndex = 0; - groupfloorceiling.TabStop = false; - groupfloorceiling.Text = "Floor and Ceiling "; - // - // groupeffect - // - groupeffect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - groupeffect.Location = new System.Drawing.Point(12, 182); - groupeffect.Name = "groupeffect"; - groupeffect.Size = new System.Drawing.Size(465, 83); - groupeffect.TabIndex = 1; - groupeffect.TabStop = false; - groupeffect.Text = " Effect "; - // - // groupaction - // - groupaction.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - groupaction.Location = new System.Drawing.Point(12, 274); - groupaction.Name = "groupaction"; - groupaction.Size = new System.Drawing.Size(465, 83); - groupaction.TabIndex = 2; - groupaction.TabStop = false; - groupaction.Text = " Action "; - // - // cancel - // - this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel.Location = new System.Drawing.Point(365, 371); - this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(112, 25); - this.cancel.TabIndex = 19; - this.cancel.Text = "Cancel"; - this.cancel.UseVisualStyleBackColor = true; - // - // apply - // - this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.apply.Location = new System.Drawing.Point(246, 371); - this.apply.Name = "apply"; - this.apply.Size = new System.Drawing.Size(112, 25); - this.apply.TabIndex = 18; - this.apply.Text = "OK"; - this.apply.UseVisualStyleBackColor = true; - // - // flatSelectorControl1 - // - this.flatSelectorControl1.Location = new System.Drawing.Point(363, 37); - this.flatSelectorControl1.Name = "flatSelectorControl1"; - this.flatSelectorControl1.Size = new System.Drawing.Size(83, 105); - this.flatSelectorControl1.TabIndex = 12; - this.flatSelectorControl1.TextureName = ""; - // - // flatSelectorControl2 - // - this.flatSelectorControl2.Location = new System.Drawing.Point(271, 37); - this.flatSelectorControl2.Name = "flatSelectorControl2"; - this.flatSelectorControl2.Size = new System.Drawing.Size(83, 105); - this.flatSelectorControl2.TabIndex = 13; - this.flatSelectorControl2.TextureName = ""; - // - // label3 - // - label3.Location = new System.Drawing.Point(363, 18); - label3.Name = "label3"; - label3.Size = new System.Drawing.Size(83, 16); - label3.TabIndex = 14; - label3.Text = "Ceiling"; - label3.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // // label1 // label1.Location = new System.Drawing.Point(271, 18); @@ -137,17 +88,324 @@ namespace CodeImp.DoomBuilder.Interface label1.Text = "Floor"; label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; // + // label3 + // + label3.Location = new System.Drawing.Point(363, 18); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(83, 16); + label3.TabIndex = 14; + label3.Text = "Ceiling"; + label3.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // groupaction + // + groupaction.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + groupaction.Controls.Add(this.tag); + groupaction.Controls.Add(taglabel); + groupaction.Controls.Add(this.newtag); + groupaction.Location = new System.Drawing.Point(7, 290); + groupaction.Name = "groupaction"; + groupaction.Size = new System.Drawing.Size(436, 71); + groupaction.TabIndex = 5; + groupaction.TabStop = false; + groupaction.Text = " Action "; + // + // groupeffect + // + groupeffect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + groupeffect.Controls.Add(this.brightness); + groupeffect.Controls.Add(label9); + groupeffect.Controls.Add(this.effect); + groupeffect.Controls.Add(label8); + groupeffect.Location = new System.Drawing.Point(7, 176); + groupeffect.Name = "groupeffect"; + groupeffect.Size = new System.Drawing.Size(436, 105); + groupeffect.TabIndex = 4; + groupeffect.TabStop = false; + groupeffect.Text = " Effect "; + // + // groupfloorceiling + // + groupfloorceiling.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + groupfloorceiling.Controls.Add(this.sectorheight); + groupfloorceiling.Controls.Add(label7); + groupfloorceiling.Controls.Add(label6); + groupfloorceiling.Controls.Add(this.ceilingheight); + groupfloorceiling.Controls.Add(label5); + groupfloorceiling.Controls.Add(this.floorheight); + groupfloorceiling.Controls.Add(label2); + groupfloorceiling.Controls.Add(label4); + groupfloorceiling.Controls.Add(this.floortex); + groupfloorceiling.Controls.Add(this.ceilingtex); + groupfloorceiling.Location = new System.Drawing.Point(7, 6); + groupfloorceiling.Name = "groupfloorceiling"; + groupfloorceiling.Size = new System.Drawing.Size(436, 161); + groupfloorceiling.TabIndex = 3; + groupfloorceiling.TabStop = false; + groupfloorceiling.Text = "Floor and Ceiling "; + // + // label2 + // + label2.Location = new System.Drawing.Point(237, 18); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(83, 16); + label2.TabIndex = 15; + label2.Text = "Floor"; + label2.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label4 + // + label4.Location = new System.Drawing.Point(332, 18); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(83, 16); + label4.TabIndex = 14; + label4.Text = "Ceiling"; + label4.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // floortex + // + this.floortex.Location = new System.Drawing.Point(237, 37); + this.floortex.Name = "floortex"; + this.floortex.Size = new System.Drawing.Size(83, 105); + this.floortex.TabIndex = 13; + this.floortex.TextureName = ""; + // + // ceilingtex + // + this.ceilingtex.Location = new System.Drawing.Point(332, 37); + this.ceilingtex.Name = "ceilingtex"; + this.ceilingtex.Size = new System.Drawing.Size(83, 105); + this.ceilingtex.TabIndex = 12; + this.ceilingtex.TextureName = ""; + // + // cancel + // + this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancel.Location = new System.Drawing.Point(355, 423); + this.cancel.Name = "cancel"; + this.cancel.Size = new System.Drawing.Size(112, 25); + this.cancel.TabIndex = 19; + this.cancel.Text = "Cancel"; + this.cancel.UseVisualStyleBackColor = true; + // + // apply + // + this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.apply.Location = new System.Drawing.Point(236, 423); + this.apply.Name = "apply"; + this.apply.Size = new System.Drawing.Size(112, 25); + this.apply.TabIndex = 18; + this.apply.Text = "OK"; + this.apply.UseVisualStyleBackColor = true; + // + // tabs + // + this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tabs.Controls.Add(this.tabproperties); + this.tabs.Controls.Add(this.tabcustom); + this.tabs.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabs.Location = new System.Drawing.Point(10, 10); + this.tabs.Margin = new System.Windows.Forms.Padding(1); + this.tabs.Name = "tabs"; + this.tabs.SelectedIndex = 0; + this.tabs.Size = new System.Drawing.Size(457, 396); + this.tabs.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.tabs.TabIndex = 20; + // + // tabproperties + // + this.tabproperties.Controls.Add(groupaction); + this.tabproperties.Controls.Add(groupeffect); + this.tabproperties.Controls.Add(groupfloorceiling); + this.tabproperties.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabproperties.Location = new System.Drawing.Point(4, 23); + this.tabproperties.Name = "tabproperties"; + this.tabproperties.Padding = new System.Windows.Forms.Padding(3); + this.tabproperties.Size = new System.Drawing.Size(449, 369); + this.tabproperties.TabIndex = 0; + this.tabproperties.Text = "Properties"; + this.tabproperties.UseVisualStyleBackColor = true; + // + // tabcustom + // + this.tabcustom.Controls.Add(this.fieldslist); + this.tabcustom.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabcustom.Location = new System.Drawing.Point(4, 23); + this.tabcustom.Name = "tabcustom"; + this.tabcustom.Padding = new System.Windows.Forms.Padding(3); + this.tabcustom.Size = new System.Drawing.Size(449, 369); + this.tabcustom.TabIndex = 1; + this.tabcustom.Text = "Custom"; + this.tabcustom.UseVisualStyleBackColor = true; + // + // flatSelectorControl2 + // + this.flatSelectorControl2.Location = new System.Drawing.Point(271, 37); + this.flatSelectorControl2.Name = "flatSelectorControl2"; + this.flatSelectorControl2.Size = new System.Drawing.Size(83, 105); + this.flatSelectorControl2.TabIndex = 13; + this.flatSelectorControl2.TextureName = ""; + // + // flatSelectorControl1 + // + this.flatSelectorControl1.Location = new System.Drawing.Point(363, 37); + this.flatSelectorControl1.Name = "flatSelectorControl1"; + this.flatSelectorControl1.Size = new System.Drawing.Size(83, 105); + this.flatSelectorControl1.TabIndex = 12; + this.flatSelectorControl1.TextureName = ""; + // + // fieldslist + // + this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.fieldslist.Location = new System.Drawing.Point(11, 11); + this.fieldslist.Margin = new System.Windows.Forms.Padding(8); + this.fieldslist.Name = "fieldslist"; + this.fieldslist.Size = new System.Drawing.Size(427, 347); + this.fieldslist.TabIndex = 1; + // + // floorheight + // + this.floorheight.AllowNegative = false; + this.floorheight.AllowRelative = false; + this.floorheight.ImeMode = System.Windows.Forms.ImeMode.Off; + this.floorheight.Location = new System.Drawing.Point(112, 37); + this.floorheight.Name = "floorheight"; + this.floorheight.Size = new System.Drawing.Size(68, 20); + this.floorheight.TabIndex = 16; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(40, 40); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(66, 14); + label5.TabIndex = 17; + label5.Text = "Floor height:"; + label5.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // ceilingheight + // + this.ceilingheight.AllowNegative = false; + this.ceilingheight.AllowRelative = false; + this.ceilingheight.ImeMode = System.Windows.Forms.ImeMode.Off; + this.ceilingheight.Location = new System.Drawing.Point(112, 66); + this.ceilingheight.Name = "ceilingheight"; + this.ceilingheight.Size = new System.Drawing.Size(68, 20); + this.ceilingheight.TabIndex = 18; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new System.Drawing.Point(33, 69); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(73, 14); + label6.TabIndex = 19; + label6.Text = "Ceiling height:"; + label6.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label7 + // + label7.AutoSize = true; + label7.Location = new System.Drawing.Point(32, 99); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(74, 14); + label7.TabIndex = 20; + label7.Text = "Sector height:"; + label7.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // sectorheight + // + this.sectorheight.AutoSize = true; + this.sectorheight.Location = new System.Drawing.Point(113, 99); + this.sectorheight.Name = "sectorheight"; + this.sectorheight.Size = new System.Drawing.Size(13, 14); + this.sectorheight.TabIndex = 21; + this.sectorheight.Text = "0"; + // + // label8 + // + label8.AutoSize = true; + label8.Location = new System.Drawing.Point(44, 32); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(39, 14); + label8.TabIndex = 0; + label8.Text = "Effect:"; + // + // effect + // + this.effect.BackColor = System.Drawing.SystemColors.Control; + this.effect.Cursor = System.Windows.Forms.Cursors.Default; + this.effect.Empty = false; + this.effect.Location = new System.Drawing.Point(89, 28); + this.effect.Name = "effect"; + this.effect.Size = new System.Drawing.Size(326, 21); + this.effect.TabIndex = 1; + this.effect.Value = 402; + // + // label9 + // + label9.AutoSize = true; + label9.Location = new System.Drawing.Point(21, 66); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(62, 14); + label9.TabIndex = 2; + label9.Text = "Brightness:"; + // + // brightness + // + this.brightness.AllowNegative = false; + this.brightness.AllowRelative = false; + this.brightness.ImeMode = System.Windows.Forms.ImeMode.Off; + this.brightness.Location = new System.Drawing.Point(89, 63); + this.brightness.Name = "brightness"; + this.brightness.Size = new System.Drawing.Size(53, 20); + this.brightness.TabIndex = 17; + // + // tag + // + this.tag.AllowNegative = false; + this.tag.AllowRelative = true; + this.tag.ImeMode = System.Windows.Forms.ImeMode.Off; + this.tag.Location = new System.Drawing.Point(89, 28); + this.tag.Name = "tag"; + this.tag.Size = new System.Drawing.Size(53, 20); + this.tag.TabIndex = 10; + // + // taglabel + // + taglabel.AutoSize = true; + taglabel.Location = new System.Drawing.Point(55, 31); + taglabel.Name = "taglabel"; + taglabel.Size = new System.Drawing.Size(28, 14); + taglabel.TabIndex = 9; + taglabel.Text = "Tag:"; + // + // newtag + // + this.newtag.Location = new System.Drawing.Point(148, 27); + this.newtag.Name = "newtag"; + this.newtag.Size = new System.Drawing.Size(76, 23); + this.newtag.TabIndex = 11; + this.newtag.Text = "New Tag"; + this.newtag.UseVisualStyleBackColor = true; + // // SectorEditForm // this.AcceptButton = this.apply; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.CancelButton = this.cancel; - this.ClientSize = new System.Drawing.Size(489, 407); + this.ClientSize = new System.Drawing.Size(477, 458); + this.Controls.Add(this.tabs); this.Controls.Add(this.cancel); this.Controls.Add(this.apply); - this.Controls.Add(groupaction); - this.Controls.Add(groupeffect); - this.Controls.Add(groupfloorceiling); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; @@ -156,7 +414,15 @@ namespace CodeImp.DoomBuilder.Interface this.Opacity = 0; this.ShowInTaskbar = false; this.Text = "Edit Sector"; + groupaction.ResumeLayout(false); + groupaction.PerformLayout(); + groupeffect.ResumeLayout(false); + groupeffect.PerformLayout(); groupfloorceiling.ResumeLayout(false); + groupfloorceiling.PerformLayout(); + this.tabs.ResumeLayout(false); + this.tabproperties.ResumeLayout(false); + this.tabcustom.ResumeLayout(false); this.ResumeLayout(false); } @@ -165,7 +431,20 @@ namespace CodeImp.DoomBuilder.Interface private System.Windows.Forms.Button cancel; private System.Windows.Forms.Button apply; + private System.Windows.Forms.TabControl tabs; + private System.Windows.Forms.TabPage tabproperties; + private System.Windows.Forms.TabPage tabcustom; + private FlatSelectorControl floortex; + private FlatSelectorControl ceilingtex; private FlatSelectorControl flatSelectorControl2; private FlatSelectorControl flatSelectorControl1; + private FieldsEditorControl fieldslist; + private NumericTextbox ceilingheight; + private NumericTextbox floorheight; + private System.Windows.Forms.Label sectorheight; + private ActionSelectorControl effect; + private NumericTextbox brightness; + private NumericTextbox tag; + private System.Windows.Forms.Button newtag; } } \ No newline at end of file diff --git a/Source/Interface/SectorEditForm.resx b/Source/Interface/SectorEditForm.resx index a568963f..b9e62184 100644 --- a/Source/Interface/SectorEditForm.resx +++ b/Source/Interface/SectorEditForm.resx @@ -117,19 +117,196 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False + + True False - - False + + True - + False False + + True + + + True + + + True + + + False + + + True + + + False + + + True + + + True + + + True + + + False + + + True + + + True + + + False + + + False + + + True + + + True + + + True + + + False + + + True + + + False + + + True + + + True + + + False + + + True + + + True + + + False + + + True + + + False + + + True + + + True + + + True + + + False + + + True + + + False + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + False + + + True + + + True + + + False + + + True + + + False + + + True + + + True + + + True + + + False + + + True + + + True + \ No newline at end of file