This commit is contained in:
Perfare 2018-08-05 05:25:26 +08:00
parent 959a1a65b9
commit 114073f359
2 changed files with 14 additions and 14 deletions

View File

@ -59,7 +59,7 @@
this.exportFilteredAssetsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportFilteredAssetsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.showTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.filterTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.allToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.allToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.debugMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.buildClassStructuresMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buildClassStructuresMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -140,7 +140,7 @@
this.optionsToolStripMenuItem, this.optionsToolStripMenuItem,
this.modelToolStripMenuItem, this.modelToolStripMenuItem,
this.exportToolStripMenuItem, this.exportToolStripMenuItem,
this.showTypeToolStripMenuItem, this.filterTypeToolStripMenuItem,
this.debugMenuItem}); this.debugMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
@ -385,11 +385,11 @@
// //
// showTypeToolStripMenuItem // showTypeToolStripMenuItem
// //
this.showTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.filterTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.allToolStripMenuItem}); this.allToolStripMenuItem});
this.showTypeToolStripMenuItem.Name = "showTypeToolStripMenuItem"; this.filterTypeToolStripMenuItem.Name = "showTypeToolStripMenuItem";
this.showTypeToolStripMenuItem.Size = new System.Drawing.Size(83, 21); this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(83, 21);
this.showTypeToolStripMenuItem.Text = "Show Type"; this.filterTypeToolStripMenuItem.Text = "Filter Type";
// //
// allToolStripMenuItem // allToolStripMenuItem
// //
@ -1067,7 +1067,7 @@
private System.Windows.Forms.ToolStripMenuItem exportAnimatorwithselectedAnimationClipMenuItem; private System.Windows.Forms.ToolStripMenuItem exportAnimatorwithselectedAnimationClipMenuItem;
private System.Windows.Forms.ToolStripMenuItem exportobjectswithselectedAnimationClipMenuItem; private System.Windows.Forms.ToolStripMenuItem exportobjectswithselectedAnimationClipMenuItem;
private System.Windows.Forms.ToolStripMenuItem exportSelectedAssetsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportSelectedAssetsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem showTypeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem filterTypeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem allToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem allToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem exportSelectedObjectsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportSelectedObjectsToolStripMenuItem;

View File

@ -224,7 +224,7 @@ namespace AssetStudio
Text = type.ToString() Text = type.ToString()
}; };
typeItem.Click += typeToolStripMenuItem_Click; typeItem.Click += typeToolStripMenuItem_Click;
showTypeToolStripMenuItem.DropDownItems.Add(typeItem); filterTypeToolStripMenuItem.DropDownItems.Add(typeItem);
} }
allToolStripMenuItem.Checked = true; allToolStripMenuItem.Checked = true;
StatusStripUpdate($"Finished loading {assetsfileList.Count} files with {assetListView.Items.Count} exportable assets."); StatusStripUpdate($"Finished loading {assetsfileList.Count} files with {assetListView.Items.Count} exportable assets.");
@ -241,9 +241,9 @@ namespace AssetStudio
} }
else if (allToolStripMenuItem.Checked) else if (allToolStripMenuItem.Checked)
{ {
for (var i = 1; i < showTypeToolStripMenuItem.DropDownItems.Count; i++) for (var i = 1; i < filterTypeToolStripMenuItem.DropDownItems.Count; i++)
{ {
var item = (ToolStripMenuItem)showTypeToolStripMenuItem.DropDownItems[i]; var item = (ToolStripMenuItem)filterTypeToolStripMenuItem.DropDownItems[i];
item.Checked = false; item.Checked = false;
} }
} }
@ -1685,10 +1685,10 @@ namespace AssetStudio
enableFiltering = false; enableFiltering = false;
listSearch.Text = " Filter "; listSearch.Text = " Filter ";
var count = showTypeToolStripMenuItem.DropDownItems.Count; var count = filterTypeToolStripMenuItem.DropDownItems.Count;
for (var i = 1; i < count; i++) for (var i = 1; i < count; i++)
{ {
showTypeToolStripMenuItem.DropDownItems.RemoveAt(1); filterTypeToolStripMenuItem.DropDownItems.RemoveAt(1);
} }
FMODreset(); FMODreset();
@ -1857,9 +1857,9 @@ namespace AssetStudio
var show = new List<ClassIDReference>(); var show = new List<ClassIDReference>();
if (!allToolStripMenuItem.Checked) if (!allToolStripMenuItem.Checked)
{ {
for (var i = 1; i < showTypeToolStripMenuItem.DropDownItems.Count; i++) for (var i = 1; i < filterTypeToolStripMenuItem.DropDownItems.Count; i++)
{ {
var item = (ToolStripMenuItem)showTypeToolStripMenuItem.DropDownItems[i]; var item = (ToolStripMenuItem)filterTypeToolStripMenuItem.DropDownItems[i];
if (item.Checked) if (item.Checked)
{ {
show.Add((ClassIDReference)Enum.Parse(typeof(ClassIDReference), item.Text)); show.Add((ClassIDReference)Enum.Parse(typeof(ClassIDReference), item.Text));