Merge pull request #124 from Lucas7yoshi/add/entity-index-display

Project Form display entity indexes option
This commit is contained in:
dexyfex 2021-11-10 00:37:34 +11:00 committed by GitHub
commit 07fa8e6e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 63 additions and 26 deletions

View File

@ -233,6 +233,9 @@ namespace CodeWalker.Project.Panels
TreeNode tn = ProjectForm.ProjectExplorer?.FindEntityTreeNode(CurrentEntity); TreeNode tn = ProjectForm.ProjectExplorer?.FindEntityTreeNode(CurrentEntity);
if (tn != null) if (tn != null)
{ {
if (ProjectForm.displayentityindexes)
tn.Text = $"[{tn.Index}] {name}";
else
tn.Text = name; tn.Text = name;
} }
else else
@ -240,6 +243,9 @@ namespace CodeWalker.Project.Panels
tn = ProjectForm.ProjectExplorer?.FindMloEntityTreeNode(CurrentMCEntity); tn = ProjectForm.ProjectExplorer?.FindMloEntityTreeNode(CurrentMCEntity);
if (tn != null) if (tn != null)
{ {
if (ProjectForm.displayentityindexes)
tn.Text = $"[{tn.Index}] {name}";
else
tn.Text = name; tn.Text = name;
} }
} }

View File

@ -238,7 +238,12 @@ namespace CodeWalker.Project.Panels
{ {
var ent = ents[i]; var ent = ents[i];
var edef = ent.CEntityDef; var edef = ent.CEntityDef;
var enode = entsnode.Nodes.Add(edef.archetypeName.ToString()); TreeNode enode;
if (ProjectForm.displayentityindexes)
enode = entsnode.Nodes.Add($"[{i}] {edef.archetypeName}");
else
enode = entsnode.Nodes.Add(edef.archetypeName.ToString());
enode.Tag = ent; enode.Tag = ent;
} }
} }

View File

