add more information to the asset list

This commit is contained in:
Perfare 2020-03-25 14:01:59 +08:00
parent 5c193c761a
commit fda821b441
8 changed files with 123 additions and 149 deletions

View File

@ -39,7 +39,6 @@
this.extractFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.extractFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.displayAll = new System.Windows.Forms.ToolStripMenuItem(); this.displayAll = new System.Windows.Forms.ToolStripMenuItem();
this.displayOriginalName = new System.Windows.Forms.ToolStripMenuItem();
this.enablePreview = new System.Windows.Forms.ToolStripMenuItem(); this.enablePreview = new System.Windows.Forms.ToolStripMenuItem();
this.displayInfo = new System.Windows.Forms.ToolStripMenuItem(); this.displayInfo = new System.Windows.Forms.ToolStripMenuItem();
this.openAfterExport = new System.Windows.Forms.ToolStripMenuItem(); this.openAfterExport = new System.Windows.Forms.ToolStripMenuItem();
@ -83,7 +82,9 @@
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.assetListView = new System.Windows.Forms.ListView(); this.assetListView = new System.Windows.Forms.ListView();
this.columnHeaderName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeaderName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeaderContainer = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeaderType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeaderType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeaderPathID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeaderSize = ((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.listSearch = new System.Windows.Forms.TextBox();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
@ -203,7 +204,6 @@
// //
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.displayAll, this.displayAll,
this.displayOriginalName,
this.enablePreview, this.enablePreview,
this.displayInfo, this.displayInfo,
this.openAfterExport, this.openAfterExport,
@ -223,15 +223,6 @@
"t the RAW file."; "t the RAW file.";
this.displayAll.CheckedChanged += new System.EventHandler(this.MenuItem_CheckedChanged); this.displayAll.CheckedChanged += new System.EventHandler(this.MenuItem_CheckedChanged);
// //
// displayOriginalName
//
this.displayOriginalName.CheckOnClick = true;
this.displayOriginalName.Name = "displayOriginalName";
this.displayOriginalName.Size = new System.Drawing.Size(252, 22);
this.displayOriginalName.Text = "Display asset original name";
this.displayOriginalName.ToolTipText = "Check this option will use asset original name when display and export";
this.displayOriginalName.CheckedChanged += new System.EventHandler(this.MenuItem_CheckedChanged);
//
// enablePreview // enablePreview
// //
this.enablePreview.Checked = true; this.enablePreview.Checked = true;
@ -537,7 +528,7 @@
this.splitContainer1.Panel2.Controls.Add(this.statusStrip1); this.splitContainer1.Panel2.Controls.Add(this.statusStrip1);
this.splitContainer1.Panel2MinSize = 400; this.splitContainer1.Panel2MinSize = 400;
this.splitContainer1.Size = new System.Drawing.Size(1264, 656); this.splitContainer1.Size = new System.Drawing.Size(1264, 656);
this.splitContainer1.SplitterDistance = 420; this.splitContainer1.SplitterDistance = 482;
this.splitContainer1.TabIndex = 2; this.splitContainer1.TabIndex = 2;
this.splitContainer1.TabStop = false; this.splitContainer1.TabStop = false;
// //
@ -551,7 +542,7 @@
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.Padding = new System.Drawing.Point(17, 3); this.tabControl1.Padding = new System.Drawing.Point(17, 3);
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(418, 634); this.tabControl1.Size = new System.Drawing.Size(480, 634);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 0; this.tabControl1.TabIndex = 0;
this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected); this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected);
@ -562,7 +553,7 @@
this.tabPage1.Controls.Add(this.treeSearch); this.tabPage1.Controls.Add(this.treeSearch);
this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(410, 608); this.tabPage1.Size = new System.Drawing.Size(472, 608);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Scene Hierarchy"; this.tabPage1.Text = "Scene Hierarchy";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
@ -574,7 +565,7 @@
this.sceneTreeView.HideSelection = false; this.sceneTreeView.HideSelection = false;
this.sceneTreeView.Location = new System.Drawing.Point(0, 21); this.sceneTreeView.Location = new System.Drawing.Point(0, 21);
this.sceneTreeView.Name = "sceneTreeView"; this.sceneTreeView.Name = "sceneTreeView";
this.sceneTreeView.Size = new System.Drawing.Size(410, 587); this.sceneTreeView.Size = new System.Drawing.Size(472, 587);
this.sceneTreeView.TabIndex = 1; this.sceneTreeView.TabIndex = 1;
this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck); this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck);
// //
@ -584,7 +575,7 @@
this.treeSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.treeSearch.ForeColor = System.Drawing.SystemColors.GrayText;
this.treeSearch.Location = new System.Drawing.Point(0, 0); this.treeSearch.Location = new System.Drawing.Point(0, 0);
this.treeSearch.Name = "treeSearch"; this.treeSearch.Name = "treeSearch";
this.treeSearch.Size = new System.Drawing.Size(410, 21); this.treeSearch.Size = new System.Drawing.Size(472, 21);
this.treeSearch.TabIndex = 0; this.treeSearch.TabIndex = 0;
this.treeSearch.Text = " Search "; this.treeSearch.Text = " Search ";
this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged); this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged);
@ -598,17 +589,18 @@
this.tabPage2.Controls.Add(this.listSearch); this.tabPage2.Controls.Add(this.listSearch);
this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(410, 608); this.tabPage2.Size = new System.Drawing.Size(472, 608);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Asset List"; this.tabPage2.Text = "Asset List";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
this.tabPage2.Resize += new System.EventHandler(this.tabPage2_Resize);
// //
// assetListView // assetListView
// //
this.assetListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.assetListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeaderName, this.columnHeaderName,
this.columnHeaderContainer,
this.columnHeaderType, this.columnHeaderType,
this.columnHeaderPathID,
this.columnHeaderSize}); this.columnHeaderSize});
this.assetListView.Dock = System.Windows.Forms.DockStyle.Fill; this.assetListView.Dock = System.Windows.Forms.DockStyle.Fill;
this.assetListView.FullRowSelect = true; this.assetListView.FullRowSelect = true;
@ -617,7 +609,7 @@
this.assetListView.LabelEdit = true; this.assetListView.LabelEdit = true;
this.assetListView.Location = new System.Drawing.Point(0, 21); this.assetListView.Location = new System.Drawing.Point(0, 21);
this.assetListView.Name = "assetListView"; this.assetListView.Name = "assetListView";
this.assetListView.Size = new System.Drawing.Size(410, 587); this.assetListView.Size = new System.Drawing.Size(472, 587);
this.assetListView.TabIndex = 1; this.assetListView.TabIndex = 1;
this.assetListView.UseCompatibleStateImageBehavior = false; this.assetListView.UseCompatibleStateImageBehavior = false;
this.assetListView.View = System.Windows.Forms.View.Details; this.assetListView.View = System.Windows.Forms.View.Details;
@ -630,17 +622,26 @@
// columnHeaderName // columnHeaderName
// //
this.columnHeaderName.Text = "Name"; this.columnHeaderName.Text = "Name";
this.columnHeaderName.Width = 240; this.columnHeaderName.Width = 170;
//
// columnHeaderContainer
//
this.columnHeaderContainer.Text = "Container";
this.columnHeaderContainer.Width = 80;
// //
// columnHeaderType // columnHeaderType
// //
this.columnHeaderType.Text = "Type"; this.columnHeaderType.Text = "Type";
this.columnHeaderType.Width = 88; this.columnHeaderType.Width = 90;
//
// columnHeaderPathID
//
this.columnHeaderPathID.Text = "PathID";
// //
// columnHeaderSize // columnHeaderSize
// //
this.columnHeaderSize.Text = "Size"; this.columnHeaderSize.Text = "Size";
this.columnHeaderSize.Width = 23; this.columnHeaderSize.Width = 50;
// //
// listSearch // listSearch
// //
@ -648,7 +649,7 @@
this.listSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.listSearch.ForeColor = System.Drawing.SystemColors.GrayText;
this.listSearch.Location = new System.Drawing.Point(0, 0); this.listSearch.Location = new System.Drawing.Point(0, 0);
this.listSearch.Name = "listSearch"; this.listSearch.Name = "listSearch";
this.listSearch.Size = new System.Drawing.Size(410, 21); this.listSearch.Size = new System.Drawing.Size(472, 21);
this.listSearch.TabIndex = 0; this.listSearch.TabIndex = 0;
this.listSearch.Text = " Filter "; this.listSearch.Text = " Filter ";
this.listSearch.TextChanged += new System.EventHandler(this.ListSearchTextChanged); this.listSearch.TextChanged += new System.EventHandler(this.ListSearchTextChanged);
@ -660,7 +661,7 @@
this.tabPage3.Controls.Add(this.classesListView); this.tabPage3.Controls.Add(this.classesListView);
this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(410, 608); this.tabPage3.Size = new System.Drawing.Size(472, 608);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "Asset Classes"; this.tabPage3.Text = "Asset Classes";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
@ -676,7 +677,7 @@
this.classesListView.Location = new System.Drawing.Point(0, 0); this.classesListView.Location = new System.Drawing.Point(0, 0);
this.classesListView.MultiSelect = false; this.classesListView.MultiSelect = false;
this.classesListView.Name = "classesListView"; this.classesListView.Name = "classesListView";
this.classesListView.Size = new System.Drawing.Size(410, 608); this.classesListView.Size = new System.Drawing.Size(472, 608);
this.classesListView.TabIndex = 0; this.classesListView.TabIndex = 0;
this.classesListView.UseCompatibleStateImageBehavior = false; this.classesListView.UseCompatibleStateImageBehavior = false;
this.classesListView.View = System.Windows.Forms.View.Details; this.classesListView.View = System.Windows.Forms.View.Details;
@ -700,7 +701,7 @@
this.progressbarPanel.Location = new System.Drawing.Point(0, 634); this.progressbarPanel.Location = new System.Drawing.Point(0, 634);
this.progressbarPanel.Name = "progressbarPanel"; this.progressbarPanel.Name = "progressbarPanel";
this.progressbarPanel.Padding = new System.Windows.Forms.Padding(1, 3, 1, 1); this.progressbarPanel.Padding = new System.Windows.Forms.Padding(1, 3, 1, 1);
this.progressbarPanel.Size = new System.Drawing.Size(418, 20); this.progressbarPanel.Size = new System.Drawing.Size(480, 20);
this.progressbarPanel.TabIndex = 2; this.progressbarPanel.TabIndex = 2;
// //
// progressBar1 // progressBar1
@ -708,7 +709,7 @@
this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.progressBar1.Location = new System.Drawing.Point(1, 2); this.progressBar1.Location = new System.Drawing.Point(1, 2);
this.progressBar1.Name = "progressBar1"; this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(416, 17); this.progressBar1.Size = new System.Drawing.Size(478, 17);
this.progressBar1.Step = 1; this.progressBar1.Step = 1;
this.progressBar1.TabIndex = 1; this.progressBar1.TabIndex = 1;
// //
@ -725,7 +726,7 @@
this.previewPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.previewPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.previewPanel.Location = new System.Drawing.Point(0, 0); this.previewPanel.Location = new System.Drawing.Point(0, 0);
this.previewPanel.Name = "previewPanel"; this.previewPanel.Name = "previewPanel";
this.previewPanel.Size = new System.Drawing.Size(838, 632); this.previewPanel.Size = new System.Drawing.Size(776, 632);
this.previewPanel.TabIndex = 1; this.previewPanel.TabIndex = 1;
this.previewPanel.Resize += new System.EventHandler(this.preview_Resize); this.previewPanel.Resize += new System.EventHandler(this.preview_Resize);
// //
@ -755,7 +756,7 @@
this.FMODpanel.Dock = System.Windows.Forms.DockStyle.Fill; this.FMODpanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.FMODpanel.Location = new System.Drawing.Point(0, 0); this.FMODpanel.Location = new System.Drawing.Point(0, 0);
this.FMODpanel.Name = "FMODpanel"; this.FMODpanel.Name = "FMODpanel";
this.FMODpanel.Size = new System.Drawing.Size(838, 632); this.FMODpanel.Size = new System.Drawing.Size(776, 632);
this.FMODpanel.TabIndex = 2; this.FMODpanel.TabIndex = 2;
this.FMODpanel.Visible = false; this.FMODpanel.Visible = false;
// //
@ -763,7 +764,7 @@
// //
this.FMODcopyright.AutoSize = true; this.FMODcopyright.AutoSize = true;
this.FMODcopyright.ForeColor = System.Drawing.SystemColors.ControlLight; this.FMODcopyright.ForeColor = System.Drawing.SystemColors.ControlLight;
this.FMODcopyright.Location = new System.Drawing.Point(250, 352); this.FMODcopyright.Location = new System.Drawing.Point(232, 350);
this.FMODcopyright.Name = "FMODcopyright"; this.FMODcopyright.Name = "FMODcopyright";
this.FMODcopyright.Size = new System.Drawing.Size(341, 12); this.FMODcopyright.Size = new System.Drawing.Size(341, 12);
this.FMODcopyright.TabIndex = 9; this.FMODcopyright.TabIndex = 9;
@ -773,7 +774,7 @@
// //
this.FMODinfoLabel.AutoSize = true; this.FMODinfoLabel.AutoSize = true;
this.FMODinfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.FMODinfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.FMODinfoLabel.Location = new System.Drawing.Point(305, 250); this.FMODinfoLabel.Location = new System.Drawing.Point(287, 248);
this.FMODinfoLabel.Name = "FMODinfoLabel"; this.FMODinfoLabel.Name = "FMODinfoLabel";
this.FMODinfoLabel.Size = new System.Drawing.Size(0, 12); this.FMODinfoLabel.Size = new System.Drawing.Size(0, 12);
this.FMODinfoLabel.TabIndex = 8; this.FMODinfoLabel.TabIndex = 8;
@ -781,7 +782,7 @@
// FMODtimerLabel // FMODtimerLabel
// //
this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.FMODtimerLabel.Location = new System.Drawing.Point(440, 250); this.FMODtimerLabel.Location = new System.Drawing.Point(422, 248);
this.FMODtimerLabel.Name = "FMODtimerLabel"; this.FMODtimerLabel.Name = "FMODtimerLabel";
this.FMODtimerLabel.Size = new System.Drawing.Size(155, 12); this.FMODtimerLabel.Size = new System.Drawing.Size(155, 12);
this.FMODtimerLabel.TabIndex = 7; this.FMODtimerLabel.TabIndex = 7;
@ -791,7 +792,7 @@
// FMODstatusLabel // FMODstatusLabel
// //
this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.FMODstatusLabel.Location = new System.Drawing.Point(249, 250); this.FMODstatusLabel.Location = new System.Drawing.Point(231, 248);
this.FMODstatusLabel.Name = "FMODstatusLabel"; this.FMODstatusLabel.Name = "FMODstatusLabel";
this.FMODstatusLabel.Size = new System.Drawing.Size(50, 12); this.FMODstatusLabel.Size = new System.Drawing.Size(50, 12);
this.FMODstatusLabel.TabIndex = 6; this.FMODstatusLabel.TabIndex = 6;
@ -800,7 +801,7 @@
// FMODprogressBar // FMODprogressBar
// //
this.FMODprogressBar.AutoSize = false; this.FMODprogressBar.AutoSize = false;
this.FMODprogressBar.Location = new System.Drawing.Point(249, 268); this.FMODprogressBar.Location = new System.Drawing.Point(231, 266);
this.FMODprogressBar.Maximum = 1000; this.FMODprogressBar.Maximum = 1000;
this.FMODprogressBar.Name = "FMODprogressBar"; this.FMODprogressBar.Name = "FMODprogressBar";
this.FMODprogressBar.Size = new System.Drawing.Size(350, 22); this.FMODprogressBar.Size = new System.Drawing.Size(350, 22);
@ -813,7 +814,7 @@
// FMODvolumeBar // FMODvolumeBar
// //
this.FMODvolumeBar.LargeChange = 2; this.FMODvolumeBar.LargeChange = 2;
this.FMODvolumeBar.Location = new System.Drawing.Point(496, 295); this.FMODvolumeBar.Location = new System.Drawing.Point(478, 293);
this.FMODvolumeBar.Name = "FMODvolumeBar"; this.FMODvolumeBar.Name = "FMODvolumeBar";
this.FMODvolumeBar.Size = new System.Drawing.Size(104, 45); this.FMODvolumeBar.Size = new System.Drawing.Size(104, 45);
this.FMODvolumeBar.TabIndex = 4; this.FMODvolumeBar.TabIndex = 4;
@ -824,7 +825,7 @@
// FMODloopButton // FMODloopButton
// //
this.FMODloopButton.Appearance = System.Windows.Forms.Appearance.Button; this.FMODloopButton.Appearance = System.Windows.Forms.Appearance.Button;
this.FMODloopButton.Location = new System.Drawing.Point(435, 295); this.FMODloopButton.Location = new System.Drawing.Point(417, 293);
this.FMODloopButton.Name = "FMODloopButton"; this.FMODloopButton.Name = "FMODloopButton";
this.FMODloopButton.Size = new System.Drawing.Size(55, 42); this.FMODloopButton.Size = new System.Drawing.Size(55, 42);
this.FMODloopButton.TabIndex = 3; this.FMODloopButton.TabIndex = 3;
@ -835,7 +836,7 @@
// //
// FMODstopButton // FMODstopButton
// //
this.FMODstopButton.Location = new System.Drawing.Point(374, 295); this.FMODstopButton.Location = new System.Drawing.Point(356, 293);
this.FMODstopButton.Name = "FMODstopButton"; this.FMODstopButton.Name = "FMODstopButton";
this.FMODstopButton.Size = new System.Drawing.Size(55, 42); this.FMODstopButton.Size = new System.Drawing.Size(55, 42);
this.FMODstopButton.TabIndex = 2; this.FMODstopButton.TabIndex = 2;
@ -845,7 +846,7 @@
// //
// FMODpauseButton // FMODpauseButton
// //
this.FMODpauseButton.Location = new System.Drawing.Point(313, 295); this.FMODpauseButton.Location = new System.Drawing.Point(295, 293);
this.FMODpauseButton.Name = "FMODpauseButton"; this.FMODpauseButton.Name = "FMODpauseButton";
this.FMODpauseButton.Size = new System.Drawing.Size(55, 42); this.FMODpauseButton.Size = new System.Drawing.Size(55, 42);
this.FMODpauseButton.TabIndex = 1; this.FMODpauseButton.TabIndex = 1;
@ -855,7 +856,7 @@
// //
// FMODplayButton // FMODplayButton
// //
this.FMODplayButton.Location = new System.Drawing.Point(252, 295); this.FMODplayButton.Location = new System.Drawing.Point(234, 293);
this.FMODplayButton.Name = "FMODplayButton"; this.FMODplayButton.Name = "FMODplayButton";
this.FMODplayButton.Size = new System.Drawing.Size(55, 42); this.FMODplayButton.Size = new System.Drawing.Size(55, 42);
this.FMODplayButton.TabIndex = 0; this.FMODplayButton.TabIndex = 0;
@ -870,8 +871,7 @@
this.fontPreviewBox.Location = new System.Drawing.Point(0, 0); this.fontPreviewBox.Location = new System.Drawing.Point(0, 0);
this.fontPreviewBox.Name = "fontPreviewBox"; this.fontPreviewBox.Name = "fontPreviewBox";
this.fontPreviewBox.ReadOnly = true; this.fontPreviewBox.ReadOnly = true;
this.fontPreviewBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; this.fontPreviewBox.Size = new System.Drawing.Size(776, 632);
this.fontPreviewBox.Size = new System.Drawing.Size(838, 632);
this.fontPreviewBox.TabIndex = 0; this.fontPreviewBox.TabIndex = 0;
this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text"); this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text");
this.fontPreviewBox.Visible = false; this.fontPreviewBox.Visible = false;
@ -886,7 +886,7 @@
this.textPreviewBox.Name = "textPreviewBox"; this.textPreviewBox.Name = "textPreviewBox";
this.textPreviewBox.ReadOnly = true; this.textPreviewBox.ReadOnly = true;
this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.textPreviewBox.Size = new System.Drawing.Size(838, 632); this.textPreviewBox.Size = new System.Drawing.Size(776, 632);
this.textPreviewBox.TabIndex = 2; this.textPreviewBox.TabIndex = 2;
this.textPreviewBox.Visible = false; this.textPreviewBox.Visible = false;
this.textPreviewBox.WordWrap = false; this.textPreviewBox.WordWrap = false;
@ -897,7 +897,7 @@
this.glControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.glControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.glControl1.Location = new System.Drawing.Point(0, 0); this.glControl1.Location = new System.Drawing.Point(0, 0);
this.glControl1.Name = "glControl1"; this.glControl1.Name = "glControl1";
this.glControl1.Size = new System.Drawing.Size(838, 632); this.glControl1.Size = new System.Drawing.Size(776, 632);
this.glControl1.TabIndex = 4; this.glControl1.TabIndex = 4;
this.glControl1.Visible = false; this.glControl1.Visible = false;
this.glControl1.VSync = false; this.glControl1.VSync = false;
@ -914,7 +914,7 @@
this.classPreviewPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.classPreviewPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.classPreviewPanel.Location = new System.Drawing.Point(0, 0); this.classPreviewPanel.Location = new System.Drawing.Point(0, 0);
this.classPreviewPanel.Name = "classPreviewPanel"; this.classPreviewPanel.Name = "classPreviewPanel";
this.classPreviewPanel.Size = new System.Drawing.Size(838, 632); this.classPreviewPanel.Size = new System.Drawing.Size(776, 632);
this.classPreviewPanel.TabIndex = 3; this.classPreviewPanel.TabIndex = 3;
this.classPreviewPanel.Visible = false; this.classPreviewPanel.Visible = false;
// //
@ -926,7 +926,7 @@
this.classTextBox.Name = "classTextBox"; this.classTextBox.Name = "classTextBox";
this.classTextBox.ReadOnly = true; this.classTextBox.ReadOnly = true;
this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.classTextBox.Size = new System.Drawing.Size(838, 632); this.classTextBox.Size = new System.Drawing.Size(776, 632);
this.classTextBox.TabIndex = 3; this.classTextBox.TabIndex = 3;
this.classTextBox.WordWrap = false; this.classTextBox.WordWrap = false;
// //
@ -936,7 +936,7 @@
this.toolStripStatusLabel1}); this.toolStripStatusLabel1});
this.statusStrip1.Location = new System.Drawing.Point(0, 632); this.statusStrip1.Location = new System.Drawing.Point(0, 632);
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(838, 22); this.statusStrip1.Size = new System.Drawing.Size(776, 22);
this.statusStrip1.TabIndex = 2; this.statusStrip1.TabIndex = 2;
this.statusStrip1.Text = "statusStrip1"; this.statusStrip1.Text = "statusStrip1";
// //
@ -944,7 +944,7 @@
// //
this.toolStripStatusLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.toolStripStatusLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
this.toolStripStatusLabel1.Size = new System.Drawing.Size(823, 17); this.toolStripStatusLabel1.Size = new System.Drawing.Size(761, 17);
this.toolStripStatusLabel1.Spring = true; this.toolStripStatusLabel1.Spring = true;
this.toolStripStatusLabel1.Text = "Ready to go"; this.toolStripStatusLabel1.Text = "Ready to go";
this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@ -1095,7 +1095,6 @@
private System.Windows.Forms.Timer timer; private System.Windows.Forms.Timer timer;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem displayAll; private System.Windows.Forms.ToolStripMenuItem displayAll;
private System.Windows.Forms.ToolStripMenuItem displayOriginalName;
private System.Windows.Forms.ToolStripMenuItem enablePreview; private System.Windows.Forms.ToolStripMenuItem enablePreview;
private System.Windows.Forms.ToolStripMenuItem displayInfo; private System.Windows.Forms.ToolStripMenuItem displayInfo;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
@ -1145,6 +1144,8 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem9; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem9;
private System.Windows.Forms.ColumnHeader columnHeaderContainer;
private System.Windows.Forms.ColumnHeader columnHeaderPathID;
} }
} }

