Added a way to assign new tags, which finds a tag unused by current map element type.

This commit is contained in:
MaxED 2013-08-28 08:29:06 +00:00
parent a6ee7a5ca2
commit b84b613d4b
17 changed files with 152 additions and 112 deletions

View file

@ -17,6 +17,12 @@
</div> </div>
<div id="contents"> <div id="contents">
<h2><strong>New Tag vs. Unused Tag:</strong></h2>
<p><img src="tags_newlabel.jpg" /><br />
Two methods can be used to assign a new tag to a map element.<br />
Pressing &quot;<strong>New</strong>&quot; button will find a tag number, which is not used by any map element or any action argument, which expects a tag (classic Doom Builder 2 behaviour).<br />
Pressing "<strong>Unused</strong>" button will find a tag number, which is not used by any map element of current type (e.g. not used by any linedef in the map, if the button is pressed in Edit Linedefs form).</p>
<h2><strong>Tag support:</strong></h2> <h2><strong>Tag support:</strong></h2>
<table width="100%" border="0" cellspacing="3" cellpadding="3"> <table width="100%" border="0" cellspacing="3" cellpadding="3">
<tr> <tr>
@ -33,7 +39,7 @@
<h2><strong>Tag Labels</strong>:</h2> <h2><strong>Tag Labels</strong>:</h2>
<p>You can add labels to tags. This can be done in several ways:<br /> <p>You can add labels to tags. This can be done in several ways:<br />
1. If you type any text in the tag selector, then an unused tag number will be found, and your text will be assigned to it as a label (this won't work for action arguments). 1. If you type any text in the tag selector, then an unused tag number will be found, and your text will be assigned to it as a label (this won't work for action arguments).
<p><img src="tags_newlabel.jpg" alt="" width="435" height="75" /> <p><img src="tags_newlabel.jpg" />
<p>2. You can use the <strong>Tag statistics</strong> form to view all tags used in a map, and view and edit labels, if any are assigned to them: <p>2. You can use the <strong>Tag statistics</strong> form to view all tags used in a map, and view and edit labels, if any are assigned to them:
<p><img src="tags_view1.jpg" alt="" width="264" height="399" /><br /><br /><img src="tags_table.jpg" alt="" /> <p><img src="tags_view1.jpg" alt="" width="264" height="399" /><br /><br /><img src="tags_table.jpg" alt="" />
<p>Double-click on a value in the &quot;Label&quot; column to edit the tag label.<br /> <p>Double-click on a value in the &quot;Label&quot; column to edit the tag label.<br />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View file