@ -174,6 +174,9 @@
this.OptionsMenu = new System.Windows.Forms.ToolStripMenuItem(); this.OptionsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsRenderGtavMapMenu = new System.Windows.Forms.ToolStripMenuItem(); this.OptionsRenderGtavMapMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsRenderProjectItemsMenu = new System.Windows.Forms.ToolStripMenuItem(); this.OptionsRenderProjectItemsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator();
this.OptionsAutoCalcYmapFlagsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsAutoCalcYmapExtentsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MainDockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); this.MainDockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel();
this.VSExtender = new WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender(this.components); this.VSExtender = new WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender(this.components);
this.SaveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.SaveFileDialog = new System.Windows.Forms.SaveFileDialog();
@ -202,9 +205,8 @@
this.ToolbarSaveButton = new System.Windows.Forms.ToolStripButton(); this.ToolbarSaveButton = new System.Windows.Forms.ToolStripButton();
this.ToolbarSaveAllButton = new System.Windows.Forms.ToolStripButton(); this.ToolbarSaveAllButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator(); this.OptionsDisplayEntityIndexesMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsAutoCalcYmapFlagsMenu = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator();
this.OptionsAutoCalcYmapExtentsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MainMenu.SuspendLayout(); this.MainMenu.SuspendLayout();
this.MainToolbar.SuspendLayout(); this.MainToolbar.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -1361,7 +1363,9 @@
this.OptionsRenderProjectItemsMenu, this.OptionsRenderProjectItemsMenu,
this.toolStripSeparator27, this.toolStripSeparator27,
this.OptionsAutoCalcYmapFlagsMenu, this.OptionsAutoCalcYmapFlagsMenu,
this.OptionsAutoCalcYmapExtentsMenu}); this.OptionsAutoCalcYmapExtentsMenu,
this.toolStripSeparator28,
this.OptionsDisplayEntityIndexesMenu});
this.OptionsMenu.Name = "OptionsMenu"; this.OptionsMenu.Name = "OptionsMenu";
this.OptionsMenu.Size = new System.Drawing.Size(61, 20); this.OptionsMenu.Size = new System.Drawing.Size(61, 20);
this.OptionsMenu.Text = "Options"; this.OptionsMenu.Text = "Options";
@ -1384,6 +1388,29 @@
this.OptionsRenderProjectItemsMenu.Text = "Render Project Items"; this.OptionsRenderProjectItemsMenu.Text = "Render Project Items";
this.OptionsRenderProjectItemsMenu.Click += new System.EventHandler(this.OptionsRenderProjectItemsMenu_Click); this.OptionsRenderProjectItemsMenu.Click += new System.EventHandler(this.OptionsRenderProjectItemsMenu_Click);
// //
// toolStripSeparator27
//
this.toolStripSeparator27.Name = "toolStripSeparator27";
this.toolStripSeparator27.Size = new System.Drawing.Size(223, 6);
//
// OptionsAutoCalcYmapFlagsMenu
//
this.OptionsAutoCalcYmapFlagsMenu.Checked = true;
this.OptionsAutoCalcYmapFlagsMenu.CheckState = System.Windows.Forms.CheckState.Checked;
this.OptionsAutoCalcYmapFlagsMenu.Name = "OptionsAutoCalcYmapFlagsMenu";
this.OptionsAutoCalcYmapFlagsMenu.Size = new System.Drawing.Size(226, 22);
this.OptionsAutoCalcYmapFlagsMenu.Text = "Auto Calculate Ymap Flags";
this.OptionsAutoCalcYmapFlagsMenu.Click += new System.EventHandler(this.OptionsAutoCalcYmapFlagsMenu_Click);
//
// OptionsAutoCalcYmapExtentsMenu
//
this.OptionsAutoCalcYmapExtentsMenu.Checked = true;
this.OptionsAutoCalcYmapExtentsMenu.CheckState = System.Windows.Forms.CheckState.Checked;
this.OptionsAutoCalcYmapExtentsMenu.Name = "OptionsAutoCalcYmapExtentsMenu";
this.OptionsAutoCalcYmapExtentsMenu.Size = new System.Drawing.Size(226, 22);
this.OptionsAutoCalcYmapExtentsMenu.Text = "Auto Calculate Ymap Extents";
this.OptionsAutoCalcYmapExtentsMenu.Click += new System.EventHandler(this.OptionsAutoCalcYmapExtentsMenu_Click);
//
// MainDockPanel // MainDockPanel
// //
this.MainDockPanel.BackColor = System.Drawing.SystemColors.AppWorkspace; this.MainDockPanel.BackColor = System.Drawing.SystemColors.AppWorkspace;
@ -1610,28 +1637,17 @@
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
// //
// toolStripSeparator27 // OptionsDisplayEntityIndexesMenu
// //
this.toolStripSeparator27.Name = "toolStripSeparator27"; this.OptionsDisplayEntityIndexesMenu.Name = "OptionsDisplayEntityIndexesMenu";
this.toolStripSeparator27.Size = new System.Drawing.Size(223, 6); this.OptionsDisplayEntityIndexesMenu.Size = new System.Drawing.Size(226, 22);
this.OptionsDisplayEntityIndexesMenu.Text = "Display Entity Indexes";
this.OptionsDisplayEntityIndexesMenu.Click += new System.EventHandler(this.OptionsDisplayEntityIndexesMenu_Click);
// //
// OptionsAutoCalcYmapFlagsMenu // toolStripSeparator28
// //
this.OptionsAutoCalcYmapFlagsMenu.Checked = true; this.toolStripSeparator28.Name = "toolStripSeparator28";
this.OptionsAutoCalcYmapFlagsMenu.CheckState = System.Windows.Forms.CheckState.Checked; this.toolStripSeparator28.Size = new System.Drawing.Size(223, 6);
this.OptionsAutoCalcYmapFlagsMenu.Name = "OptionsAutoCalcYmapFlagsMenu";
this.OptionsAutoCalcYmapFlagsMenu.Size = new System.Drawing.Size(226, 22);
this.OptionsAutoCalcYmapFlagsMenu.Text = "Auto Calculate Ymap Flags";
this.OptionsAutoCalcYmapFlagsMenu.Click += new System.EventHandler(this.OptionsAutoCalcYmapFlagsMenu_Click);
//
// OptionsAutoCalcYmapExtentsMenu
//
this.OptionsAutoCalcYmapExtentsMenu.Checked = true;
this.OptionsAutoCalcYmapExtentsMenu.CheckState = System.Windows.Forms.CheckState.Checked;
this.OptionsAutoCalcYmapExtentsMenu.Name = "OptionsAutoCalcYmapExtentsMenu";
this.OptionsAutoCalcYmapExtentsMenu.Size = new System.Drawing.Size(226, 22);
this.OptionsAutoCalcYmapExtentsMenu.Text = "Auto Calculate Ymap Extents";
this.OptionsAutoCalcYmapExtentsMenu.Click += new System.EventHandler(this.OptionsAutoCalcYmapExtentsMenu_Click);
// //
// ProjectForm // ProjectForm
// //
@ -1834,5 +1850,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator27; private System.Windows.Forms.ToolStripSeparator toolStripSeparator27;
private System.Windows.Forms.ToolStripMenuItem OptionsAutoCalcYmapFlagsMenu; private System.Windows.Forms.ToolStripMenuItem OptionsAutoCalcYmapFlagsMenu;
private System.Windows.Forms.ToolStripMenuItem OptionsAutoCalcYmapExtentsMenu; private System.Windows.Forms.ToolStripMenuItem OptionsAutoCalcYmapExtentsMenu;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator28;
private System.Windows.Forms.ToolStripMenuItem OptionsDisplayEntityIndexesMenu;
} }
} }

View File

@ -88,6 +88,7 @@ namespace CodeWalker.Project
private bool hidegtavmap = false; private bool hidegtavmap = false;
private bool autoymapflags = true; private bool autoymapflags = true;
private bool autoymapextents = true; private bool autoymapextents = true;
public bool displayentityindexes = false;
private object projectsyncroot = new object(); private object projectsyncroot = new object();
public object ProjectSyncRoot { get { return projectsyncroot; } } public object ProjectSyncRoot { get { return projectsyncroot; } }
@ -9441,6 +9442,13 @@ namespace CodeWalker.Project
autoymapextents = OptionsAutoCalcYmapExtentsMenu.Checked; autoymapextents = OptionsAutoCalcYmapExtentsMenu.Checked;
} }
private void OptionsDisplayEntityIndexesMenu_Click(object sender, EventArgs e)
{
OptionsDisplayEntityIndexesMenu.Checked = !OptionsDisplayEntityIndexesMenu.Checked;
displayentityindexes = OptionsDisplayEntityIndexesMenu.Checked;
ProjectExplorer?.LoadProjectTree(CurrentProjectFile);
}
private void ToolbarNewButton_ButtonClick(object sender, EventArgs e) private void ToolbarNewButton_ButtonClick(object sender, EventArgs e)
{ {
if (CurrentProjectFile == null) if (CurrentProjectFile == null)