View File

@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing.Text; using System.Drawing.Text;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Timers;
using OpenTK; using OpenTK;
using OpenTK.Graphics.OpenGL; using OpenTK.Graphics.OpenGL;
using AssetStudio; using AssetStudio;
@ -68,10 +69,12 @@ namespace AssetStudioGUI
private int normalMode; private int normalMode;
#endregion #endregion
//asset list sorting helpers //asset list sorting
private int firstSortColumn = -1; private int sortColumn = -1;
private int secondSortColumn;
private bool reverseSort; private bool reverseSort;
//asset list filter
private System.Timers.Timer delayTimer;
private bool enableFiltering; private bool enableFiltering;
//tree search //tree search
@ -176,7 +179,6 @@ namespace AssetStudioGUI
if (!dontBuildAssetListMenuItem.Checked) if (!dontBuildAssetListMenuItem.Checked)
{ {
assetListView.VirtualListSize = visibleAssets.Count; assetListView.VirtualListSize = visibleAssets.Count;
resizeAssetListColumns();
} }
if (!dontBuildHierarchyMenuItem.Checked) if (!dontBuildHierarchyMenuItem.Checked)
{ {
@ -462,7 +464,6 @@ namespace AssetStudioGUI
treeSearch.Select(); treeSearch.Select();
break; break;
case 1: case 1:
resizeAssetListColumns(); //required because the ListView is not visible on app launch
classPreviewPanel.Visible = false; classPreviewPanel.Visible = false;
previewPanel.Visible = true; previewPanel.Visible = true;
listSearch.Select(); listSearch.Select();
@ -524,7 +525,7 @@ namespace AssetStudioGUI
private void TreeNodeSearch(TreeNode treeNode) private void TreeNodeSearch(TreeNode treeNode)
{ {
if (treeNode.Text.IndexOf(treeSearch.Text, StringComparison.CurrentCultureIgnoreCase) >= 0) if (treeNode.Text.IndexOf(treeSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0)
{ {
treeSrcResults.Add(treeNode); treeSrcResults.Add(treeNode);
} }
@ -543,23 +544,6 @@ namespace AssetStudioGUI
} }
} }
private void resizeAssetListColumns()
{
assetListView.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.HeaderSize);
assetListView.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent);
assetListView.AutoResizeColumn(2, ColumnHeaderAutoResizeStyle.HeaderSize);
assetListView.AutoResizeColumn(2, ColumnHeaderAutoResizeStyle.ColumnContent);
var vscrollwidth = SystemInformation.VerticalScrollBarWidth;
var hasvscroll = (visibleAssets.Count / (float)assetListView.Height) > 0.0567f;
columnHeaderName.Width = assetListView.Width - columnHeaderType.Width - columnHeaderSize.Width - (hasvscroll ? (5 + vscrollwidth) : 5);
}
private void tabPage2_Resize(object sender, EventArgs e)
{
resizeAssetListColumns();
}
private void listSearch_Enter(object sender, EventArgs e) private void listSearch_Enter(object sender, EventArgs e)
{ {
if (listSearch.Text == " Filter ") if (listSearch.Text == " Filter ")
@ -584,54 +568,56 @@ namespace AssetStudioGUI
{ {
if (enableFiltering) if (enableFiltering)
{ {
FilterAssetList(); if (delayTimer.Enabled)
{
delayTimer.Stop();
delayTimer.Start();
}
else
{
delayTimer.Start();
}
} }
} }
private void delayTimer_Elapsed(object sender, ElapsedEventArgs e)
{
delayTimer.Stop();
Invoke(new Action(FilterAssetList));
}
private void assetListView_ColumnClick(object sender, ColumnClickEventArgs e) private void assetListView_ColumnClick(object sender, ColumnClickEventArgs e)
{ {
if (firstSortColumn != e.Column) if (sortColumn != e.Column)
{ {
//sorting column has been changed
reverseSort = false; reverseSort = false;
secondSortColumn = firstSortColumn;
} }
else { reverseSort = !reverseSort; } else
firstSortColumn = e.Column; {
reverseSort = !reverseSort;
}
sortColumn = e.Column;
assetListView.BeginUpdate(); assetListView.BeginUpdate();
assetListView.SelectedIndices.Clear(); assetListView.SelectedIndices.Clear();
switch (e.Column) if (sortColumn == 4) //FullSize
{ {
case 0: visibleAssets.Sort((a, b) =>
visibleAssets.Sort(delegate (AssetItem a, AssetItem b) {
{ var asf = a.FullSize;
int xdiff = reverseSort ? b.Text.CompareTo(a.Text) : a.Text.CompareTo(b.Text); var bsf = b.FullSize;
if (xdiff != 0) return xdiff; return reverseSort ? bsf.CompareTo(asf) : asf.CompareTo(bsf);
return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.FullSize.CompareTo(b.FullSize); });
}); }
break; else
case 1: {
visibleAssets.Sort(delegate (AssetItem a, AssetItem b) visibleAssets.Sort((a, b) =>
{ {
int xdiff = reverseSort ? b.TypeString.CompareTo(a.TypeString) : a.TypeString.CompareTo(b.TypeString); var at = a.SubItems[sortColumn].Text;
if (xdiff != 0) return xdiff; var bt = b.SubItems[sortColumn].Text;
return secondSortColumn == 2 ? a.FullSize.CompareTo(b.FullSize) : a.Text.CompareTo(b.Text); return reverseSort ? bt.CompareTo(at) : at.CompareTo(bt);
}); });
break;
case 2:
visibleAssets.Sort(delegate (AssetItem a, AssetItem b)
{
int xdiff = reverseSort ? b.FullSize.CompareTo(a.FullSize) : a.FullSize.CompareTo(b.FullSize);
if (xdiff != 0) return xdiff;
return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Text.CompareTo(b.Text);
});
break;
} }
assetListView.EndUpdate(); assetListView.EndUpdate();
resizeAssetListColumns();
} }
private void selectAsset(object sender, ListViewItemSelectionChangedEventArgs e) private void selectAsset(object sender, ListViewItemSelectionChangedEventArgs e)
@ -1489,7 +1475,8 @@ namespace AssetStudioGUI
{ {
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
InitializeComponent(); InitializeComponent();
displayOriginalName.Checked = Properties.Settings.Default.displayOriginalName; delayTimer = new System.Timers.Timer(800);
delayTimer.Elapsed += new ElapsedEventHandler(delayTimer_Elapsed);
displayAll.Checked = Properties.Settings.Default.displayAll; displayAll.Checked = Properties.Settings.Default.displayAll;
displayInfo.Checked = Properties.Settings.Default.displayInfo; displayInfo.Checked = Properties.Settings.Default.displayInfo;
enablePreview.Checked = Properties.Settings.Default.enablePreview; enablePreview.Checked = Properties.Settings.Default.enablePreview;
@ -1749,8 +1736,7 @@ namespace AssetStudioGUI
glControl1.Visible = false; glControl1.Visible = false;
lastSelectedItem = null; lastSelectedItem = null;
lastLoadedAsset = null; lastLoadedAsset = null;
firstSortColumn = -1; sortColumn = -1;
secondSortColumn = 0;
reverseSort = false; reverseSort = false;
enableFiltering = false; enableFiltering = false;
listSearch.Text = " Filter "; listSearch.Text = " Filter ";
@ -2016,7 +2002,10 @@ namespace AssetStudioGUI
} }
if (listSearch.Text != " Filter ") if (listSearch.Text != " Filter ")
{ {
visibleAssets = visibleAssets.FindAll(x => x.Text.IndexOf(listSearch.Text, StringComparison.CurrentCultureIgnoreCase) >= 0); visibleAssets = visibleAssets.FindAll(
x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0);
} }
assetListView.VirtualListSize = visibleAssets.Count; assetListView.VirtualListSize = visibleAssets.Count;
assetListView.EndUpdate(); assetListView.EndUpdate();

View File

@ -7,11 +7,11 @@ namespace AssetStudioGUI
{ {
public Object Asset; public Object Asset;
public SerializedFile SourceFile; public SerializedFile SourceFile;
public string Container = string.Empty;
public string TypeString;
public long m_PathID;
public long FullSize; public long FullSize;
public ClassIDType Type; public ClassIDType Type;
public string TypeString;
public string Extension;
public string InfoText; public string InfoText;
public string UniqueID; public string UniqueID;
public GameObjectTreeNode TreeNode; public GameObjectTreeNode TreeNode;
@ -20,9 +20,21 @@ namespace AssetStudioGUI
{ {
Asset = asset; Asset = asset;
SourceFile = asset.assetsFile; SourceFile = asset.assetsFile;
FullSize = asset.byteSize;
Type = asset.type; Type = asset.type;
TypeString = Type.ToString(); TypeString = Type.ToString();
m_PathID = asset.m_PathID;
FullSize = asset.byteSize;
}
public void SetSubItems()
{
SubItems.AddRange(new[]
{
Container, //Container
TypeString, //Type
m_PathID.ToString(), //PathID
FullSize.ToString(), //Size
});
} }
} }
} }

