Added a label to the Thing info panel that shows the full Thing type.

This commit is contained in:
MascaraSnake 2016-03-01 22:10:20 +01:00
parent 427c4df8a7
commit f54f193332
2 changed files with 31 additions and 4 deletions

View file

@ -33,6 +33,7 @@ namespace CodeImp.DoomBuilder.Controls
System.Windows.Forms.Label label3; System.Windows.Forms.Label label3;
System.Windows.Forms.Label label1; System.Windows.Forms.Label label1;
this.labelaction = new System.Windows.Forms.Label(); this.labelaction = new System.Windows.Forms.Label();
this.labelfulltype = new System.Windows.Forms.Label();
this.infopanel = new System.Windows.Forms.GroupBox(); this.infopanel = new System.Windows.Forms.GroupBox();
this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl(); this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.classname = new System.Windows.Forms.Label(); this.classname = new System.Windows.Forms.Label();
@ -53,6 +54,7 @@ namespace CodeImp.DoomBuilder.Controls
this.tag = new System.Windows.Forms.Label(); this.tag = new System.Windows.Forms.Label();
this.position = new System.Windows.Forms.Label(); this.position = new System.Windows.Forms.Label();
this.action = new System.Windows.Forms.Label(); this.action = new System.Windows.Forms.Label();
this.fulltype = new System.Windows.Forms.Label();
this.type = new System.Windows.Forms.Label(); this.type = new System.Windows.Forms.Label();
this.spritepanel = new System.Windows.Forms.GroupBox(); this.spritepanel = new System.Windows.Forms.GroupBox();
this.spritename = new System.Windows.Forms.Label(); this.spritename = new System.Windows.Forms.Label();
@ -116,6 +118,15 @@ namespace CodeImp.DoomBuilder.Controls
this.labelaction.TabIndex = 2; this.labelaction.TabIndex = 2;
this.labelaction.Text = "Action:"; this.labelaction.Text = "Action:";
// //
// labelfulltype
//
this.labelfulltype.AutoSize = true;
this.labelfulltype.Location = new System.Drawing.Point(8, 49);
this.labelfulltype.Name = "labelfulltype";
this.labelfulltype.Size = new System.Drawing.Size(49, 13);
this.labelfulltype.TabIndex = 2;
this.labelfulltype.Text = "Full type:";
//
// infopanel // infopanel
// //
this.infopanel.Controls.Add(this.anglecontrol); this.infopanel.Controls.Add(this.anglecontrol);
@ -138,9 +149,11 @@ namespace CodeImp.DoomBuilder.Controls
this.infopanel.Controls.Add(this.tag); this.infopanel.Controls.Add(this.tag);
this.infopanel.Controls.Add(this.position); this.infopanel.Controls.Add(this.position);
this.infopanel.Controls.Add(this.action); this.infopanel.Controls.Add(this.action);
this.infopanel.Controls.Add(this.fulltype);
this.infopanel.Controls.Add(label4); this.infopanel.Controls.Add(label4);
this.infopanel.Controls.Add(label3); this.infopanel.Controls.Add(label3);
this.infopanel.Controls.Add(this.labelaction); this.infopanel.Controls.Add(this.labelaction);
this.infopanel.Controls.Add(this.labelfulltype);
this.infopanel.Controls.Add(this.type); this.infopanel.Controls.Add(this.type);
this.infopanel.Controls.Add(label1); this.infopanel.Controls.Add(label1);
this.infopanel.Location = new System.Drawing.Point(0, 0); this.infopanel.Location = new System.Drawing.Point(0, 0);
@ -331,6 +344,15 @@ namespace CodeImp.DoomBuilder.Controls
this.action.TabIndex = 5; this.action.TabIndex = 5;
this.action.Text = "0 - Spawn a Blue Poopie and Ammo"; this.action.Text = "0 - Spawn a Blue Poopie and Ammo";
// //
// fulltype
//
this.fulltype.AutoEllipsis = true;
this.fulltype.Location = new System.Drawing.Point(62, 49);
this.fulltype.Name = "fulltype";
this.fulltype.Size = new System.Drawing.Size(210, 14);
this.fulltype.TabIndex = 5;
this.fulltype.Text = "0";
//
// type // type
// //
this.type.AutoSize = true; this.type.AutoSize = true;
@ -442,6 +464,7 @@ namespace CodeImp.DoomBuilder.Controls
private System.Windows.Forms.Label tag; private System.Windows.Forms.Label tag;
private System.Windows.Forms.Label position; private System.Windows.Forms.Label position;
private System.Windows.Forms.Label action; private System.Windows.Forms.Label action;
private System.Windows.Forms.Label fulltype;
private System.Windows.Forms.Label type; private System.Windows.Forms.Label type;
private System.Windows.Forms.Label arg5; private System.Windows.Forms.Label arg5;
private System.Windows.Forms.Label arglbl5; private System.Windows.Forms.Label arglbl5;
@ -457,6 +480,7 @@ namespace CodeImp.DoomBuilder.Controls
private System.Windows.Forms.GroupBox flagsPanel; private System.Windows.Forms.GroupBox flagsPanel;
private System.Windows.Forms.ListView flags; private System.Windows.Forms.ListView flags;
private System.Windows.Forms.Label labelaction; private System.Windows.Forms.Label labelaction;
private System.Windows.Forms.Label labelfulltype;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol; private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
private ConfigurablePictureBox spritetex; private ConfigurablePictureBox spritetex;
private System.Windows.Forms.Label classname; private System.Windows.Forms.Label classname;