@ -25,9 +25,12 @@
/// the contents of this method with the code editor. /// the contents of this method with the code editor.
/// </summary> /// </summary>
private void InitializeComponent() { private void InitializeComponent() {
this.components = new System.ComponentModel.Container();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.cbTagPicker = new System.Windows.Forms.ComboBox(); this.cbTagPicker = new System.Windows.Forms.ComboBox();
this.newTag = new System.Windows.Forms.Button(); this.newTag = new System.Windows.Forms.Button();
this.unusedTag = new System.Windows.Forms.Button();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
@ -41,28 +44,46 @@
// //
// cbTagPicker // cbTagPicker
// //
this.cbTagPicker.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cbTagPicker.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cbTagPicker.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
this.cbTagPicker.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cbTagPicker.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cbTagPicker.FormattingEnabled = true; this.cbTagPicker.FormattingEnabled = true;
this.cbTagPicker.Location = new System.Drawing.Point(42, 7); this.cbTagPicker.Location = new System.Drawing.Point(42, 7);
this.cbTagPicker.Name = "cbTagPicker"; this.cbTagPicker.Name = "cbTagPicker";
this.cbTagPicker.Size = new System.Drawing.Size(241, 21); this.cbTagPicker.Size = new System.Drawing.Size(190, 21);
this.cbTagPicker.TabIndex = 1; this.cbTagPicker.TabIndex = 1;
// //
// newTag // newTag
// //
this.newTag.Location = new System.Drawing.Point(289, 6); this.newTag.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.newTag.Location = new System.Drawing.Point(238, 6);
this.newTag.Name = "newTag"; this.newTag.Name = "newTag";
this.newTag.Size = new System.Drawing.Size(64, 23); this.newTag.Size = new System.Drawing.Size(54, 23);
this.newTag.TabIndex = 2; this.newTag.TabIndex = 2;
this.newTag.Text = "New Tag"; this.newTag.Text = "New";
this.toolTip1.SetToolTip(this.newTag, "Finds a tag, which is not used as a tag or tag action argument \r\nby any map eleme" +
"nt");
this.newTag.UseVisualStyleBackColor = true; this.newTag.UseVisualStyleBackColor = true;
this.newTag.Click += new System.EventHandler(this.newTag_Click); this.newTag.Click += new System.EventHandler(this.newTag_Click);
// //
// unusedTag
//
this.unusedTag.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.unusedTag.Location = new System.Drawing.Point(298, 6);
this.unusedTag.Name = "unusedTag";
this.unusedTag.Size = new System.Drawing.Size(54, 23);
this.unusedTag.TabIndex = 3;
this.unusedTag.Text = "Unused";
this.toolTip1.SetToolTip(this.unusedTag, "Finds a tag, which is not used as a tag \r\nby any map element of this type");
this.unusedTag.UseVisualStyleBackColor = true;
this.unusedTag.Click += new System.EventHandler(this.unusedTag_Click);
//
// TagSelector // TagSelector
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.unusedTag);
this.Controls.Add(this.newTag); this.Controls.Add(this.newTag);
this.Controls.Add(this.cbTagPicker); this.Controls.Add(this.cbTagPicker);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
@ -78,5 +99,7 @@
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cbTagPicker; private System.Windows.Forms.ComboBox cbTagPicker;
private System.Windows.Forms.Button newTag; private System.Windows.Forms.Button newTag;
private System.Windows.Forms.Button unusedTag;
private System.Windows.Forms.ToolTip toolTip1;
} }
} }

View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using CodeImp.DoomBuilder.Map; using CodeImp.DoomBuilder.Map;
using System.Globalization; using System.Globalization;
using CodeImp.DoomBuilder.Types;
namespace CodeImp.DoomBuilder.GZBuilder.Controls namespace CodeImp.DoomBuilder.GZBuilder.Controls
{ {
@ -36,14 +37,16 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
private List<TagInfo> infos; private List<TagInfo> infos;
private bool valid; private bool valid;
private int tag; private int tag;
private UniversalType elementType;
public TagSelector() { public TagSelector() {
InitializeComponent(); InitializeComponent();
} }
public void Setup() { public void Setup(UniversalType elementType) {
tags = new List<int>(); tags = new List<int>();
infos = new List<TagInfo>(); infos = new List<TagInfo>();
this.elementType = elementType;
//collect used tags from sectors... //collect used tags from sectors...
foreach(Sector s in General.Map.Map.Sectors) { foreach(Sector s in General.Map.Map.Sectors) {
@ -153,5 +156,12 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
cbTagPicker.Text = tag.ToString(); cbTagPicker.Text = tag.ToString();
valid = true; valid = true;
} }
private void unusedTag_Click(object sender, EventArgs e) {
tag = General.Map.Map.GetNewTag(elementType);
cbTagPicker.SelectedIndex = -1;
cbTagPicker.Text = tag.ToString();
valid = true;
}
} }
} }

View file

@ -117,4 +117,7 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root> </root>

View file

