diff --git a/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.Designer.cs b/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.Designer.cs index dbd1e35a..a640e576 100644 --- a/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.Designer.cs +++ b/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.Designer.cs @@ -33,10 +33,8 @@ this.stPanel2 = new Toolbox.Library.Forms.STPanel(); this.stPanel1 = new Toolbox.Library.Forms.STPanel(); this.stToolStrip1 = new Toolbox.Library.Forms.STToolStrip(); - this.searchFormToolStrip = new System.Windows.Forms.ToolStripButton(); this.treeViewCustom1 = new Toolbox.Library.TreeViewCustom(); this.stPanel3 = new Toolbox.Library.Forms.STPanel(); - this.searchImgPB = new System.Windows.Forms.PictureBox(); this.activeEditorChkBox = new Toolbox.Library.Forms.STCheckBox(); this.objectEditorMenu = new Toolbox.Library.Forms.STMenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -44,11 +42,14 @@ this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.treeNodeContextMenu = new Toolbox.Library.Forms.STContextMenuStrip(this.components); + this.searchFormToolStrip = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.searchImgPB = new System.Windows.Forms.PictureBox(); this.stPanel1.SuspendLayout(); this.stToolStrip1.SuspendLayout(); this.stPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.searchImgPB)).BeginInit(); this.objectEditorMenu.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.searchImgPB)).BeginInit(); this.SuspendLayout(); // // splitter1 @@ -84,6 +85,7 @@ // stToolStrip1 // this.stToolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1, this.searchFormToolStrip}); this.stToolStrip1.Location = new System.Drawing.Point(0, 26); this.stToolStrip1.Name = "stToolStrip1"; @@ -91,16 +93,6 @@ this.stToolStrip1.TabIndex = 3; this.stToolStrip1.Text = "stToolStrip1"; // - // searchFormToolStrip - // - this.searchFormToolStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.searchFormToolStrip.Image = global::Toolbox.Library.Properties.Resources.Antu_edit_find_mail1; - this.searchFormToolStrip.ImageTransparentColor = System.Drawing.Color.Magenta; - this.searchFormToolStrip.Name = "searchFormToolStrip"; - this.searchFormToolStrip.Size = new System.Drawing.Size(23, 22); - this.searchFormToolStrip.Text = "toolStripButton1"; - this.searchFormToolStrip.Click += new System.EventHandler(this.searchFormToolStrip_Click); - // // treeViewCustom1 // this.treeViewCustom1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -135,18 +127,6 @@ this.stPanel3.Size = new System.Drawing.Size(314, 26); this.stPanel3.TabIndex = 2; // - // searchImgPB - // - this.searchImgPB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.searchImgPB.BackColor = System.Drawing.Color.Transparent; - this.searchImgPB.Image = global::Toolbox.Library.Properties.Resources.Antu_edit_find_mail_svg; - this.searchImgPB.Location = new System.Drawing.Point(-654, 5); - this.searchImgPB.Name = "searchImgPB"; - this.searchImgPB.Size = new System.Drawing.Size(22, 17); - this.searchImgPB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.searchImgPB.TabIndex = 1; - this.searchImgPB.TabStop = false; - // // activeEditorChkBox // this.activeEditorChkBox.AutoSize = true; @@ -205,6 +185,38 @@ this.treeNodeContextMenu.Name = "treeNodeContextMenu"; this.treeNodeContextMenu.Size = new System.Drawing.Size(61, 4); // + // searchFormToolStrip + // + this.searchFormToolStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.searchFormToolStrip.Image = global::Toolbox.Library.Properties.Resources.Antu_edit_find_mail1; + this.searchFormToolStrip.ImageTransparentColor = System.Drawing.Color.Magenta; + this.searchFormToolStrip.Name = "searchFormToolStrip"; + this.searchFormToolStrip.Size = new System.Drawing.Size(23, 22); + this.searchFormToolStrip.Text = "toolStripButton1"; + this.searchFormToolStrip.Click += new System.EventHandler(this.searchFormToolStrip_Click); + // + // toolStripButton1 + // + this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton1.Image = global::Toolbox.Library.Properties.Resources.AddIcon; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(23, 22); + this.toolStripButton1.Text = "toolStripButton1"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // searchImgPB + // + this.searchImgPB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.searchImgPB.BackColor = System.Drawing.Color.Transparent; + this.searchImgPB.Image = global::Toolbox.Library.Properties.Resources.Antu_edit_find_mail_svg; + this.searchImgPB.Location = new System.Drawing.Point(-654, 5); + this.searchImgPB.Name = "searchImgPB"; + this.searchImgPB.Size = new System.Drawing.Size(22, 17); + this.searchImgPB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.searchImgPB.TabIndex = 1; + this.searchImgPB.TabStop = false; + // // ObjectEditorTree // this.Controls.Add(this.splitter1); @@ -218,9 +230,9 @@ this.stToolStrip1.PerformLayout(); this.stPanel3.ResumeLayout(false); this.stPanel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.searchImgPB)).EndInit(); this.objectEditorMenu.ResumeLayout(false); this.objectEditorMenu.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.searchImgPB)).EndInit(); this.ResumeLayout(false); } @@ -242,5 +254,6 @@ private STContextMenuStrip treeNodeContextMenu; private STToolStrip stToolStrip1; private System.Windows.Forms.ToolStripButton searchFormToolStrip; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.cs b/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.cs index 8cb3b9a8..a7fa6a84 100644 --- a/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.cs +++ b/Switch_Toolbox_Library/Forms/Editors/Object Editor/ObjectEditorTree.cs @@ -457,7 +457,15 @@ namespace Toolbox.Library.Forms TreeViewExtensions.HideCheckBox(e.Node); } - private void openToolStripMenuItem_Click(object sender, EventArgs e) + private void openToolStripMenuItem_Click(object sender, EventArgs e) { + AddNewFile(); + } + + private void toolStripButton1_Click(object sender, EventArgs e) { + AddNewFile(); + } + + private void AddNewFile() { OpenFileDialog ofd = new OpenFileDialog(); ofd.Filter = Utils.GetAllFilters(FileManager.GetFileFormats()); @@ -482,6 +490,10 @@ namespace Toolbox.Library.Forms var node = (TreeNode)file; AddNode(node); } + else if (file is IArchiveFile) + { + AddIArchiveFile((IFileFormat)file); + } else { STErrorDialog.Show("Invalid file type. Cannot add file to object list.", "Object List", ""); @@ -583,5 +595,10 @@ namespace Toolbox.Library.Forms searchForm = new SearchNodeForm(treeViewCustom1); searchForm.Show(this); } + + private void treeViewCustom1_DoubleClick(object sender, MouseEventArgs e) + { + + } } } diff --git a/Switch_Toolbox_Library/Properties/Resources.Designer.cs b/Switch_Toolbox_Library/Properties/Resources.Designer.cs index 2dc76a0f..eae92f12 100644 --- a/Switch_Toolbox_Library/Properties/Resources.Designer.cs +++ b/Switch_Toolbox_Library/Properties/Resources.Designer.cs @@ -70,6 +70,16 @@ namespace Toolbox.Library.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap AddIcon { + get { + object obj = ResourceManager.GetObject("AddIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Switch_Toolbox_Library/Properties/Resources.resx b/Switch_Toolbox_Library/Properties/Resources.resx index 544dd9ee..038e04eb 100644 --- a/Switch_Toolbox_Library/Properties/Resources.resx +++ b/Switch_Toolbox_Library/Properties/Resources.resx @@ -145,6 +145,9 @@ ..\Resources\InfoCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,9 +157,6 @@ ..\Resources\Playback\RewindArrows2L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\DataTyypes\IconInt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,6 +199,9 @@ ..\Resources\arrowL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DataTyypes\IconCurve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Forms\Toolbar\images\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -220,9 +223,6 @@ ..\Resources\DefaultTexture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Playback\PauseBtn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\minimize_sele.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,6 +235,9 @@ ..\Resources\model.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\skeletonAnimation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\DataTyypes\IconFloat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,18 +247,15 @@ ..\Resources\Cubemaps\specularSDR.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\InjectTexErrored.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\normalsSphere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\FileBank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\boneWeightGradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrowMinimize .png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\DataTyypes\IconList.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -316,8 +316,11 @@ ..\Resources\LoadingImage.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DataTyypes\IconCurve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Antu_edit-find-mail.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\InjectTexErrored.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\Bnsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -349,8 +352,8 @@ ..\Resources\materialSphereTransparent.tif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\skeletonAnimation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrowMinimize .png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\UVPattern.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -361,8 +364,8 @@ ..\Resources\Playback\ResetArrowR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\FileBank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Playback\PauseBtn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CheckBox\Hovered.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -376,10 +379,10 @@ ..\Forms\Toolbar\images\maximize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Antu_edit-find-mail.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Switch_Toolbox_Library/Toolbox.Library.dll b/Switch_Toolbox_Library/Toolbox.Library.dll index e8747a47..9377eb05 100644 Binary files a/Switch_Toolbox_Library/Toolbox.Library.dll and b/Switch_Toolbox_Library/Toolbox.Library.dll differ diff --git a/Switch_Toolbox_Library/Toolbox.Library.pdb b/Switch_Toolbox_Library/Toolbox.Library.pdb index c12c5a6e..19963632 100644 Binary files a/Switch_Toolbox_Library/Toolbox.Library.pdb and b/Switch_Toolbox_Library/Toolbox.Library.pdb differ diff --git a/Switch_Toolbox_Library/Toolbox_Library.csproj b/Switch_Toolbox_Library/Toolbox_Library.csproj index 9ef25e6b..c52e66a6 100644 --- a/Switch_Toolbox_Library/Toolbox_Library.csproj +++ b/Switch_Toolbox_Library/Toolbox_Library.csproj @@ -1245,6 +1245,9 @@ + + +