View file

@ -65,11 +65,13 @@ namespace CodeImp.DoomBuilder.Controls
infopanel.Width = (hasArgs ? hexenformatwidth : doomformatwidth); infopanel.Width = (hasArgs ? hexenformatwidth : doomformatwidth);
//mxd //mxd
action.Visible = General.Map.FormatInterface.HasThingAction; action.Visible = !General.Map.SRB2 && General.Map.FormatInterface.HasThingAction;
labelaction.Visible = General.Map.FormatInterface.HasThingAction; labelaction.Visible = !General.Map.SRB2 && General.Map.FormatInterface.HasThingAction;
fulltype.Visible = General.Map.SRB2 && !General.Map.FormatInterface.HasThingAction;
labelfulltype.Visible = General.Map.SRB2 && !General.Map.FormatInterface.HasThingAction;
// Move panel // Move panel
spritepanel.Left = infopanel.Left + infopanel.Width + infopanel.Margin.Right + spritepanel.Margin.Left; spritepanel.Left = infopanel.Left + infopanel.Width + infopanel.Margin.Right + spritepanel.Margin.Left;
flagsPanel.Left = spritepanel.Left + spritepanel.Width + spritepanel.Margin.Right + flagsPanel.Margin.Left; //mxd flagsPanel.Left = spritepanel.Left + spritepanel.Width + spritepanel.Margin.Right + flagsPanel.Margin.Left; //mxd
// Lookup thing info // Lookup thing info
@ -114,6 +116,7 @@ namespace CodeImp.DoomBuilder.Controls
classname.Enabled = displayclassname; //mxd classname.Enabled = displayclassname; //mxd
classname.Text = (displayclassname ? ti.ClassName : "--"); //mxd classname.Text = (displayclassname ? ti.ClassName : "--"); //mxd
parameter.Text = t.Parameter.ToString(CultureInfo.InvariantCulture); parameter.Text = t.Parameter.ToString(CultureInfo.InvariantCulture);
fulltype.Text = t.FullType.ToString(CultureInfo.InvariantCulture);
position.Text = t.Position.x.ToString(CultureInfo.InvariantCulture) + ", " + t.Position.y.ToString(CultureInfo.InvariantCulture) + ", " + zinfo; position.Text = t.Position.x.ToString(CultureInfo.InvariantCulture) + ", " + t.Position.y.ToString(CultureInfo.InvariantCulture) + ", " + zinfo;
tag.Text = t.Tag + (General.Map.Options.TagLabels.ContainsKey(t.Tag) ? " - " + General.Map.Options.TagLabels[t.Tag] : string.Empty); tag.Text = t.Tag + (General.Map.Options.TagLabels.ContainsKey(t.Tag) ? " - " + General.Map.Options.TagLabels[t.Tag] : string.Empty);
angle.Text = t.AngleDoom + "\u00B0"; angle.Text = t.AngleDoom + "\u00B0";