View File

@ -112,7 +112,7 @@ namespace AssetStudioGUI
public static bool ExportTextAsset(AssetItem item, string exportPath) public static bool ExportTextAsset(AssetItem item, string exportPath)
{ {
var m_TextAsset = (TextAsset)(item.Asset); var m_TextAsset = (TextAsset)(item.Asset);
var exportFullName = exportPath + item.Text + (item.Extension ?? ".txt"); var exportFullName = exportPath + item.Text + ".txt";
if (ExportFileExists(exportFullName)) if (ExportFileExists(exportFullName))
return false; return false;
File.WriteAllBytes(exportFullName, m_TextAsset.m_Script); File.WriteAllBytes(exportFullName, m_TextAsset.m_Script);

View File

@ -119,18 +119,6 @@ namespace AssetStudioGUI.Properties {
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool displayOriginalName {
get {
return ((bool)(this["displayOriginalName"]));
}
set {
this["displayOriginalName"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")] [global::System.Configuration.DefaultSettingValueAttribute("True")]

View File

@ -26,9 +26,6 @@
<Setting Name="convertType" Type="System.String" Scope="User"> <Setting Name="convertType" Type="System.String" Scope="User">
<Value Profile="(Default)">PNG</Value> <Value Profile="(Default)">PNG</Value>
</Setting> </Setting>
<Setting Name="displayOriginalName" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="eulerFilter" Type="System.Boolean" Scope="User"> <Setting Name="eulerFilter" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value> <Value Profile="(Default)">True</Value>
</Setting> </Setting>

View File

@ -184,7 +184,6 @@ namespace AssetStudioGUI
{ {
assetItem.Text = assetItem.TypeString + assetItem.UniqueID; assetItem.Text = assetItem.TypeString + assetItem.UniqueID;
} }
assetItem.SubItems.AddRange(new[] { assetItem.TypeString, assetItem.FullSize.ToString() });
//处理同名文件 //处理同名文件
if (!assetsNameHash.Add(assetItem.TypeString + assetItem.Text)) if (!assetsNameHash.Add(assetItem.TypeString + assetItem.Text))
{ {
@ -199,26 +198,17 @@ namespace AssetStudioGUI
Progress.Report(++j, progressCount); Progress.Report(++j, progressCount);
} }
if (Properties.Settings.Default.displayOriginalName && ab != null) foreach (var item in tempExportableAssets)
{ {
foreach (var item in tempExportableAssets) if (ab != null)
{ {
var originalPath = ab.m_Container.FirstOrDefault(y => y.Value.asset.m_PathID == item.Asset.m_PathID).Key; var container = ab.m_Container.FirstOrDefault(y => y.Value.asset.m_PathID == item.Asset.m_PathID).Key;
if (!string.IsNullOrEmpty(originalPath)) if (!string.IsNullOrEmpty(container))
{ {
var extension = Path.GetExtension(originalPath); item.Container = container;
if (!string.IsNullOrEmpty(extension) && item.Type == ClassIDType.TextAsset)
{
item.Extension = extension;
}
item.Text = Path.GetDirectoryName(originalPath) + "\\" + Path.GetFileNameWithoutExtension(originalPath);
if (!assetsNameHash.Add(item.TypeString + item.Text))
{
item.Text += item.UniqueID;
}
} }
} }
item.SetSubItems();
} }
exportableAssets.AddRange(tempExportableAssets); exportableAssets.AddRange(tempExportableAssets);
tempExportableAssets.Clear(); tempExportableAssets.Clear();

View File

@ -31,9 +31,6 @@
<setting name="convertType" serializeAs="String"> <setting name="convertType" serializeAs="String">
<value>PNG</value> <value>PNG</value>
</setting> </setting>
<setting name="displayOriginalName" serializeAs="String">
<value>False</value>
</setting>
<setting name="eulerFilter" serializeAs="String"> <setting name="eulerFilter" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>