diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs index cdceb07..56981f8 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs @@ -71,13 +71,14 @@ this.allToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buildClassStructuresMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dontLoadAssetsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dontBuildAssetListMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dontBuildHierarchyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.exportClassStructuresMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.sceneTreeView = new AssetStudioGUI.GOHierarchy(); this.treeSearch = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.assetListView = new System.Windows.Forms.ListView(); @@ -85,6 +86,10 @@ this.columnHeaderType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeaderSize = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.listSearch = new System.Windows.Forms.TextBox(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.classesListView = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.progressbarPanel = new System.Windows.Forms.Panel(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.previewPanel = new System.Windows.Forms.Panel(); @@ -107,10 +112,6 @@ this.classTextBox = new System.Windows.Forms.TextBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.classesListView = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.timer = new System.Windows.Forms.Timer(this.components); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); @@ -119,7 +120,6 @@ this.exportAnimatorwithselectedAnimationClipMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.jumpToSceneHierarchyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.sceneTreeView = new AssetStudioGUI.GOHierarchy(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -128,6 +128,7 @@ this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); this.progressbarPanel.SuspendLayout(); this.previewPanel.SuspendLayout(); this.FMODpanel.SuspendLayout(); @@ -135,7 +136,6 @@ ((System.ComponentModel.ISupportInitialize)(this.FMODvolumeBar)).BeginInit(); this.classPreviewPanel.SuspendLayout(); this.statusStrip1.SuspendLayout(); - this.tabPage3.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -169,33 +169,33 @@ // loadFileToolStripMenuItem // this.loadFileToolStripMenuItem.Name = "loadFileToolStripMenuItem"; - this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.loadFileToolStripMenuItem.Text = "Load file"; this.loadFileToolStripMenuItem.Click += new System.EventHandler(this.loadFile_Click); // // loadFolderToolStripMenuItem // this.loadFolderToolStripMenuItem.Name = "loadFolderToolStripMenuItem"; - this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.loadFolderToolStripMenuItem.Text = "Load folder"; this.loadFolderToolStripMenuItem.Click += new System.EventHandler(this.loadFolder_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(151, 6); // // extractFileToolStripMenuItem // this.extractFileToolStripMenuItem.Name = "extractFileToolStripMenuItem"; - this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.extractFileToolStripMenuItem.Text = "Extract file"; this.extractFileToolStripMenuItem.Click += new System.EventHandler(this.extractFileToolStripMenuItem_Click); // // extractFolderToolStripMenuItem // this.extractFolderToolStripMenuItem.Name = "extractFolderToolStripMenuItem"; - this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.extractFolderToolStripMenuItem.Text = "Extract folder"; this.extractFolderToolStripMenuItem.Click += new System.EventHandler(this.extractFolderToolStripMenuItem_Click); // @@ -435,21 +435,21 @@ // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(165, 22); this.toolStripMenuItem7.Text = "All assets"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); // // toolStripMenuItem8 // this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(165, 22); this.toolStripMenuItem8.Text = "Selected assets"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // // toolStripMenuItem9 // this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(165, 22); this.toolStripMenuItem9.Text = "Filtered assets"; this.toolStripMenuItem9.Click += new System.EventHandler(this.toolStripMenuItem9_Click); // @@ -467,7 +467,7 @@ this.allToolStripMenuItem.CheckOnClick = true; this.allToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.allToolStripMenuItem.Name = "allToolStripMenuItem"; - this.allToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.allToolStripMenuItem.Size = new System.Drawing.Size(90, 22); this.allToolStripMenuItem.Text = "All"; this.allToolStripMenuItem.Click += new System.EventHandler(this.typeToolStripMenuItem_Click); // @@ -475,14 +475,13 @@ // this.debugMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buildClassStructuresMenuItem, - this.dontLoadAssetsMenuItem, + this.dontBuildAssetListMenuItem, this.dontBuildHierarchyMenuItem, this.toolStripSeparator2, this.exportClassStructuresMenuItem}); this.debugMenuItem.Name = "debugMenuItem"; this.debugMenuItem.Size = new System.Drawing.Size(59, 21); this.debugMenuItem.Text = "Debug"; - this.debugMenuItem.Visible = false; // // buildClassStructuresMenuItem // @@ -491,13 +490,13 @@ this.buildClassStructuresMenuItem.Size = new System.Drawing.Size(224, 22); this.buildClassStructuresMenuItem.Text = "Build class structures"; // - // dontLoadAssetsMenuItem + // dontBuildAssetListMenuItem // - this.dontLoadAssetsMenuItem.CheckOnClick = true; - this.dontLoadAssetsMenuItem.Name = "dontLoadAssetsMenuItem"; - this.dontLoadAssetsMenuItem.Size = new System.Drawing.Size(224, 22); - this.dontLoadAssetsMenuItem.Text = "Don\'t load assets"; - this.dontLoadAssetsMenuItem.CheckedChanged += new System.EventHandler(this.dontLoadAssetsMenuItem_CheckedChanged); + this.dontBuildAssetListMenuItem.CheckOnClick = true; + this.dontBuildAssetListMenuItem.Name = "dontBuildAssetListMenuItem"; + this.dontBuildAssetListMenuItem.Size = new System.Drawing.Size(224, 22); + this.dontBuildAssetListMenuItem.Text = "Don\'t build asset list"; + this.dontBuildAssetListMenuItem.CheckedChanged += new System.EventHandler(this.dontBuildAssetListMenuItem_CheckedChanged); // // dontBuildHierarchyMenuItem // @@ -546,6 +545,7 @@ // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; @@ -567,6 +567,17 @@ this.tabPage1.Text = "Scene Hierarchy"; this.tabPage1.UseVisualStyleBackColor = true; // + // sceneTreeView + // + this.sceneTreeView.CheckBoxes = true; + this.sceneTreeView.Dock = System.Windows.Forms.DockStyle.Fill; + this.sceneTreeView.HideSelection = false; + this.sceneTreeView.Location = new System.Drawing.Point(0, 21); + this.sceneTreeView.Name = "sceneTreeView"; + this.sceneTreeView.Size = new System.Drawing.Size(410, 587); + this.sceneTreeView.TabIndex = 1; + this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck); + // // treeSearch // this.treeSearch.Dock = System.Windows.Forms.DockStyle.Top; @@ -644,6 +655,44 @@ this.listSearch.Enter += new System.EventHandler(this.listSearch_Enter); this.listSearch.Leave += new System.EventHandler(this.listSearch_Leave); // + // tabPage3 + // + this.tabPage3.Controls.Add(this.classesListView); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(410, 608); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Asset Classes"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // classesListView + // + this.classesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2}); + this.classesListView.Dock = System.Windows.Forms.DockStyle.Fill; + this.classesListView.FullRowSelect = true; + this.classesListView.HideSelection = false; + this.classesListView.Location = new System.Drawing.Point(0, 0); + this.classesListView.MultiSelect = false; + this.classesListView.Name = "classesListView"; + this.classesListView.Size = new System.Drawing.Size(410, 608); + this.classesListView.TabIndex = 0; + this.classesListView.UseCompatibleStateImageBehavior = false; + this.classesListView.View = System.Windows.Forms.View.Details; + this.classesListView.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.classesListView_ItemSelectionChanged); + // + // columnHeader1 + // + this.columnHeader1.DisplayIndex = 1; + this.columnHeader1.Text = "Name"; + this.columnHeader1.Width = 328; + // + // columnHeader2 + // + this.columnHeader2.DisplayIndex = 0; + this.columnHeader2.Text = "ID"; + // // progressbarPanel // this.progressbarPanel.Controls.Add(this.progressBar1); @@ -900,44 +949,6 @@ this.toolStripStatusLabel1.Text = "Ready to go"; this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // tabPage3 - // - this.tabPage3.Controls.Add(this.classesListView); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(410, 608); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Asset Classes"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // classesListView - // - this.classesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1, - this.columnHeader2}); - this.classesListView.Dock = System.Windows.Forms.DockStyle.Fill; - this.classesListView.FullRowSelect = true; - this.classesListView.HideSelection = false; - this.classesListView.Location = new System.Drawing.Point(0, 0); - this.classesListView.MultiSelect = false; - this.classesListView.Name = "classesListView"; - this.classesListView.Size = new System.Drawing.Size(410, 608); - this.classesListView.TabIndex = 0; - this.classesListView.UseCompatibleStateImageBehavior = false; - this.classesListView.View = System.Windows.Forms.View.Details; - this.classesListView.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.classesListView_ItemSelectionChanged); - // - // columnHeader1 - // - this.columnHeader1.DisplayIndex = 1; - this.columnHeader1.Text = "Name"; - this.columnHeader1.Width = 328; - // - // columnHeader2 - // - this.columnHeader2.DisplayIndex = 0; - this.columnHeader2.Text = "ID"; - // // timer // this.timer.Interval = 10; @@ -997,17 +1008,6 @@ this.showOriginalFileToolStripMenuItem.Visible = false; this.showOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.showOriginalFileToolStripMenuItem_Click); // - // sceneTreeView - // - this.sceneTreeView.CheckBoxes = true; - this.sceneTreeView.Dock = System.Windows.Forms.DockStyle.Fill; - this.sceneTreeView.HideSelection = false; - this.sceneTreeView.Location = new System.Drawing.Point(0, 21); - this.sceneTreeView.Name = "sceneTreeView"; - this.sceneTreeView.Size = new System.Drawing.Size(410, 587); - this.sceneTreeView.TabIndex = 1; - this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck); - // // AssetStudioGUIForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1035,6 +1035,7 @@ this.tabPage1.PerformLayout(); this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); + this.tabPage3.ResumeLayout(false); this.progressbarPanel.ResumeLayout(false); this.previewPanel.ResumeLayout(false); this.previewPanel.PerformLayout(); @@ -1046,7 +1047,6 @@ this.classPreviewPanel.PerformLayout(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); - this.tabPage3.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1109,7 +1109,7 @@ private GOHierarchy sceneTreeView; private System.Windows.Forms.ToolStripMenuItem debugMenuItem; private System.Windows.Forms.ToolStripMenuItem buildClassStructuresMenuItem; - private System.Windows.Forms.ToolStripMenuItem dontLoadAssetsMenuItem; + private System.Windows.Forms.ToolStripMenuItem dontBuildAssetListMenuItem; private System.Windows.Forms.ToolStripMenuItem dontBuildHierarchyMenuItem; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.ListView classesListView; diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 06290bf..5135e20 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -138,7 +138,7 @@ namespace AssetStudioGUI var productName = string.Empty; var tempDic = new Dictionary(); - if (!dontLoadAssetsMenuItem.Checked) + if (!dontBuildAssetListMenuItem.Checked) { BuildAssetList(tempDic, displayAll.Checked, displayOriginalName.Checked, out productName); } @@ -166,7 +166,7 @@ namespace AssetStudioGUI { Text = $"AssetStudioGUI - no productName - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; } - if (!dontLoadAssetsMenuItem.Checked) + if (!dontBuildAssetListMenuItem.Checked) { assetListView.VirtualListSize = visibleAssets.Count; resizeAssetListColumns(); @@ -239,22 +239,6 @@ namespace AssetStudioGUI private void AssetStudioForm_KeyDown(object sender, KeyEventArgs e) { - if (e.Control && e.Alt && e.KeyCode == Keys.D) - { - debugMenuItem.Visible = !debugMenuItem.Visible; - buildClassStructuresMenuItem.Checked = debugMenuItem.Visible; - dontLoadAssetsMenuItem.Checked = debugMenuItem.Visible; - dontBuildHierarchyMenuItem.Checked = debugMenuItem.Visible; - if (tabControl1.TabPages.Contains(tabPage3)) - { - tabControl1.TabPages.Remove(tabPage3); - } - else - { - tabControl1.TabPages.Add(tabPage3); - } - } - if (glControl1.Visible) { if (e.Control) @@ -288,9 +272,9 @@ namespace AssetStudioGUI } } - private void dontLoadAssetsMenuItem_CheckedChanged(object sender, EventArgs e) + private void dontBuildAssetListMenuItem_CheckedChanged(object sender, EventArgs e) { - if (dontLoadAssetsMenuItem.Checked) + if (dontBuildAssetListMenuItem.Checked) { dontBuildHierarchyMenuItem.Checked = true; dontBuildHierarchyMenuItem.Enabled = false;