@ -2629,6 +2629,43 @@ namespace CodeImp.DoomBuilder.Map
return 0; return 0;
} }
//mxd
/// <summary>This returns the tag number, which is not used by any map element of given type. This method doesn't check action arguments!</summary>
public int GetNewTag(UniversalType elementType)
{
Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
switch(elementType) {
case UniversalType.ThingTag:
for(int i = 0; i < things.Length; i++) {
if(things[i].Tag > 0 && !usedtags.ContainsKey(things[i].Tag))
usedtags.Add(things[i].Tag, false);
}
break;
case UniversalType.LinedefTag:
for(int i = 0; i < linedefs.Length; i++) {
if(linedefs[i].Tag > 0 && !usedtags.ContainsKey(linedefs[i].Tag))
usedtags.Add(linedefs[i].Tag, false);
}
break;
case UniversalType.SectorTag:
for(int i = 0; i < sectors.Length; i++) {
if(sectors[i].Tag > 0 && !usedtags.ContainsKey(sectors[i].Tag))
usedtags.Add(sectors[i].Tag, false);
}
break;
}
// Now find the first unused index
for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
if(!usedtags.ContainsKey(i)) return i;
// All tags used!
return 0;
}
/// <summary>This returns the next unused tag number within the marked geometry.</summary> /// <summary>This returns the next unused tag number within the marked geometry.</summary>
public int GetNewTag(bool marked) public int GetNewTag(bool marked)
{ {

View file

@ -667,7 +667,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
this.tagSelector.Location = new System.Drawing.Point(6, 19); this.tagSelector.Location = new System.Drawing.Point(6, 19);
this.tagSelector.Name = "tagSelector"; this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(369, 35); this.tagSelector.Size = new System.Drawing.Size(444, 35);
this.tagSelector.TabIndex = 0; this.tagSelector.TabIndex = 0;
// //
// tabsidedefs // tabsidedefs

View file

@ -325,7 +325,7 @@ namespace CodeImp.DoomBuilder.Windows
action.Value = fl.Action; action.Value = fl.Action;
if(General.Map.FormatInterface.HasLinedefTag) {//mxd if(General.Map.FormatInterface.HasLinedefTag) {//mxd
tagSelector.Setup(); tagSelector.Setup(UniversalType.LinedefTag);
tagSelector.SetTag(fl.Tag); tagSelector.SetTag(fl.Tag);
} }

View file

@ -119,16 +119,16 @@ namespace CodeImp.DoomBuilder.Windows
this.effect.Cursor = System.Windows.Forms.Cursors.Default; this.effect.Cursor = System.Windows.Forms.Cursors.Default;
this.effect.Empty = false; this.effect.Empty = false;
this.effect.GeneralizedCategories = null; this.effect.GeneralizedCategories = null;
this.effect.Location = new System.Drawing.Point(89, 28); this.effect.Location = new System.Drawing.Point(61, 28);
this.effect.Name = "effect"; this.effect.Name = "effect";
this.effect.Size = new System.Drawing.Size(307, 21); this.effect.Size = new System.Drawing.Size(335, 21);
this.effect.TabIndex = 0; this.effect.TabIndex = 0;
this.effect.Value = 402; this.effect.Value = 402;
// //
// label8 // label8
// //
label8.AutoSize = true; label8.AutoSize = true;
label8.Location = new System.Drawing.Point(38, 31); label8.Location = new System.Drawing.Point(12, 31);
label8.Name = "label8"; label8.Name = "label8";
label8.Size = new System.Drawing.Size(45, 14); label8.Size = new System.Drawing.Size(45, 14);
label8.TabIndex = 0; label8.TabIndex = 0;
@ -136,9 +136,9 @@ namespace CodeImp.DoomBuilder.Windows
// //
// tagSelector // tagSelector
// //
this.tagSelector.Location = new System.Drawing.Point(47, 52); this.tagSelector.Location = new System.Drawing.Point(19, 52);
this.tagSelector.Name = "tagSelector"; this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(384, 34); this.tagSelector.Size = new System.Drawing.Size(414, 34);
this.tagSelector.TabIndex = 0; this.tagSelector.TabIndex = 0;
// //
// label9 // label9

View file

@ -117,7 +117,7 @@ namespace CodeImp.DoomBuilder.Windows
ceilingtex.TextureName = sc.CeilTexture; ceilingtex.TextureName = sc.CeilTexture;
// Action // Action
tagSelector.Setup(); //mxd tagSelector.Setup(UniversalType.SectorTag); //mxd
tagSelector.SetTag(sc.Tag);//mxd tagSelector.SetTag(sc.Tag);//mxd
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

View file

@ -132,9 +132,6 @@
<metadata name="groupeffect.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="groupeffect.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label8.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
@ -156,6 +153,18 @@
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="flatSelectorControl2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="flatSelectorControl2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>

View file

@ -54,6 +54,7 @@
this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl(); this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
this.tabSurfaces = new System.Windows.Forms.TabPage(); this.tabSurfaces = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.cbUseFloorLineAngles = new System.Windows.Forms.CheckBox();
this.floorAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl(); this.floorAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
@ -68,6 +69,7 @@
this.floorOffsets = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl(); this.floorOffsets = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.floortex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl(); this.floortex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.cbUseCeilLineAngles = new System.Windows.Forms.CheckBox();
this.ceilAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl(); this.ceilAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
@ -85,8 +87,6 @@
this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl(); this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
this.cancel = new System.Windows.Forms.Button(); this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button(); this.apply = new System.Windows.Forms.Button();
this.cbUseCeilLineAngles = new System.Windows.Forms.CheckBox();
this.cbUseFloorLineAngles = new System.Windows.Forms.CheckBox();
groupaction = new System.Windows.Forms.GroupBox(); groupaction = new System.Windows.Forms.GroupBox();
groupeffect = new System.Windows.Forms.GroupBox(); groupeffect = new System.Windows.Forms.GroupBox();
label14 = new System.Windows.Forms.Label(); label14 = new System.Windows.Forms.Label();
@ -125,7 +125,7 @@
// //
this.tagSelector.Location = new System.Drawing.Point(6, 21); this.tagSelector.Location = new System.Drawing.Point(6, 21);
this.tagSelector.Name = "tagSelector"; this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(369, 35); this.tagSelector.Size = new System.Drawing.Size(424, 35);
this.tagSelector.TabIndex = 0; this.tagSelector.TabIndex = 0;
// //
// groupeffect // groupeffect
@ -461,6 +461,18 @@
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "Floor:"; this.groupBox2.Text = "Floor:";
// //
// cbUseFloorLineAngles
//
this.cbUseFloorLineAngles.AutoSize = true;
this.cbUseFloorLineAngles.Location = new System.Drawing.Point(230, 119);
this.cbUseFloorLineAngles.Name = "cbUseFloorLineAngles";
this.cbUseFloorLineAngles.Size = new System.Drawing.Size(99, 18);
this.cbUseFloorLineAngles.TabIndex = 57;
this.cbUseFloorLineAngles.Tag = "";
this.cbUseFloorLineAngles.Text = "Use line angles";
this.cbUseFloorLineAngles.UseVisualStyleBackColor = true;
this.cbUseFloorLineAngles.CheckedChanged += new System.EventHandler(this.cbUseFloorLineAngles_CheckedChanged);
//
// floorAngleControl // floorAngleControl
// //
this.floorAngleControl.Angle = 0; this.floorAngleControl.Angle = 0;
@ -647,6 +659,18 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = " Ceiling:"; this.groupBox1.Text = " Ceiling:";
// //
// cbUseCeilLineAngles
//
this.cbUseCeilLineAngles.AutoSize = true;
this.cbUseCeilLineAngles.Location = new System.Drawing.Point(230, 119);
this.cbUseCeilLineAngles.Name = "cbUseCeilLineAngles";
this.cbUseCeilLineAngles.Size = new System.Drawing.Size(99, 18);
this.cbUseCeilLineAngles.TabIndex = 56;
this.cbUseCeilLineAngles.Tag = "";
this.cbUseCeilLineAngles.Text = "Use line angles";
this.cbUseCeilLineAngles.UseVisualStyleBackColor = true;
this.cbUseCeilLineAngles.CheckedChanged += new System.EventHandler(this.cbUseCeilLineAngles_CheckedChanged);
//
// ceilAngleControl // ceilAngleControl
// //
this.ceilAngleControl.Angle = 0; this.ceilAngleControl.Angle = 0;
@ -865,30 +889,6 @@
this.apply.UseVisualStyleBackColor = true; this.apply.UseVisualStyleBackColor = true;
this.apply.Click += new System.EventHandler(this.apply_Click); this.apply.Click += new System.EventHandler(this.apply_Click);
// //
// cbUseCeilLineAngles
//
this.cbUseCeilLineAngles.AutoSize = true;
this.cbUseCeilLineAngles.Location = new System.Drawing.Point(230, 119);
this.cbUseCeilLineAngles.Name = "cbUseCeilLineAngles";
this.cbUseCeilLineAngles.Size = new System.Drawing.Size(99, 18);
this.cbUseCeilLineAngles.TabIndex = 56;
this.cbUseCeilLineAngles.Tag = "";
this.cbUseCeilLineAngles.Text = "Use line angles";
this.cbUseCeilLineAngles.UseVisualStyleBackColor = true;
this.cbUseCeilLineAngles.CheckedChanged += new System.EventHandler(this.cbUseCeilLineAngles_CheckedChanged);
//
// cbUseFloorLineAngles
//
this.cbUseFloorLineAngles.AutoSize = true;
this.cbUseFloorLineAngles.Location = new System.Drawing.Point(230, 119);
this.cbUseFloorLineAngles.Name = "cbUseFloorLineAngles";
this.cbUseFloorLineAngles.Size = new System.Drawing.Size(99, 18);
this.cbUseFloorLineAngles.TabIndex = 57;
this.cbUseFloorLineAngles.Tag = "";
this.cbUseFloorLineAngles.Text = "Use line angles";
this.cbUseFloorLineAngles.UseVisualStyleBackColor = true;
this.cbUseFloorLineAngles.CheckedChanged += new System.EventHandler(this.cbUseFloorLineAngles_CheckedChanged);
//
// SectorEditFormUDMF // SectorEditFormUDMF
// //
this.AcceptButton = this.apply; this.AcceptButton = this.apply;

View file

@ -211,7 +211,7 @@ namespace CodeImp.DoomBuilder.Windows
lightColor.SetValueFrom(sc.Fields); lightColor.SetValueFrom(sc.Fields);
// Action // Action
tagSelector.Setup(); //mxd tagSelector.Setup(UniversalType.SectorTag); //mxd
tagSelector.SetTag(sc.Tag);//mxd tagSelector.SetTag(sc.Tag);//mxd
// Custom fields // Custom fields

View file

@ -138,21 +138,6 @@
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
@ -162,12 +147,6 @@
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -177,7 +156,4 @@
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

View file

@ -597,7 +597,7 @@ namespace CodeImp.DoomBuilder.Windows
this.conversationID.AllowRelative = false; this.conversationID.AllowRelative = false;
this.conversationID.ButtonStep = 1; this.conversationID.ButtonStep = 1;
this.conversationID.ButtonStepFloat = 1F; this.conversationID.ButtonStepFloat = 1F;
this.conversationID.Location = new System.Drawing.Point(493, 26); this.conversationID.Location = new System.Drawing.Point(548, 26);
this.conversationID.Name = "conversationID"; this.conversationID.Name = "conversationID";
this.conversationID.Size = new System.Drawing.Size(72, 24); this.conversationID.Size = new System.Drawing.Size(72, 24);
this.conversationID.StepValues = null; this.conversationID.StepValues = null;
@ -606,7 +606,7 @@ namespace CodeImp.DoomBuilder.Windows
// labelID // labelID
// //
this.labelID.AutoSize = true; this.labelID.AutoSize = true;
this.labelID.Location = new System.Drawing.Point(401, 31); this.labelID.Location = new System.Drawing.Point(456, 31);
this.labelID.Name = "labelID"; this.labelID.Name = "labelID";
this.labelID.Size = new System.Drawing.Size(86, 14); this.labelID.Size = new System.Drawing.Size(86, 14);
this.labelID.TabIndex = 10; this.labelID.TabIndex = 10;
@ -616,7 +616,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
this.tagSelector.Location = new System.Drawing.Point(6, 19); this.tagSelector.Location = new System.Drawing.Point(6, 19);
this.tagSelector.Name = "tagSelector"; this.tagSelector.Name = "tagSelector";
this.tagSelector.Size = new System.Drawing.Size(369, 35); this.tagSelector.Size = new System.Drawing.Size(430, 35);
this.tagSelector.TabIndex = 8; this.tagSelector.TabIndex = 8;
// //
// tabcustom // tabcustom

View file

@ -198,7 +198,7 @@ namespace CodeImp.DoomBuilder.Windows
// Action/tags // Action/tags
action.Value = ft.Action; action.Value = ft.Action;
if(General.Map.FormatInterface.HasThingTag) {//mxd if(General.Map.FormatInterface.HasThingTag) {//mxd
tagSelector.Setup(); tagSelector.Setup(UniversalType.ThingTag);
tagSelector.SetTag(ft.Tag); tagSelector.SetTag(ft.Tag);
} }
arg0.SetValue(ft.Args[0]); arg0.SetValue(ft.Args[0]);

View file

@ -138,6 +138,21 @@
<metadata name="actiongroup.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="actiongroup.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="doompanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -147,43 +162,4 @@
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="actiongroup.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="doompanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="doompanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>