Viewport toggle, and many more fixes

The aamp editor now acts like the byaml one.
Fixed aamp files saving with improper strings.
Added toggle for viewport in bfres editor. The setting will apply to the config so you can always disable it for quicker previewing for bfres.
More editors for bfres now dock rather than convering the whole screen.
Plugins can have icons for the toolstrip that contains the save/update icons.
Force PTCL texture injection due to an alignment thing

Switch_FileFormatsMain/FileFormats/AAMP/AAMP.cs

@@ -11,7 +11,7 @@ using FirstPlugin.Forms;
 
 namespace FirstPlugin
 {
-    public class AAMP : TreeNodeFile, IFileFormat
+    public class AAMP : IEditor<AampEditorBase>, IFileFormat
     {
         public bool CanSave { get; set; }
         public string[] Description { get; set; } = new string[] { "AAMP" };
@@ -37,11 +37,6 @@ namespace FirstPlugin
             }
         }
 
-        public override void OnClick(TreeView treeview)
-        {
-      
-        }
-
         private uint CheckVersion(Stream stream)
         {
             using (FileReader reader = new FileReader(stream, true))
@@ -54,32 +49,45 @@ namespace FirstPlugin
             }
         }
 
+        bool IsSaveDialog = false;
+
+        public AampEditorBase OpenForm()
+        {
+            if (aampFileV1 != null)
+            {
+                AampV1Editor editor = new AampV1Editor(this, IsSaveDialog);
+                editor.Text = FileName;
+                editor.Dock = DockStyle.Fill;
+                return editor;
+            }
+            else
+            {
+                AampV2Editor editor = new AampV2Editor(this, IsSaveDialog);
+                editor.Text = FileName;
+                editor.Dock = DockStyle.Fill;
+                return editor;
+            }
+        }
+
+
         public aampv1.AampFile aampFileV1;
         public aampv2.AampFile aampFileV2;
 
-        AampV1Editor aampEditorV1;
-        AampV2Editor aampEditorV2;
-
         public void Load(Stream stream)
         {
             CanSave = true;
-            Text = FileName;
+
+            IsSaveDialog = IFileInfo != null && IFileInfo.InArchive;
 
             uint Version = CheckVersion(stream);
 
             if (Version == 1)
             {
                 aampFileV1 = new aampv1.AampFile(stream);
-                Text = $"{FileName} Type [{aampFileV1.EffectType}]";
-                aampEditorV1 = new AampV1Editor();
-                aampEditorV1.LoadFile(aampFileV1, this);
             }
             else if (Version == 2)
             {
                 aampFileV2 = new aampv2.AampFile(stream);
-                Text = $"{FileName} Type [{aampFileV2.EffectType}]";
-                aampEditorV2 = new AampV2Editor();
-                aampEditorV2.LoadFile(aampFileV2, this);
             }
             else
             {
@@ -87,18 +95,6 @@ namespace FirstPlugin
             }
         }
             
-        public override void OnAfterAdded()
-        {
-            if (aampEditorV1 != null)
-            {
-                aampEditorV1.LoadImages(TreeView, this);
-            }
-            if (aampEditorV2 != null)
-            {
-                aampEditorV2.LoadImages(TreeView, this);
-            }
-        }
-
         public void Unload()
         {
 

Switch_FileFormatsMain/FileFormats/Archives/BEA.cs

@@ -55,6 +55,7 @@ namespace FirstPlugin
             public STToolStripItem[] CompressionMenuExtensions => null;
             public STToolStripItem[] ExperimentalMenuExtensions => experimentalMenu;
             public STToolStripItem[] EditMenuExtensions => null;
+            public ToolStripButton[] IconButtonMenuExtensions => null;
 
             STToolStripItem[] experimentalMenu = new STToolStripItem[1];
             public MenuExt()

Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs

@@ -60,6 +60,7 @@ namespace FirstPlugin
             public STToolStripItem[] TitleBarExtensions => null;
             public STToolStripItem[] CompressionMenuExtensions => null;
             public STToolStripItem[] ExperimentalMenuExtensions => null;
+            public ToolStripButton[] IconButtonMenuExtensions => null;
 
             STToolStripItem[] toolExt = new STToolStripItem[1];
             STToolStripItem[] newFileExt = new STToolStripItem[2];
@@ -67,19 +68,14 @@ namespace FirstPlugin
 
             public MenuExt()
             {
-                editExt[0] = new STToolStripItem("Use Advanced Editor As Default");
-                editExt[0].Click += AdvancedEditor;
-
-                toolExt[0] = new STToolStripItem("Open Bfres Debugger");
-                toolExt[0].Click += DebugInfo;
-
-                newFileExt[0] = new STToolStripItem("BFRES (Switch)");
-                newFileExt[0].Click += NewSwitchBfres;
-                newFileExt[1] = new STToolStripItem("BFRES (Wii U)");
-                newFileExt[1].Click += NewWiiUBfres;
+                editExt[0] = new STToolStripItem("Use Advanced Editor As Default", AdvancedEditor);
+                toolExt[0] = new STToolStripItem("Open Bfres Debugger", DebugInfo);
+                newFileExt[0] = new STToolStripItem("BFRES (Switch)", NewSwitchBfres);
+                newFileExt[1] = new STToolStripItem("BFRES (Wii U)", NewWiiUBfres);
 
                 editExt[0].Checked = !PluginRuntime.UseSimpleBfresEditor;
             }
+
             private void AdvancedEditor(object sender, EventArgs args)
             {
                 BFRES file = null;
@@ -306,30 +302,128 @@ namespace FirstPlugin
         List<AbstractGlDrawable> drawables = new List<AbstractGlDrawable>();
         public void LoadEditors(object SelectedSection)
         {
+            BfresEditor bfresEditor = (BfresEditor)LibraryGUI.Instance.GetActiveContent(typeof(BfresEditor));
+            bool HasModels = BFRESRender.models.Count > 0;
+
+            if (bfresEditor == null)
+            {
+                bfresEditor = new BfresEditor(HasModels);
+                bfresEditor.Dock = DockStyle.Fill;
+                LibraryGUI.Instance.LoadEditor(bfresEditor);
+            }
+
+            if (SelectedSection is FTEX)
+            {
+                ImageEditorBase editorFtex = (ImageEditorBase)bfresEditor.GetActiveEditor(typeof(ImageEditorBase));
+                if (editorFtex == null)
+                {
+                    editorFtex = new ImageEditorBase();
+                    editorFtex.Dock = DockStyle.Fill;
+
+                    bfresEditor.LoadEditor(editorFtex);
+                }
+                editorFtex.Text = Text;
+                editorFtex.LoadProperties(((FTEX)SelectedSection).texture);
+                editorFtex.LoadImage((FTEX)SelectedSection);
+                if (Runtime.DisplayViewport)
+                    editorFtex.SetEditorOrientation(true);
+
+                if (((FTEX)SelectedSection).texture.UserData != null)
+                {
+                    UserDataEditor userEditor = (UserDataEditor)editorFtex.GetActiveTabEditor(typeof(UserDataEditor));
+                    if (userEditor == null)
+                    {
+                        userEditor = new UserDataEditor();
+                        userEditor.Name = "User Data";
+                        editorFtex.AddCustomControl(userEditor, typeof(UserDataEditor));
+                    }
+                    userEditor.LoadUserData(((FTEX)SelectedSection).texture.UserData);
+                }
+                return;
+            }
+
+            if (SelectedSection is TextureData)
+            {
+                ImageEditorBase editor = (ImageEditorBase)bfresEditor.GetActiveEditor(typeof(ImageEditorBase));
+                if (editor == null)
+                {
+                    editor = new ImageEditorBase();
+                    editor.Dock = DockStyle.Fill;
+                    bfresEditor.LoadEditor(editor);
+                }
+                if (((TextureData)SelectedSection).Texture.UserData != null)
+                {
+                    UserDataEditor userEditor = (UserDataEditor)editor.GetActiveTabEditor(typeof(UserDataEditor));
+                    if (userEditor == null)
+                    {
+                        userEditor = new UserDataEditor();
+                        userEditor.Name = "User Data";
+                        editor.AddCustomControl(userEditor, typeof(UserDataEditor));
+                    }
+                    userEditor.LoadUserData(((TextureData)SelectedSection).Texture.UserData.ToList());
+                }
+
+                editor.Text = Text;
+                if (Runtime.DisplayViewport)
+                    editor.SetEditorOrientation(true);
+
+                editor.LoadProperties(((TextureData)SelectedSection).Texture);
+                editor.LoadImage((TextureData)SelectedSection);
+                return;
+            }
+
+            if (SelectedSection is BNTX)
+            {
+                STPropertyGrid editor = (STPropertyGrid)bfresEditor.GetActiveEditor(typeof(STPropertyGrid));
+                if (editor == null)
+                {
+                    editor = new STPropertyGrid();
+                    editor.Dock = DockStyle.Fill;
+                    bfresEditor.LoadEditor(editor);
+                }
+                editor.LoadProperty(((BNTX)SelectedSection).BinaryTexFile, OnPropertyChanged);
+                return;
+            }
+
+            if (SelectedSection is ExternalFileData)
+            {
+                HexEditor editor = (HexEditor)bfresEditor.GetActiveEditor(typeof(HexEditor));
+                if (editor == null)
+                {
+                    editor = new HexEditor();
+                    editor.Dock = DockStyle.Fill;
+                    bfresEditor.LoadEditor(editor);
+                }
+                editor.Text = Text;
+                editor.LoadData(((ExternalFileData)SelectedSection).Data);
+                return;
+            }
+
             bool IsSimpleEditor = PluginRuntime.UseSimpleBfresEditor;
 
             if (IsSimpleEditor)
             {
                 if (SelectedSection is MatTextureWrapper)
                 {
-                    SamplerEditorSimple editorT = (SamplerEditorSimple)LibraryGUI.Instance.GetActiveContent(typeof(SamplerEditorSimple));
+                    SamplerEditorSimple editorT = (SamplerEditorSimple)bfresEditor.GetActiveEditor(typeof(SamplerEditorSimple));
                     if (editorT == null)
                     {
                         editorT = new SamplerEditorSimple();
                         editorT.Dock = DockStyle.Fill;
-                        LibraryGUI.Instance.LoadEditor(editorT);
+                        bfresEditor.LoadEditor(editorT);
                     }
                     editorT.Text = Text;
                     editorT.LoadTexture(((MatTextureWrapper)SelectedSection).textureMap);
                     return;
                 }
+           
 
-                STPropertyGrid editor = (STPropertyGrid)LibraryGUI.Instance.GetActiveContent(typeof(STPropertyGrid));
+                STPropertyGrid editor = (STPropertyGrid)bfresEditor.GetActiveEditor(typeof(STPropertyGrid));
                 if (editor == null)
                 {
                     editor = new STPropertyGrid();
                     editor.Dock = DockStyle.Fill;
-                    LibraryGUI.Instance.LoadEditor(editor);
+                    bfresEditor.LoadEditor(editor);
                 }
                 editor.Text = Text;
 
@@ -391,17 +485,6 @@ namespace FirstPlugin
             }
             else
             {
-                BfresEditor bfresEditor = (BfresEditor)LibraryGUI.Instance.GetActiveContent(typeof(BfresEditor));
-
-                bool HasModels = BFRESRender.models.Count > 0;
-
-                if (bfresEditor == null)
-                {
-                    bfresEditor = new BfresEditor(HasModels);
-                    bfresEditor.Dock = DockStyle.Fill;
-                    LibraryGUI.Instance.LoadEditor(bfresEditor);
-                }
-
                 var toolstrips = new List<ToolStripMenuItem>();
                 var menu = new ToolStripMenuItem("Animation Loader", null, AnimLoader);
 

Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/ExternalFiles.cs

@@ -34,15 +34,7 @@ namespace Bfres.Structs
 
         private void UpdateEditor()
         {
-            HexEditor editor = (HexEditor)LibraryGUI.Instance.GetActiveContent(typeof(HexEditor));
-            if (editor == null)
-            {
-                editor = new HexEditor();
-                editor.Dock = DockStyle.Fill;
-                LibraryGUI.Instance.LoadEditor(editor);
-            }
-            editor.Text = Text;
-            editor.LoadData(Data);
+            ((BFRES)Parent.Parent).LoadEditors(this);
         }
         
         public override void Replace(string FileName)

Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs

@@ -615,6 +615,12 @@ namespace Bfres.Structs
         }
         public void UpdateEditor()
         {
+            if (Parent != null && Parent.Parent != null && Parent.Parent is BFRES)
+            {
+                ((BFRES)Parent.Parent).LoadEditors(this);
+                return;
+            }
+
             ImageEditorBase editor = (ImageEditorBase)LibraryGUI.Instance.GetActiveContent(typeof(ImageEditorBase));
             if (editor == null)
             {

Switch_FileFormatsMain/FileFormats/Collision/KCL.cs

@@ -98,6 +98,7 @@ namespace FirstPlugin
             public STToolStripItem[] CompressionMenuExtensions => null;
             public STToolStripItem[] ExperimentalMenuExtensions => null;
             public STToolStripItem[] EditMenuExtensions => null;
+            public ToolStripButton[] IconButtonMenuExtensions => null;
 
             STToolStripItem[] newFileExt = new STToolStripItem[2];
 

Switch_FileFormatsMain/FileFormats/Effects/PCTL.cs

@@ -429,24 +429,27 @@ namespace FirstPlugin
 
                 public override void Replace(string FileName)
                 {
+                    int size = data.Length;
+
                     FTEX ftex = new FTEX();
                     ftex.ReplaceTexture(FileName, MipCount, SupportedFormats, true, true, true, Format);
                     if (ftex.texture != null)
                     {
                         byte[] ImageData = ftex.texture.Data;
 
+
                         if (ftex.texture.MipData != null)
                             ImageData = Utils.CombineByteArray(ftex.texture.Data, ftex.texture.MipData);
 
-                        ImageData = AlignData(ImageData);
-
-                        if (ImageData.Length != ImageSize)
-                            throw new Exception($"Image size does not match! Make sure mip map count, format, height and width are all the same! Original Size {ImageSize} Import {ImageData.Length}");
+                      //  if (ImageData.Length != size)
+                           // MessageBox.Show($"Image size does not match! Make sure mip map count, format, height and width are all the same! Original Size {size} Import {ImageData.Length}", );
 
                         Swizzle = (byte)ftex.texture.Swizzle;
 
+                        byte[] NewData = new byte[size];
+                        Array.Copy(ImageData, 0, NewData, 0, size);
 
-                        data = ImageData;
+                        data = NewData;
 
                         UpdateEditor();
                     }

Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs

@@ -61,6 +61,7 @@ namespace FirstPlugin
             public STToolStripItem[] CompressionMenuExtensions => null;
             public STToolStripItem[] ExperimentalMenuExtensions => null;
             public STToolStripItem[] EditMenuExtensions => null;
+            public ToolStripButton[] IconButtonMenuExtensions => null;
 
             STToolStripItem[] toolExt = new STToolStripItem[1];
             STToolStripItem[] newFileExt = new STToolStripItem[1];
@@ -221,6 +222,12 @@ namespace FirstPlugin
         }
         public override void OnClick(TreeView treeView)
         {
+            if (Parent != null && Parent is BFRES)
+            {
+                ((BFRES)Parent).LoadEditors(this);
+                return;
+            }
+
             STPropertyGrid editor = (STPropertyGrid)LibraryGUI.Instance.GetActiveContent(typeof(STPropertyGrid));
             if (editor == null)
             {
@@ -945,6 +952,12 @@ namespace FirstPlugin
 
         public void UpdateEditor()
         {
+            if (Parent != null && Parent.Parent != null && Parent.Parent is BFRES)
+            {
+                ((BFRES)Parent.Parent).LoadEditors(this);
+                return;
+            }
+
             ImageEditorBase editor = (ImageEditorBase)LibraryGUI.Instance.GetActiveContent(typeof(ImageEditorBase));
             if (editor == null)
             {

Switch_FileFormatsMain/FileFormats/Texture/NUTEXB.cs

@@ -240,6 +240,7 @@ namespace FirstPlugin
             public STToolStripItem[] CompressionMenuExtensions => null;
             public STToolStripItem[] ExperimentalMenuExtensions => null;
             public STToolStripItem[] EditMenuExtensions => null;
+            public ToolStripButton[] IconButtonMenuExtensions => null;
 
             STToolStripItem[] toolExt = new STToolStripItem[1];
             public MenuExt()

Switch_FileFormatsMain/GUI/AAMP/AampEditor.Designer.cs

@@ -0,0 +1,272 @@
+namespace FirstPlugin.Forms
+{
+    partial class AampEditorBase
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.treeView1 = new System.Windows.Forms.TreeView();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.listViewCustom1 = new Switch_Toolbox.Library.Forms.ListViewCustom();
+            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.stButton1 = new Switch_Toolbox.Library.Forms.STButton();
+            this.stButton2 = new Switch_Toolbox.Library.Forms.STButton();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
+            this.addItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.renameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.stContextMenuStrip1 = new Switch_Toolbox.Library.Forms.STContextMenuStrip(this.components);
+            this.contentContainer.SuspendLayout();
+            this.contextMenuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.stPanel1.SuspendLayout();
+            this.stContextMenuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // contentContainer
+            // 
+            this.contentContainer.Controls.Add(this.stPanel1);
+            this.contentContainer.Controls.Add(this.stButton2);
+            this.contentContainer.Controls.Add(this.stButton1);
+            this.contentContainer.Paint += new System.Windows.Forms.PaintEventHandler(this.contentContainer_Paint);
+            this.contentContainer.Controls.SetChildIndex(this.stButton1, 0);
+            this.contentContainer.Controls.SetChildIndex(this.stButton2, 0);
+            this.contentContainer.Controls.SetChildIndex(this.stPanel1, 0);
+            // 
+            // treeView1
+            // 
+            this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.treeView1.ContextMenuStrip = this.contextMenuStrip1;
+            this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.treeView1.Location = new System.Drawing.Point(0, 0);
+            this.treeView1.Name = "treeView1";
+            this.treeView1.Size = new System.Drawing.Size(179, 334);
+            this.treeView1.TabIndex = 0;
+            this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripSeparator1,
+            this.saveAsToolStripMenuItem,
+            this.toolStripSeparator2});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(119, 38);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(115, 6);
+            // 
+            // saveAsToolStripMenuItem
+            // 
+            this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
+            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
+            this.saveAsToolStripMenuItem.Text = "Save as..";
+            this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(115, 6);
+            // 
+            // listViewCustom1
+            // 
+            this.listViewCustom1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.listViewCustom1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2,
+            this.columnHeader3});
+            this.listViewCustom1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.listViewCustom1.FullRowSelect = true;
+            this.listViewCustom1.Location = new System.Drawing.Point(0, 0);
+            this.listViewCustom1.Name = "listViewCustom1";
+            this.listViewCustom1.OwnerDraw = true;
+            this.listViewCustom1.Size = new System.Drawing.Size(354, 334);
+            this.listViewCustom1.TabIndex = 0;
+            this.listViewCustom1.UseCompatibleStateImageBehavior = false;
+            this.listViewCustom1.View = System.Windows.Forms.View.Details;
+            this.listViewCustom1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listViewCustom1_MouseClick);
+            // 
+            // columnHeader1
+            // 
+            this.columnHeader1.Text = "Name";
+            this.columnHeader1.Width = 114;
+            // 
+            // columnHeader2
+            // 
+            this.columnHeader2.Text = "Type";
+            this.columnHeader2.Width = 93;
+            // 
+            // columnHeader3
+            // 
+            this.columnHeader3.Text = "Data";
+            this.columnHeader3.Width = 136;
+            // 
+            // stButton1
+            // 
+            this.stButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.stButton1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.stButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.stButton1.Location = new System.Drawing.Point(462, 367);
+            this.stButton1.Name = "stButton1";
+            this.stButton1.Size = new System.Drawing.Size(75, 23);
+            this.stButton1.TabIndex = 12;
+            this.stButton1.Text = "Cancel";
+            this.stButton1.UseVisualStyleBackColor = false;
+            // 
+            // stButton2
+            // 
+            this.stButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.stButton2.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.stButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.stButton2.Location = new System.Drawing.Point(366, 367);
+            this.stButton2.Name = "stButton2";
+            this.stButton2.Size = new System.Drawing.Size(75, 23);
+            this.stButton2.TabIndex = 13;
+            this.stButton2.Text = "Save";
+            this.stButton2.UseVisualStyleBackColor = false;
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.treeView1);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.listViewCustom1);
+            this.splitContainer1.Size = new System.Drawing.Size(537, 334);
+            this.splitContainer1.SplitterDistance = 179;
+            this.splitContainer1.TabIndex = 14;
+            // 
+            // stPanel1
+            // 
+            this.stPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.stPanel1.Controls.Add(this.splitContainer1);
+            this.stPanel1.Location = new System.Drawing.Point(3, 27);
+            this.stPanel1.Name = "stPanel1";
+            this.stPanel1.Size = new System.Drawing.Size(537, 334);
+            this.stPanel1.TabIndex = 15;
+            // 
+            // addItemToolStripMenuItem
+            // 
+            this.addItemToolStripMenuItem.Name = "addItemToolStripMenuItem";
+            this.addItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.addItemToolStripMenuItem.Text = "Add Item";
+            this.addItemToolStripMenuItem.Click += new System.EventHandler(this.addNodeToolStripMenuItem_Click);
+            // 
+            // editToolStripMenuItem
+            // 
+            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.editToolStripMenuItem.Text = "Edit";
+            this.editToolStripMenuItem.Click += new System.EventHandler(this.editValueNodeMenuItem_Click);
+            // 
+            // renameToolStripMenuItem
+            // 
+            this.renameToolStripMenuItem.Name = "renameToolStripMenuItem";
+            this.renameToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.renameToolStripMenuItem.Text = "Rename";
+            this.renameToolStripMenuItem.Click += new System.EventHandler(this.renameToolStripMenuItem_Click);
+            // 
+            // deleteToolStripMenuItem
+            // 
+            this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
+            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.deleteToolStripMenuItem.Text = "Delete";
+            this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
+            // 
+            // stContextMenuStrip1
+            // 
+            this.stContextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.addItemToolStripMenuItem,
+            this.editToolStripMenuItem,
+            this.renameToolStripMenuItem,
+            this.deleteToolStripMenuItem});
+            this.stContextMenuStrip1.Name = "stContextMenuStrip1";
+            this.stContextMenuStrip1.Size = new System.Drawing.Size(181, 114);
+            this.stContextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.stContextMenuStrip1_Opening);
+            // 
+            // AampEditorBase
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(549, 398);
+            this.Name = "AampEditorBase";
+            this.Text = "AampEditor";
+            this.Controls.SetChildIndex(this.contentContainer, 0);
+            this.contentContainer.ResumeLayout(false);
+            this.contextMenuStrip1.ResumeLayout(false);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.stPanel1.ResumeLayout(false);
+            this.stContextMenuStrip1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.TreeView treeView1;
+        public Switch_Toolbox.Library.Forms.ListViewCustom listViewCustom1;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private Switch_Toolbox.Library.Forms.STButton stButton2;
+        private Switch_Toolbox.Library.Forms.STButton stButton1;
+        private System.Windows.Forms.ColumnHeader columnHeader1;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+        private System.Windows.Forms.ColumnHeader columnHeader3;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private Switch_Toolbox.Library.Forms.STPanel stPanel1;
+        private System.Windows.Forms.ToolStripMenuItem addItemToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem renameToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
+        private Switch_Toolbox.Library.Forms.STContextMenuStrip stContextMenuStrip1;
+    }
+}

Switch_FileFormatsMain/GUI/AAMP/AampEditor.cs

@@ -0,0 +1,158 @@
+using ByamlExt.Byaml;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Syroot.BinaryData;
+using EditorCore;
+using Switch_Toolbox.Library.Forms;
+using Switch_Toolbox.Library;
+using ByamlExt;
+
+namespace FirstPlugin.Forms
+{
+    public partial class AampEditorBase : STForm, IFIleEditor
+    {
+        public AAMP AampFile;
+
+        public List<IFileFormat> GetFileFormats()
+        {
+            return new List<IFileFormat>() { AampFile };
+        }
+
+        public AampEditorBase(AAMP aamp, bool IsSaveDialog)
+        {
+            InitializeComponent();
+
+            treeView1.BackColor = FormThemes.BaseTheme.FormBackColor;
+            treeView1.ForeColor = FormThemes.BaseTheme.FormForeColor;
+
+            AampFile = aamp;
+
+            if (AampFile.aampFileV1 != null)
+            {
+                Text = $"{AampFile.FileName} Type [{AampFile.aampFileV1.EffectType}]";
+            }
+            else
+            {
+                Text = $"{AampFile.FileName} Type [{AampFile.aampFileV2.EffectType}]";
+            }
+
+            if (!IsSaveDialog)
+            {
+                stButton1.Visible = false;
+                stButton2.Visible = false;
+                stPanel1.Dock = DockStyle.Fill;
+            }
+        }
+
+        private void CopyNode_Click(object sender, EventArgs e)
+        {
+            Clipboard.SetText(treeView1.SelectedNode.Text);
+        }
+
+        private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            SaveFileDialog sav = new SaveFileDialog() { FileName = AampFile.FileName, Filter = "Parameter Archive | *.aamp" };
+            if (sav.ShowDialog() == DialogResult.OK)
+            {
+                File.WriteAllBytes(sav.FileName, AampFile.Save());
+            }
+        }
+
+        private void editValueNodeMenuItem_Click(object sender, EventArgs e)
+        {
+            if (listViewCustom1.SelectedItems.Count <= 0)
+                return;
+
+            OnEditorClick(listViewCustom1.SelectedItems[0]);
+        }
+
+        private void ResetValues()
+        {
+            if (treeView1.SelectedNode == null)
+                return;
+
+            listViewCustom1.Items.Clear();
+
+            var targetNodeCollection = treeView1.SelectedNode.Nodes;
+
+            dynamic target = treeView1.SelectedNode.Tag;
+        }
+
+        private void treeView1_AfterSelect(object sender, TreeViewEventArgs e) {
+            ResetValues();
+            TreeView_AfterSelect();
+        }
+
+        private void addNodeToolStripMenuItem_Click(object sender, EventArgs e) {
+            if (treeView1.SelectedNode == null)
+                return;
+
+            AddParamEntry(treeView1.SelectedNode);
+        }
+
+        public virtual void OnEditorClick(ListViewItem SelectedItem) { }
+        public virtual void TreeView_AfterSelect() { }
+        public virtual void AddParamEntry(TreeNode parent) { }
+        public virtual void RenameParamEntry(ListViewItem SelectedItem) { }
+        public virtual void OnEntryDeletion(object target, TreeNode parent) { }
+
+        private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (listViewCustom1.SelectedItems.Count <= 0 && treeView1.SelectedNode != null) 
+                return;
+
+            var result = MessageBox.Show("Are you sure you want to remove this entry? This cannot be undone!",
+                $"Entry {listViewCustom1.SelectedItems[0].Text}", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
+            if (result == DialogResult.Yes)
+            {
+                OnEntryDeletion(listViewCustom1.SelectedItems[0].Tag, treeView1.SelectedNode);
+
+                int index = listViewCustom1.Items.IndexOf(listViewCustom1.SelectedItems[0]);
+                listViewCustom1.Items.RemoveAt(index);
+            }
+        }
+
+        private void renameToolStripMenuItem_Click(object sender, EventArgs e) {
+            if (listViewCustom1.SelectedItems.Count <= 0)
+                return;
+
+            RenameParamEntry(listViewCustom1.SelectedItems[0]);
+        }
+
+        private void deleteNodeToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (treeView1.SelectedNode == null)
+            {
+                return;
+            }
+        }
+
+        private void contentContainer_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
+
+        private void listViewCustom1_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right)
+            {
+                Point pt = listViewCustom1.PointToScreen(e.Location);
+                stContextMenuStrip1.Show(pt);
+            }
+        }
+
+        private void stContextMenuStrip1_Opening(object sender, CancelEventArgs e)
+        {
+
+        }
+    }
+}

Switch_FileFormatsMain/GUI/AAMP/AampEditor.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="stContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>172, 17</value>
+  </metadata>
+</root>

Switch_FileFormatsMain/GUI/AAMP/AampV1Editor.Designer.cs

@@ -1,37 +0,0 @@
-namespace FirstPlugin.Forms
-{
-    partial class AampV1Editor
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-        }
-
-        #endregion
-    }
-}

Switch_FileFormatsMain/GUI/AAMP/AampV1Editor.cs

@@ -10,28 +10,23 @@ using System.Windows.Forms;
 using AampV1Library;
 using Syroot.Maths;
 using Switch_Toolbox.Library;
+using Switch_Toolbox.Library.Forms;
 
 namespace FirstPlugin.Forms
 {
-    public partial class AampV1Editor : UserControl
+    public partial class AampV1Editor : AampEditorBase
     {
-        public AampV1Editor()
+        public AampV1Editor(AAMP aamp, bool IsSaveDialog) : base(aamp, IsSaveDialog)
         {
-            InitializeComponent();
+            treeView1.Nodes.Add(aamp.FileName);
+            LoadFile(aamp.aampFileV1, treeView1.Nodes[0]);
         }
 
         public void LoadImages(TreeView treeView, TreeNode parentNode)
         {
             foreach (TreeNode nodes in TreeViewExtensions.Collect(parentNode.Nodes))
             {
-                if (nodes is EditableEntry)
-                {
-                    if (((EditableEntry)nodes).entry.ParamType == ParamType.Color4F)
-                    {
-                        nodes.ImageIndex += treeView.ImageList.Images.Count;
-                        nodes.SelectedImageIndex = nodes.ImageIndex;
-                    }
-                }
+
             }
 
             foreach (var image in Images)
@@ -43,10 +38,147 @@ namespace FirstPlugin.Forms
             LoadChildNodes(aampFile.RootNode, parentNode);
         }
 
+        public override void TreeView_AfterSelect()
+        {
+            var node = treeView1.SelectedNode;
+
+            if (node.Tag != null)
+            {
+                if (node.Tag is ParamObject) {
+                    LoadObjectDataList((ParamObject)node.Tag);
+                }
+            }
+        }
+
+        public override void AddParamEntry(TreeNode parentNode)
+        {
+            if (parentNode.Tag != null && parentNode.Tag is ParamObject)
+            {
+                ParamEntry entry = new ParamEntry();
+                entry.ParamType = ParamType.Float;
+                entry.HashString = "NewEntry";
+                entry.Value = 0;
+
+                ListViewItem item = new ListViewItem();
+                SetListItemParamObject(entry, item);
+
+                OpenNewParamEditor(entry,(ParamObject)parentNode.Tag, item);
+            }
+        }
+
+        public override void RenameParamEntry(ListViewItem SelectedItem)
+        {
+            if (SelectedItem.Tag != null && SelectedItem.Tag is ParamEntry)
+            {
+                RenameDialog dialog = new RenameDialog();
+                dialog.SetString(SelectedItem.Text);
+                if (dialog.ShowDialog() == DialogResult.OK)
+                {
+                    string NewString = dialog.textBox1.Text;
+
+                    ((ParamEntry)SelectedItem.Tag).HashString = NewString;
+                }
+            }
+        }
+
+        public override void OnEditorClick(ListViewItem SelectedItem)
+        {
+            if (SelectedItem.Tag != null && SelectedItem.Tag is ParamEntry)
+            {
+                OpenEditor((ParamEntry)SelectedItem.Tag, SelectedItem);
+            }
+        }
+
+        private void LoadObjectDataList(ParamObject paramObj)
+        {
+            listViewCustom1.Items.Clear();
+            foreach (var entry in paramObj.paramEntries)
+            {
+                ListViewItem item = new ListViewItem(entry.HashString);
+                SetListItemParamObject(entry, item);
+                listViewCustom1.Items.Add(item);
+            }
+        }
+
+        private void SetListItemParamObject(ParamEntry entry, ListViewItem item)
+        {
+            item.Text = entry.HashString;
+            item.Tag = entry;
+            item.SubItems.Add(entry.ParamType.ToString());
+            string ValueText = "";
+
+            System.Drawing.Color color = System.Drawing.Color.Empty;
+
+            switch (entry.ParamType)
+            {
+                case ParamType.Boolean:
+                case ParamType.Float:
+                case ParamType.Int:
+                case ParamType.Uint:
+                    ValueText = $"{entry.Value}";
+                    break;
+                case ParamType.String64:
+                case ParamType.String32:
+                case ParamType.String256:
+                case ParamType.StringRef:
+                    string enocdedString = Encoding.UTF8.GetString((byte[])entry.Value);
+                    ValueText = $"{enocdedString}";
+                    break;
+                case ParamType.Vector2F:
+                    var vec2 = (Vector2F)entry.Value;
+                    ValueText = $"{vec2.X} {vec2.Y}";
+                    break;
+                case ParamType.Vector3F:
+                    var vec3 = (Vector3F)entry.Value;
+                    ValueText = $"{vec3.X} {vec3.Y} {vec3.Z}";
+                    break;
+                case ParamType.Vector4F:
+                    var vec4 = (Vector4F)entry.Value;
+                    ValueText = $"{vec4.X} {vec4.Y} {vec4.Z} {vec4.W}";
+                    break;
+                case ParamType.Color4F:
+                    var col = (Vector4F)entry.Value;
+                    ValueText = $"{col.X} {col.Y} {col.Z} {col.W}";
+
+                    int ImageIndex = Images.Count;
+
+                    color = System.Drawing.Color.FromArgb(
+                    EditBox.FloatToIntClamp(col.W),
+                    EditBox.FloatToIntClamp(col.X),
+                    EditBox.FloatToIntClamp(col.Y),
+                    EditBox.FloatToIntClamp(col.Z));
+                    break;
+                default:
+                    break;
+            }
+
+            if (color != System.Drawing.Color.Empty)
+                item.SubItems.Add(new ListViewItem.ListViewSubItem(item, ValueText, item.ForeColor, color, item.Font));
+            else
+                item.SubItems.Add(ValueText);
+        }
+
+        public override void OnEntryDeletion(object obj, TreeNode objNode)
+        {
+            if (obj is ParamEntry)
+            {
+                var paramObjectParent = (ParamObject)objNode.Tag;
+
+                var entryList = new List<ParamEntry>();
+                for (int i = 0; i < paramObjectParent.paramEntries.Length; i++)
+                    entryList.Add(paramObjectParent.paramEntries[i]);
+
+                entryList.Remove((ParamEntry)obj);
+
+                paramObjectParent.paramEntries = entryList.ToArray();
+            }
+        }
+
         public void LoadChildNodes(ParamList paramList, TreeNode parentNode)
         {
             TreeNode newNode = new TreeNode(paramList.HashString);
-     
+            newNode.Tag = paramList;
+
             parentNode.Nodes.Add(newNode);
 
             //Add lists and objects if exits
@@ -72,117 +204,41 @@ namespace FirstPlugin.Forms
             string groupName = paramObj.GroupHashString;
 
             var objNode = new TreeNode(name);
+            objNode.Tag = paramObj;
             parentNode.Nodes.Add(objNode);
+        }
 
-            foreach (var entry in paramObj.paramEntries)
+        private void OpenNewParamEditor(ParamEntry entry, ParamObject paramObject, ListViewItem SelectedItem)
+        {
+            EditBox editor = new EditBox();
+            editor.LoadEntry(entry);
+            editor.ToggleNameEditing(true);
+
+            if (editor.ShowDialog() == DialogResult.OK)
             {
-                var entryNode = new EditableEntry($"{entry.HashString}");
-                entryNode.ImageIndex = 0;
-                entryNode.ImageKey = "empty";
-                entryNode.SelectedImageKey = "empty";
+                editor.SaveEntry();
+                SetListItemParamObject(entry, SelectedItem);
+                listViewCustom1.Items.Add(SelectedItem);
 
-                switch (entry.ParamType)
-                {
-                    case ParamType.Boolean:
-                    case ParamType.Float:
-                    case ParamType.Int:
-                    case ParamType.Uint:
-                    case ParamType.String64:
-                    case ParamType.String32:
-                    case ParamType.String256:
-                    case ParamType.StringRef:
-                        entryNode.Text = $"{entry.HashString} {entry.Value}";
-                        break;
-                    case ParamType.Vector2F:
-                        var vec2 = (Vector2F)entry.Value;
-                        entryNode.Text = $"{entry.HashString} {vec2.X} {vec2.Y}";
-                        break;
-                    case ParamType.Vector3F:
-                        var vec3 = (Vector3F)entry.Value;
-                        entryNode.Text = $"{entry.HashString} {vec3.X} {vec3.Y} {vec3.Z}";
-                        break;
-                    case ParamType.Vector4F:
-                        var vec4 = (Vector4F)entry.Value;
-                        entryNode.Text = $"{entry.HashString} {vec4.X} {vec4.Y} {vec4.Z} {vec4.W}";
-                        break;
-                    case ParamType.Color4F:
-                        var col = (Vector4F)entry.Value;
-                        entryNode.Text = $"{entry.HashString} {col.X} {col.Y} {col.Z} {col.W}";
+                var entryList = new List<ParamEntry>();
+                for (int i = 0; i < paramObject.paramEntries.Length; i++)
+                    entryList.Add(paramObject.paramEntries[i]);
 
-                        int ImageIndex = Images.Count;
-                        entryNode.ImageIndex = ImageIndex;
-
-                        var color = System.Drawing.Color.FromArgb(
-                        EditBox.FloatToIntClamp(col.W),
-                        EditBox.FloatToIntClamp(col.X),
-                        EditBox.FloatToIntClamp(col.Y),
-                        EditBox.FloatToIntClamp(col.Z));
-
-                        Bitmap bmp = new Bitmap(32, 32);
-                        Graphics g = Graphics.FromImage(bmp);
-                        g.Clear(color);
-
-                        Images.Add(bmp);
-                        break;
-                    default:
-                        break;
-                }
-
-                entryNode.entry = entry;
-                objNode.Nodes.Add(entryNode);
+                entryList.Add(entry);
+                paramObject.paramEntries = entryList.ToArray();
             }
         }
 
-        public class EditableEntry : TreeNode
+        private void OpenEditor(ParamEntry entry, ListViewItem SelectedItem)
         {
-            public ParamEntry entry;
-            public EditableEntry(string name)
+            EditBox editor = new EditBox();
+            editor.LoadEntry(entry);
+            editor.ToggleNameEditing(true);
+
+            if (editor.ShowDialog() == DialogResult.OK)
             {
-                Text = name;
-
-                ContextMenu = new ContextMenu();
-                ContextMenu.MenuItems.Add(new MenuItem("Edit", OpenEditor));
-            }
-
-            private void OpenEditor(object sender, EventArgs e)
-            {
-                EditBox editor = new EditBox();
-                editor.LoadEntry(entry);
-
-                if (editor.ShowDialog() == DialogResult.OK)
-                {
-                    editor.SaveEntry();
-
-                    switch (entry.ParamType)
-                    {
-                        case ParamType.Boolean:
-                        case ParamType.Float:
-                        case ParamType.Int:
-                        case ParamType.Uint:
-                        case ParamType.String64:
-                        case ParamType.String32:
-                        case ParamType.String256:
-                        case ParamType.StringRef:
-                            Text = $"{entry.HashString} {entry.Value}";
-                            break;
-                        case ParamType.Vector2F:
-                            var vec2 = (Vector2F)entry.Value;
-                            Text = $"{entry.HashString} {vec2.X} {vec2.Y}";
-                            break;
-                        case ParamType.Vector3F:
-                            var vec3 = (Vector3F)entry.Value;
-                            Text = $"{entry.HashString} {vec3.X} {vec3.Y} {vec3.Z}";
-                            break;
-                        case ParamType.Vector4F:
-                            var vec4 = (Vector4F)entry.Value;
-                            Text = $"{entry.HashString} {vec4.X} {vec4.Y} {vec4.Z} {vec4.W}";
-                            break;
-                        case ParamType.Color4F:
-                            var col = (Vector4F)entry.Value;
-                            Text = $"{entry.HashString} {col.X} {col.Y} {col.Z} {col.W}";
-                            break;
-                    }
-                }
+                editor.SaveEntry();
+                SetListItemParamObject(entry, SelectedItem);
             }
         }
     }

Switch_FileFormatsMain/GUI/AAMP/AampV2Editor.Designer.cs

@@ -1,37 +0,0 @@
-namespace FirstPlugin.Forms
-{
-    partial class AampV2Editor
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-        }
-
-        #endregion
-    }
-}

Switch_FileFormatsMain/GUI/AAMP/AampV2Editor.cs

@@ -13,11 +13,10 @@ using Switch_Toolbox.Library;
 
 namespace FirstPlugin.Forms
 {
-    public partial class AampV2Editor : UserControl
+    public partial class AampV2Editor : AampEditorBase
     {
-        public AampV2Editor()
+        public AampV2Editor(AAMP aamp, bool IsSaveDialog) : base (aamp, IsSaveDialog)
         {
-            InitializeComponent();
         }
 
         public void LoadFile(AampFile aampFile, TreeNode parentNode)

Switch_FileFormatsMain/GUI/AAMP/EditBox.cs

@@ -23,6 +23,11 @@ namespace FirstPlugin.Forms
                 typeCB.Items.Add(type);
         }
 
+        public void ToggleNameEditing(bool CanEdit)
+        {
+            nameTB.Enabled = CanEdit;
+        }
+
         ParamEntry paramEntry;
         Aampv2.ParamEntry paramEntryV2;
 
@@ -82,6 +87,9 @@ namespace FirstPlugin.Forms
         {
             paramEntry.ParamType = (ParamType)typeCB.SelectedItem;
 
+            if (nameTB.Enabled)
+                paramEntry.HashString = nameTB.Text;
+
             switch (paramEntry.ParamType)
             {
                 case ParamType.Boolean:

Switch_FileFormatsMain/GUI/BFRES/BfresEditor.Designer.cs

@@ -28,31 +28,25 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BfresEditor));
             this.stPanel2 = new Switch_Toolbox.Library.Forms.STPanel();
+            this.stToolStrip1 = new Switch_Toolbox.Library.Forms.STToolStrip();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitter1 = new System.Windows.Forms.Splitter();
             this.stPanel3 = new Switch_Toolbox.Library.Forms.STPanel();
-            this.stTabControl1 = new Switch_Toolbox.Library.Forms.STTabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.pictureBoxCustom1 = new Switch_Toolbox.Library.Forms.PictureBoxCustom();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.stPanel5 = new Switch_Toolbox.Library.Forms.STPanel();
+            this.splitter1 = new System.Windows.Forms.Splitter();
             this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
             this.stTabControl2 = new Switch_Toolbox.Library.Forms.STTabControl();
             this.timelineTabPage = new System.Windows.Forms.TabPage();
             this.tabPage4 = new System.Windows.Forms.TabPage();
             this.tabPage5 = new System.Windows.Forms.TabPage();
             this.textureLoader1 = new Forms.TextureLoader();
+            this.stPanel5 = new Switch_Toolbox.Library.Forms.STPanel();
+            this.toggleViewportToolStripBtn = new System.Windows.Forms.ToolStripButton();
             this.stPanel2.SuspendLayout();
+            this.stToolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.SuspendLayout();
             this.stPanel3.SuspendLayout();
-            this.stTabControl1.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCustom1)).BeginInit();
-            this.tabPage2.SuspendLayout();
             this.stPanel1.SuspendLayout();
             this.stTabControl2.SuspendLayout();
             this.tabPage5.SuspendLayout();
@@ -60,6 +54,7 @@
             // 
             // stPanel2
             // 
+            this.stPanel2.Controls.Add(this.stToolStrip1);
             this.stPanel2.Controls.Add(this.splitContainer1);
             this.stPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.stPanel2.Location = new System.Drawing.Point(0, 0);
@@ -67,104 +62,58 @@
             this.stPanel2.Size = new System.Drawing.Size(712, 543);
             this.stPanel2.TabIndex = 4;
             // 
+            // stToolStrip1
+            // 
+            this.stToolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toggleViewportToolStripBtn});
+            this.stToolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.stToolStrip1.Name = "stToolStrip1";
+            this.stToolStrip1.Size = new System.Drawing.Size(712, 25);
+            this.stToolStrip1.TabIndex = 2;
+            this.stToolStrip1.Text = "stToolStrip1";
+            // 
             // splitContainer1
             // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.splitContainer1.Location = new System.Drawing.Point(0, 28);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.splitter1);
             this.splitContainer1.Panel1.Controls.Add(this.stPanel3);
-            this.splitContainer1.Panel1.Controls.Add(this.stPanel1);
-            this.splitContainer1.Size = new System.Drawing.Size(712, 543);
+            this.splitContainer1.Size = new System.Drawing.Size(712, 515);
             this.splitContainer1.SplitterDistance = 440;
             this.splitContainer1.TabIndex = 1;
             // 
+            // stPanel3
+            // 
+            this.stPanel3.Controls.Add(this.splitter1);
+            this.stPanel3.Controls.Add(this.stPanel1);
+            this.stPanel3.Controls.Add(this.stPanel5);
+            this.stPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.stPanel3.Location = new System.Drawing.Point(0, 0);
+            this.stPanel3.Name = "stPanel3";
+            this.stPanel3.Size = new System.Drawing.Size(440, 515);
+            this.stPanel3.TabIndex = 4;
+            // 
             // splitter1
             // 
             this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.splitter1.Location = new System.Drawing.Point(0, 354);
+            this.splitter1.Location = new System.Drawing.Point(0, 366);
             this.splitter1.Name = "splitter1";
             this.splitter1.Size = new System.Drawing.Size(440, 3);
-            this.splitter1.TabIndex = 5;
+            this.splitter1.TabIndex = 4;
             this.splitter1.TabStop = false;
             // 
-            // stPanel3
-            // 
-            this.stPanel3.Controls.Add(this.stTabControl1);
-            this.stPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.stPanel3.Location = new System.Drawing.Point(0, 0);
-            this.stPanel3.Name = "stPanel3";
-            this.stPanel3.Size = new System.Drawing.Size(440, 357);
-            this.stPanel3.TabIndex = 4;
-            // 
-            // stTabControl1
-            // 
-            this.stTabControl1.Controls.Add(this.tabPage1);
-            this.stTabControl1.Controls.Add(this.tabPage2);
-            this.stTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.stTabControl1.Location = new System.Drawing.Point(0, 0);
-            this.stTabControl1.myBackColor = System.Drawing.Color.Empty;
-            this.stTabControl1.Name = "stTabControl1";
-            this.stTabControl1.SelectedIndex = 0;
-            this.stTabControl1.Size = new System.Drawing.Size(440, 357);
-            this.stTabControl1.TabIndex = 0;
-            this.stTabControl1.SelectedIndexChanged += new System.EventHandler(this.stTabControl1_SelectedIndexChanged);
-            this.stTabControl1.TabIndexChanged += new System.EventHandler(this.stTabControl1_TabIndexChanged);
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.tabPage1.Controls.Add(this.pictureBoxCustom1);
-            this.tabPage1.Location = new System.Drawing.Point(4, 25);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(432, 328);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "Node Viewer";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // pictureBoxCustom1
-            // 
-            this.pictureBoxCustom1.BackColor = System.Drawing.Color.Transparent;
-            this.pictureBoxCustom1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBoxCustom1.BackgroundImage")));
-            this.pictureBoxCustom1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxCustom1.Image = global::FirstPlugin.Properties.Resources.GridBackground;
-            this.pictureBoxCustom1.Location = new System.Drawing.Point(3, 3);
-            this.pictureBoxCustom1.Name = "pictureBoxCustom1";
-            this.pictureBoxCustom1.Size = new System.Drawing.Size(426, 322);
-            this.pictureBoxCustom1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pictureBoxCustom1.TabIndex = 0;
-            this.pictureBoxCustom1.TabStop = false;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.stPanel5);
-            this.tabPage2.Location = new System.Drawing.Point(4, 25);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(432, 328);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "Model Viewer";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // stPanel5
-            // 
-            this.stPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.stPanel5.Location = new System.Drawing.Point(3, 3);
-            this.stPanel5.Name = "stPanel5";
-            this.stPanel5.Size = new System.Drawing.Size(426, 322);
-            this.stPanel5.TabIndex = 2;
-            // 
             // stPanel1
             // 
             this.stPanel1.Controls.Add(this.stTabControl2);
             this.stPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.stPanel1.Location = new System.Drawing.Point(0, 357);
+            this.stPanel1.Location = new System.Drawing.Point(0, 369);
             this.stPanel1.Name = "stPanel1";
-            this.stPanel1.Size = new System.Drawing.Size(440, 186);
+            this.stPanel1.Size = new System.Drawing.Size(440, 146);
             this.stPanel1.TabIndex = 3;
             this.stPanel1.DoubleClick += new System.EventHandler(this.stPanel1_DoubleClick);
             // 
@@ -178,7 +127,7 @@
             this.stTabControl2.myBackColor = System.Drawing.Color.Empty;
             this.stTabControl2.Name = "stTabControl2";
             this.stTabControl2.SelectedIndex = 0;
-            this.stTabControl2.Size = new System.Drawing.Size(440, 186);
+            this.stTabControl2.Size = new System.Drawing.Size(440, 146);
             this.stTabControl2.TabIndex = 0;
             // 
             // timelineTabPage
@@ -186,7 +135,7 @@
             this.timelineTabPage.Location = new System.Drawing.Point(4, 25);
             this.timelineTabPage.Name = "timelineTabPage";
             this.timelineTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.timelineTabPage.Size = new System.Drawing.Size(432, 157);
+            this.timelineTabPage.Size = new System.Drawing.Size(432, 117);
             this.timelineTabPage.TabIndex = 3;
             this.timelineTabPage.Text = "Timeline";
             this.timelineTabPage.UseVisualStyleBackColor = true;
@@ -196,7 +145,7 @@
             this.tabPage4.Location = new System.Drawing.Point(4, 25);
             this.tabPage4.Name = "tabPage4";
             this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage4.Size = new System.Drawing.Size(432, 157);
+            this.tabPage4.Size = new System.Drawing.Size(432, 117);
             this.tabPage4.TabIndex = 1;
             this.tabPage4.Text = "Console";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -207,7 +156,7 @@
             this.tabPage5.Location = new System.Drawing.Point(4, 25);
             this.tabPage5.Name = "tabPage5";
             this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage5.Size = new System.Drawing.Size(432, 157);
+            this.tabPage5.Size = new System.Drawing.Size(432, 117);
             this.tabPage5.TabIndex = 2;
             this.tabPage5.Text = "Textures";
             this.tabPage5.UseVisualStyleBackColor = true;
@@ -217,9 +166,27 @@
             this.textureLoader1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.textureLoader1.Location = new System.Drawing.Point(3, 3);
             this.textureLoader1.Name = "textureLoader1";
-            this.textureLoader1.Size = new System.Drawing.Size(426, 151);
+            this.textureLoader1.Size = new System.Drawing.Size(426, 111);
             this.textureLoader1.TabIndex = 0;
             // 
+            // stPanel5
+            // 
+            this.stPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.stPanel5.Location = new System.Drawing.Point(0, 0);
+            this.stPanel5.Name = "stPanel5";
+            this.stPanel5.Size = new System.Drawing.Size(440, 515);
+            this.stPanel5.TabIndex = 2;
+            // 
+            // toggleViewportToolStripBtn
+            // 
+            this.toggleViewportToolStripBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toggleViewportToolStripBtn.Image = global::FirstPlugin.Properties.Resources.ViewportIcon;
+            this.toggleViewportToolStripBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toggleViewportToolStripBtn.Name = "toggleViewportToolStripBtn";
+            this.toggleViewportToolStripBtn.Size = new System.Drawing.Size(23, 22);
+            this.toggleViewportToolStripBtn.Text = "toolStripButton1";
+            this.toggleViewportToolStripBtn.Click += new System.EventHandler(this.toggleViewportToolStripBtn_Click);
+            // 
             // BfresEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -228,14 +195,13 @@
             this.Name = "BfresEditor";
             this.Size = new System.Drawing.Size(712, 543);
             this.stPanel2.ResumeLayout(false);
+            this.stPanel2.PerformLayout();
+            this.stToolStrip1.ResumeLayout(false);
+            this.stToolStrip1.PerformLayout();
             this.splitContainer1.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
             this.stPanel3.ResumeLayout(false);
-            this.stTabControl1.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCustom1)).EndInit();
-            this.tabPage2.ResumeLayout(false);
             this.stPanel1.ResumeLayout(false);
             this.stTabControl2.ResumeLayout(false);
             this.tabPage5.ResumeLayout(false);
@@ -244,21 +210,18 @@
         }
 
         #endregion
-
-        private Switch_Toolbox.Library.Forms.STTabControl stTabControl1;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.TabPage tabPage2;
         private System.Windows.Forms.SplitContainer splitContainer1;
-        private Switch_Toolbox.Library.Forms.PictureBoxCustom pictureBoxCustom1;
-        private Switch_Toolbox.Library.Forms.STPanel stPanel1;
         private Switch_Toolbox.Library.Forms.STPanel stPanel2;
+        private Switch_Toolbox.Library.Forms.STPanel stPanel3;
+        private System.Windows.Forms.Splitter splitter1;
+        private Switch_Toolbox.Library.Forms.STPanel stPanel1;
         private Switch_Toolbox.Library.Forms.STTabControl stTabControl2;
+        private System.Windows.Forms.TabPage timelineTabPage;
         private System.Windows.Forms.TabPage tabPage4;
         private System.Windows.Forms.TabPage tabPage5;
-        private System.Windows.Forms.Splitter splitter1;
-        private Switch_Toolbox.Library.Forms.STPanel stPanel3;
         private Forms.TextureLoader textureLoader1;
         private Switch_Toolbox.Library.Forms.STPanel stPanel5;
-        private System.Windows.Forms.TabPage timelineTabPage;
+        private Switch_Toolbox.Library.Forms.STToolStrip stToolStrip1;
+        private System.Windows.Forms.ToolStripButton toggleViewportToolStripBtn;
     }
 }

Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs

@@ -16,11 +16,43 @@ namespace FirstPlugin.Forms
 {
     public partial class BfresEditor : STUserControl, IViewportContainer
     {
+        private bool _displayViewport = true;
+
+        public bool DisplayViewport
+        {
+            get
+            {
+                return _displayViewport;
+            }
+            set
+            {
+                _displayViewport = value;
+                SetupViewport();
+            }
+        }
+
+        private void SetupViewport()
+        {
+            if (DisplayViewport == true && Runtime.UseViewport)
+            {
+                stPanel5.Controls.Add(viewport);
+                splitContainer1.Panel1Collapsed = false;
+                toggleViewportToolStripBtn.Image = Properties.Resources.ViewportIcon;
+            }
+            else
+            {
+                stPanel5.Controls.Clear();
+                splitContainer1.Panel1Collapsed = true;
+                toggleViewportToolStripBtn.Image = Properties.Resources.ViewportIconDisable;
+                OnLoadedTab();
+            }
+        }
+
         Viewport viewport
         {
             get
             {
-                if (!Runtime.UseViewport)
+                if (!Runtime.UseViewport || !DisplayViewport)
                     return null;
 
                 var editor = LibraryGUI.Instance.GetObjectEditor();
@@ -49,23 +81,23 @@ namespace FirstPlugin.Forms
             animationPanel.Dock = DockStyle.Fill;
             timelineTabPage.Controls.Add(animationPanel);
 
-            stTabControl1.myBackColor = FormThemes.BaseTheme.FormBackColor;
             stTabControl2.myBackColor = FormThemes.BaseTheme.FormBackColor;
 
-
             if (viewport == null && Runtime.UseViewport)
             {
                 viewport = new Viewport();
                 viewport.Dock = DockStyle.Fill;
             }
 
-            if (Runtime.UseViewport)
+            if (Runtime.UseViewport && Runtime.DisplayViewport)
                 stPanel5.Controls.Add(viewport);
+            else
+                splitContainer1.Panel1Collapsed = true;
 
             OnLoadedTab();
 
-            if (HasModels)
-                stTabControl1.SelectedIndex = 1;
+            if (HasModels && Runtime.DisplayViewport)
+                DisplayViewport = true;
         }
 
         public UserControl GetActiveEditor(Type type)
@@ -87,6 +119,8 @@ namespace FirstPlugin.Forms
 
         public void LoadEditor(UserControl Control)
         {
+            Control.Dock = DockStyle.Fill;
+
             splitContainer1.Panel2.Controls.Clear();
             splitContainer1.Panel2.Controls.Add(Control);
         }
@@ -107,16 +141,18 @@ namespace FirstPlugin.Forms
 
         public void LoadViewport(List<AbstractGlDrawable> drawables, List<ToolStripMenuItem> customContextMenus = null)
         {
-            if (!Runtime.UseViewport)
-                return;
-
             Drawables = drawables;
 
+            if (!Runtime.UseViewport || !DisplayViewport)
+                return;
+
             if (customContextMenus != null)
             {
                 foreach (var menu in customContextMenus)
                     viewport.LoadCustomMenuItem(menu);
             }
+
+            OnLoadedTab();
         }
 
         public void AddDrawable(AbstractGlDrawable draw)
@@ -174,10 +210,7 @@ namespace FirstPlugin.Forms
 
         private void stTabControl1_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (stTabControl1.SelectedIndex == 1)
-            {
-                OnLoadedTab();
-            }
+
         }
 
         bool IsTimelineVisable = true;
@@ -196,5 +229,20 @@ namespace FirstPlugin.Forms
                 stPanel1.Height += (controlHeight + 25);
             }
         }
+
+        private void toggleViewportToolStripBtn_Click(object sender, EventArgs e)
+        {
+            if (Runtime.DisplayViewport)
+            {
+                Runtime.DisplayViewport = false;
+            }
+            else
+            {
+                Runtime.DisplayViewport = true;
+            }
+
+            DisplayViewport = Runtime.DisplayViewport;
+            Config.Save();
+        }
     }
 }

Switch_FileFormatsMain/GUI/BFRES/BfresEditor.resx

@@ -117,212 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBoxCustom1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAlgAAAJYCAMAAACJuGjuAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAADAFBMVEXMzMzNzc3Ozs7Pz8/Q0NDR0dHS
-        0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm
-        5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6
-        +vr7+/v8/Pz9/f3+/v7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        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
-</value>
-  </data>
+  <metadata name="stToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

Switch_FileFormatsMain/GUI/BFRES/Texture Sampler/SamplerEditorSimple.Designer.cs

@@ -31,21 +31,25 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SamplerEditorSimple));
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
-            this.stPropertyGrid1 = new Switch_Toolbox.Library.Forms.STPropertyGrid();
-            this.stLabel1 = new Switch_Toolbox.Library.Forms.STLabel();
-            this.nameTB = new Switch_Toolbox.Library.Forms.STTextBox();
-            this.stButton1 = new Switch_Toolbox.Library.Forms.STButton();
-            this.stLabel2 = new Switch_Toolbox.Library.Forms.STLabel();
-            this.samplerCB = new Switch_Toolbox.Library.Forms.STComboBox();
-            this.stTextBox2 = new Switch_Toolbox.Library.Forms.STTextBox();
-            this.stLabel3 = new Switch_Toolbox.Library.Forms.STLabel();
             this.textureBP = new Switch_Toolbox.Library.Forms.PictureBoxCustom();
+            this.stLabel3 = new Switch_Toolbox.Library.Forms.STLabel();
+            this.stTextBox2 = new Switch_Toolbox.Library.Forms.STTextBox();
+            this.samplerCB = new Switch_Toolbox.Library.Forms.STComboBox();
+            this.stLabel2 = new Switch_Toolbox.Library.Forms.STLabel();
+            this.stButton1 = new Switch_Toolbox.Library.Forms.STButton();
+            this.nameTB = new Switch_Toolbox.Library.Forms.STTextBox();
+            this.stLabel1 = new Switch_Toolbox.Library.Forms.STLabel();
+            this.stPropertyGrid1 = new Switch_Toolbox.Library.Forms.STPropertyGrid();
+            this.stMenuStrip1 = new Switch_Toolbox.Library.Forms.STMenuStrip();
+            this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
             this.splitContainer2.Panel1.SuspendLayout();
             this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
             this.stPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.textureBP)).BeginInit();
+            this.stMenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // splitContainer2
@@ -61,7 +65,7 @@
             // splitContainer2.Panel2
             // 
             this.splitContainer2.Panel2.Controls.Add(this.stPropertyGrid1);
-            this.splitContainer2.Size = new System.Drawing.Size(585, 432);
+            this.splitContainer2.Size = new System.Drawing.Size(585, 522);
             this.splitContainer2.SplitterDistance = 277;
             this.splitContainer2.TabIndex = 0;
             // 
@@ -75,87 +79,13 @@
             this.stPanel1.Controls.Add(this.stButton1);
             this.stPanel1.Controls.Add(this.nameTB);
             this.stPanel1.Controls.Add(this.stLabel1);
+            this.stPanel1.Controls.Add(this.stMenuStrip1);
             this.stPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.stPanel1.Location = new System.Drawing.Point(0, 0);
             this.stPanel1.Name = "stPanel1";
-            this.stPanel1.Size = new System.Drawing.Size(277, 432);
+            this.stPanel1.Size = new System.Drawing.Size(277, 522);
             this.stPanel1.TabIndex = 0;
             // 
-            // stPropertyGrid1
-            // 
-            this.stPropertyGrid1.AutoScroll = true;
-            this.stPropertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.stPropertyGrid1.Location = new System.Drawing.Point(0, 0);
-            this.stPropertyGrid1.Name = "stPropertyGrid1";
-            this.stPropertyGrid1.ShowHintDisplay = true;
-            this.stPropertyGrid1.Size = new System.Drawing.Size(304, 432);
-            this.stPropertyGrid1.TabIndex = 0;
-            // 
-            // stLabel1
-            // 
-            this.stLabel1.AutoSize = true;
-            this.stLabel1.Location = new System.Drawing.Point(5, 10);
-            this.stLabel1.Name = "stLabel1";
-            this.stLabel1.Size = new System.Drawing.Size(46, 13);
-            this.stLabel1.TabIndex = 0;
-            this.stLabel1.Text = "Texture:";
-            // 
-            // nameTB
-            // 
-            this.nameTB.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.nameTB.Location = new System.Drawing.Point(8, 32);
-            this.nameTB.Name = "nameTB";
-            this.nameTB.Size = new System.Drawing.Size(207, 20);
-            this.nameTB.TabIndex = 1;
-            // 
-            // stButton1
-            // 
-            this.stButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.stButton1.Location = new System.Drawing.Point(220, 29);
-            this.stButton1.Name = "stButton1";
-            this.stButton1.Size = new System.Drawing.Size(54, 23);
-            this.stButton1.TabIndex = 2;
-            this.stButton1.Text = "Edit:";
-            this.stButton1.UseVisualStyleBackColor = false;
-            // 
-            // stLabel2
-            // 
-            this.stLabel2.AutoSize = true;
-            this.stLabel2.Location = new System.Drawing.Point(3, 61);
-            this.stLabel2.Name = "stLabel2";
-            this.stLabel2.Size = new System.Drawing.Size(48, 13);
-            this.stLabel2.TabIndex = 3;
-            this.stLabel2.Text = "Sampler:";
-            // 
-            // samplerCB
-            // 
-            this.samplerCB.BorderColor = System.Drawing.Color.Empty;
-            this.samplerCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
-            this.samplerCB.ButtonColor = System.Drawing.Color.Empty;
-            this.samplerCB.FormattingEnabled = true;
-            this.samplerCB.Location = new System.Drawing.Point(68, 58);
-            this.samplerCB.Name = "samplerCB";
-            this.samplerCB.ReadOnly = true;
-            this.samplerCB.Size = new System.Drawing.Size(206, 21);
-            this.samplerCB.TabIndex = 4;
-            // 
-            // stTextBox2
-            // 
-            this.stTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.stTextBox2.Location = new System.Drawing.Point(67, 85);
-            this.stTextBox2.Name = "stTextBox2";
-            this.stTextBox2.Size = new System.Drawing.Size(207, 20);
-            this.stTextBox2.TabIndex = 5;
-            // 
-            // stLabel3
-            // 
-            this.stLabel3.AutoSize = true;
-            this.stLabel3.Location = new System.Drawing.Point(5, 87);
-            this.stLabel3.Name = "stLabel3";
-            this.stLabel3.Size = new System.Drawing.Size(29, 13);
-            this.stLabel3.TabIndex = 6;
-            this.stLabel3.Text = "Hint:";
-            // 
             // textureBP
             // 
             this.textureBP.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -163,18 +93,118 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textureBP.BackColor = System.Drawing.Color.Transparent;
             this.textureBP.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("textureBP.BackgroundImage")));
-            this.textureBP.Location = new System.Drawing.Point(3, 111);
+            this.textureBP.Location = new System.Drawing.Point(3, 129);
             this.textureBP.Name = "textureBP";
-            this.textureBP.Size = new System.Drawing.Size(272, 318);
+            this.textureBP.Size = new System.Drawing.Size(272, 390);
             this.textureBP.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.textureBP.TabIndex = 7;
             this.textureBP.TabStop = false;
             // 
+            // stLabel3
+            // 
+            this.stLabel3.AutoSize = true;
+            this.stLabel3.Location = new System.Drawing.Point(3, 106);
+            this.stLabel3.Name = "stLabel3";
+            this.stLabel3.Size = new System.Drawing.Size(29, 13);
+            this.stLabel3.TabIndex = 6;
+            this.stLabel3.Text = "Hint:";
+            // 
+            // stTextBox2
+            // 
+            this.stTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.stTextBox2.Location = new System.Drawing.Point(65, 104);
+            this.stTextBox2.Name = "stTextBox2";
+            this.stTextBox2.Size = new System.Drawing.Size(207, 20);
+            this.stTextBox2.TabIndex = 5;
+            // 
+            // samplerCB
+            // 
+            this.samplerCB.BorderColor = System.Drawing.Color.Empty;
+            this.samplerCB.BorderStyle = System.Windows.Forms.ButtonBorderStyle.Solid;
+            this.samplerCB.ButtonColor = System.Drawing.Color.Empty;
+            this.samplerCB.FormattingEnabled = true;
+            this.samplerCB.Location = new System.Drawing.Point(66, 77);
+            this.samplerCB.Name = "samplerCB";
+            this.samplerCB.ReadOnly = true;
+            this.samplerCB.Size = new System.Drawing.Size(206, 21);
+            this.samplerCB.TabIndex = 4;
+            // 
+            // stLabel2
+            // 
+            this.stLabel2.AutoSize = true;
+            this.stLabel2.Location = new System.Drawing.Point(1, 80);
+            this.stLabel2.Name = "stLabel2";
+            this.stLabel2.Size = new System.Drawing.Size(48, 13);
+            this.stLabel2.TabIndex = 3;
+            this.stLabel2.Text = "Sampler:";
+            // 
+            // stButton1
+            // 
+            this.stButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.stButton1.Location = new System.Drawing.Point(218, 48);
+            this.stButton1.Name = "stButton1";
+            this.stButton1.Size = new System.Drawing.Size(54, 23);
+            this.stButton1.TabIndex = 2;
+            this.stButton1.Text = "Edit:";
+            this.stButton1.UseVisualStyleBackColor = false;
+            // 
+            // nameTB
+            // 
+            this.nameTB.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.nameTB.Location = new System.Drawing.Point(6, 51);
+            this.nameTB.Name = "nameTB";
+            this.nameTB.Size = new System.Drawing.Size(207, 20);
+            this.nameTB.TabIndex = 1;
+            // 
+            // stLabel1
+            // 
+            this.stLabel1.AutoSize = true;
+            this.stLabel1.Location = new System.Drawing.Point(3, 29);
+            this.stLabel1.Name = "stLabel1";
+            this.stLabel1.Size = new System.Drawing.Size(46, 13);
+            this.stLabel1.TabIndex = 0;
+            this.stLabel1.Text = "Texture:";
+            // 
+            // stPropertyGrid1
+            // 
+            this.stPropertyGrid1.AutoScroll = true;
+            this.stPropertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.stPropertyGrid1.Location = new System.Drawing.Point(0, 0);
+            this.stPropertyGrid1.Name = "stPropertyGrid1";
+            this.stPropertyGrid1.ShowHintDisplay = true;
+            this.stPropertyGrid1.Size = new System.Drawing.Size(304, 522);
+            this.stPropertyGrid1.TabIndex = 0;
+            // 
+            // stMenuStrip1
+            // 
+            this.stMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.viewToolStripMenuItem});
+            this.stMenuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.stMenuStrip1.Name = "stMenuStrip1";
+            this.stMenuStrip1.Size = new System.Drawing.Size(277, 24);
+            this.stMenuStrip1.TabIndex = 8;
+            this.stMenuStrip1.Text = "stMenuStrip1";
+            // 
+            // viewToolStripMenuItem
+            // 
+            this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.displayVerticalToolStripMenuItem});
+            this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
+            this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.viewToolStripMenuItem.Text = "View";
+            // 
+            // displayVerticalToolStripMenuItem
+            // 
+            this.displayVerticalToolStripMenuItem.Name = "displayVerticalToolStripMenuItem";
+            this.displayVerticalToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.displayVerticalToolStripMenuItem.Text = "Display Vertical";
+            this.displayVerticalToolStripMenuItem.Click += new System.EventHandler(this.displayVerticalToolStripMenuItem_Click);
+            // 
             // SamplerEditorSimple
             // 
-            this.Controls.Add(this.splitContainer2);
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.splitContainer2);
             this.Name = "SamplerEditorSimple";
             this.Size = new System.Drawing.Size(585, 522);
             this.splitContainer2.Panel1.ResumeLayout(false);
@@ -184,6 +214,8 @@
             this.stPanel1.ResumeLayout(false);
             this.stPanel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.textureBP)).EndInit();
+            this.stMenuStrip1.ResumeLayout(false);
+            this.stMenuStrip1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -201,5 +233,8 @@
         private Switch_Toolbox.Library.Forms.STTextBox nameTB;
         private Switch_Toolbox.Library.Forms.STLabel stLabel1;
         private Switch_Toolbox.Library.Forms.STPropertyGrid stPropertyGrid1;
+        private Switch_Toolbox.Library.Forms.STMenuStrip stMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem displayVerticalToolStripMenuItem;
     }
 }

Switch_FileFormatsMain/GUI/BFRES/Texture Sampler/SamplerEditorSimple.cs

@@ -72,5 +72,65 @@ namespace FirstPlugin.Forms
         {
 
         }
+
+        public void SetEditorOrientation(bool ToVertical)
+        {
+            displayVerticalToolStripMenuItem.Checked = ToVertical;
+        }
+
+        private void displayVerticalToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (displayVerticalToolStripMenuItem.Checked)
+            {
+                DisplayHorizontal();
+            }
+            else
+            {
+                DisplayVertical();
+            }
+        }
+
+        private void DisplayHorizontal()
+        {
+            if (splitContainer2.Panel1Collapsed)
+                return;
+
+            var ImagePanel = stPanel1;
+            var PropertiesEditor = stPropertyGrid1;
+
+            //Swap panels
+            splitContainer2.Panel1.Controls.Clear();
+            splitContainer2.Panel2.Controls.Clear();
+
+            splitContainer2.Orientation = Orientation.Vertical;
+            splitContainer2.Panel1.Controls.Add(ImagePanel);
+            splitContainer2.Panel2.Controls.Add(PropertiesEditor);
+            stPropertyGrid1.ShowHintDisplay = true;
+
+            PropertiesEditor.Width = this.Width / 2;
+
+            splitContainer2.SplitterDistance = this.Width / 2;
+        }
+
+        private void DisplayVertical()
+        {
+            if (splitContainer2.Panel2Collapsed)
+                return;
+
+            var ImagePanel = stPanel1;
+            var PropertiesEditor = stPropertyGrid1;
+
+            //Swap panels
+            splitContainer2.Panel1.Controls.Clear();
+            splitContainer2.Panel2.Controls.Clear();
+
+            splitContainer2.Orientation = Orientation.Horizontal;
+            splitContainer2.Panel2.Controls.Add(ImagePanel);
+            splitContainer2.Panel1.Controls.Add(PropertiesEditor);
+
+            splitContainer2.SplitterDistance = this.Height / 2;
+
+            stPropertyGrid1.ShowHintDisplay = false;
+        }
     }
 }

Switch_FileFormatsMain/GUI/BFRES/Texture Sampler/SamplerEditorSimple.resx

@@ -325,4 +325,7 @@
         mGk4zW7tt3aFGa0JAhPXKv5Grfv8ckaj93+veSuXxEAIUwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="stMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>184, 17</value>
+  </metadata>
 </root>

Switch_FileFormatsMain/Properties/Resources.Designer.cs

@@ -180,6 +180,26 @@ namespace FirstPlugin.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewportIcon {
+            get {
+                object obj = ResourceManager.GetObject("ViewportIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewportIconDisable {
+            get {
+                object obj = ResourceManager.GetObject("ViewportIconDisable", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>

Switch_FileFormatsMain/Properties/Resources.resx

@@ -118,43 +118,49 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="GridBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GridBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="InjectTexErrored" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\InjectTexErrored.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="Basic_Bake_st1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Basic_Bake_st1.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="TextureError" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TextureError.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Basic_NrmBC5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Basic_NrmBC5.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="Black" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Black.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="Basic_Nrm" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Basic_Nrm.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="AddIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AddIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrowMinimize " type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrowMinimize .png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="GridBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GridBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrowMinimize 1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrowMinimize 1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Basic_Bake_st0" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Basic_Bake_st0.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="White" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\White.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="RemoveIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\RemoveIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Basic_NrmBC5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Basic_NrmBC5.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="arrowMinimize 1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowMinimize 1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Basic_Bake_st1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Basic_Bake_st1.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Basic_Nrm" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Basic_Nrm.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="White" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\White.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Basic_Bake_st0" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Basic_Bake_st0.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="TextureError" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TextureError.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowMinimize " type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowMinimize .png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewportIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewportIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewportIconDisable" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewportIconDisable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Switch_FileFormatsMain/Switch_FileFormatsMain.csproj

@@ -236,6 +236,12 @@
     <Compile Include="FileFormats\Audio\BRSTM.cs" />
     <Compile Include="GL\Helpers\AlphaGLControl.cs" />
     <Compile Include="GL\Helpers\ColorGLControl.cs" />
+    <Compile Include="GUI\AAMP\AampEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GUI\AAMP\AampEditor.Designer.cs">
+      <DependentUpon>AampEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="GUI\BFRES\BoneVisualAnims\BoneVisualAnimEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -401,16 +407,10 @@
     </Compile>
     <Compile Include="MarioCostumeEditor.cs" />
     <Compile Include="GUI\AAMP\AampV1Editor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GUI\AAMP\AampV1Editor.Designer.cs">
-      <DependentUpon>AampV1Editor.cs</DependentUpon>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="GUI\AAMP\AampV2Editor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GUI\AAMP\AampV2Editor.Designer.cs">
-      <DependentUpon>AampV2Editor.cs</DependentUpon>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="GUI\AAMP\EditBox.cs">
       <SubType>Form</SubType>
@@ -835,6 +835,9 @@
     <None Include="Resources\InjectTexErrored.dds" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="GUI\AAMP\AampEditor.resx">
+      <DependentUpon>AampEditor.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GUI\AAMP\EditBox.resx" />
     <EmbeddedResource Include="GUI\Advanced Editor\TextureViewer.resx">
       <DependentUpon>TextureViewer.cs</DependentUpon>
@@ -1083,6 +1086,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -1146,5 +1150,14 @@
   <ItemGroup>
     <None Include="Resources\RemoveIcon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Texture.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ViewportIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ViewportIconDisable.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-eb767ec069a2b51342316e58b88dfbfbeaa1b4b2
+f53bc1a7dc49be17dafeb980d0fb64be3ad3bda8

Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.FileListAbsolute.txt

@@ -324,3 +324,4 @@ C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Rele
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SamplerEditorSimple.resources
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.EffectTableEditor.resources
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ParamValueDialog.resources
+C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AampEditorBase.resources

Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.Designer.cs

@@ -356,6 +356,7 @@
             this.propertyGridToolStripMenuItem.Name = "propertyGridToolStripMenuItem";
             this.propertyGridToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.propertyGridToolStripMenuItem.Text = "Property Grid";
+            this.propertyGridToolStripMenuItem.CheckedChanged += new System.EventHandler(this.propertyGridToolStripMenuItem_CheckedChanged);
             this.propertyGridToolStripMenuItem.Click += new System.EventHandler(this.propertyGridToolStripMenuItem_Click);
             // 
             // displayVerticalToolStripMenuItem
@@ -363,6 +364,7 @@
             this.displayVerticalToolStripMenuItem.Name = "displayVerticalToolStripMenuItem";
             this.displayVerticalToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.displayVerticalToolStripMenuItem.Text = "Display Vertical";
+            this.displayVerticalToolStripMenuItem.CheckedChanged += new System.EventHandler(this.displayVerticalToolStripMenuItem_CheckedChanged);
             this.displayVerticalToolStripMenuItem.Click += new System.EventHandler(this.displayVerticalToolStripMenuItem_Click);
             // 
             // imageToolStripMenuItem

Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs

@@ -108,6 +108,8 @@ namespace Switch_Toolbox.Library.Forms
             imageBGComboBox.SelectedItem = Runtime.pictureBoxStyle;
             UpdateBackgroundImage();
 
+            SetEditorOrientation(Runtime.ImageEditor.DisplayVertical);
+
             propertyGridToolStripMenuItem.Checked = Runtime.ImageEditor.ShowPropertiesPanel;
 
             propertiesEditor = new ImagePropertiesEditor();
@@ -139,6 +141,11 @@ namespace Switch_Toolbox.Library.Forms
             OnDataAcquiredEvent += new DataAcquired(ThreadReportsDataAquiredEvent);
         }
 
+        public void SetEditorOrientation(bool ToVertical)
+        {
+            displayVerticalToolStripMenuItem.Checked = ToVertical;
+        }
+
         private void UpdateBackgroundImage()
         {
             switch (Runtime.pictureBoxStyle)
@@ -668,16 +675,34 @@ namespace Switch_Toolbox.Library.Forms
             UpdatePictureBox();
         }
 
-        private void displayVerticalToolStripMenuItem_Click(object sender, EventArgs e)
+
+        private void propertyGridToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void displayVerticalToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
         {
             if (displayVerticalToolStripMenuItem.Checked)
             {
                 DisplayHorizontal();
-                displayVerticalToolStripMenuItem.Checked = false;
+                Runtime.ImageEditor.DisplayVertical = false;
             }
             else
             {
                 DisplayVertical();
+                Runtime.ImageEditor.DisplayVertical = true;
+            }
+        }
+
+        private void displayVerticalToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (displayVerticalToolStripMenuItem.Checked)
+            {
+                displayVerticalToolStripMenuItem.Checked = false;
+            }
+            else
+            {
                 displayVerticalToolStripMenuItem.Checked = true;
             }
         }
@@ -710,7 +735,7 @@ namespace Switch_Toolbox.Library.Forms
 
         private void DisplayHorizontal()
         {
-            if (splitContainer1.Panel1Collapsed)
+            if (splitContainer1.Panel1Collapsed || propertiesEditor == null)
                 return;
 
             var ImagePanel = stPanel1;

Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="stContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="pictureBoxCustom1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -325,9 +328,6 @@
         mGk4zW7tt3aFGa0JAhPXKv5Grfv8ckaj93+veSuXxEAIUwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="stContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>

Switch_Toolbox_Library/Interfaces/IMenuExtension.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Switch_Toolbox.Library.Forms;
+using System.Windows.Forms;
 
 namespace Switch_Toolbox.Library
 {
@@ -23,5 +24,6 @@ namespace Switch_Toolbox.Library
         STToolStripItem[] TitleBarExtensions { get; }
         STToolStripItem[] ExperimentalMenuExtensions { get; }
         STToolStripItem[] EditMenuExtensions { get; }
+        ToolStripButton[] IconButtonMenuExtensions { get; }
     }
 }

Switch_Toolbox_Library/Runtime.cs

@@ -22,6 +22,7 @@ namespace Switch_Toolbox.Library
         public class ImageEditor
         {
             public static bool ShowPropertiesPanel = true;
+            public static bool DisplayVertical = false;
         }
         public class ObjectEditor
         {
@@ -104,7 +105,8 @@ namespace Switch_Toolbox.Library
 
         public static bool renderFloorLines = true;
 
-        public static bool UseViewport = true;
+        public static bool UseViewport = true; //Removes all acess to viewport
+        public static bool DisplayViewport = true; //Only displays it in editors if true
 
         //Viewport Background
         public static BackgroundStyle backgroundStyle = BackgroundStyle.Gradient;

Switch_Toolbox_Library/Swizzling/GX2.cs

@@ -485,7 +485,10 @@ namespace Switch_Toolbox.Library
         public static GX2Surface CreateGx2Texture(byte[] imageData, string Name, uint TileMode, uint AAMode,
             uint Width, uint Height, uint Depth, uint Format, uint swizzle, uint SurfaceDim, uint MipCount)
         {
-            var surfOut = getSurfaceInfo((GX2SurfaceFormat)Format, Width, Height, 1, 1, TileMode, 0, 0);
+            var surfOut = getSurfaceInfo((GX2SurfaceFormat)Format, Width, Height, Depth, SurfaceDim, TileMode, AAMode, 0);
+            Console.WriteLine("Imported surfSize" + surfOut.surfSize);
+            Console.WriteLine("Imported data block" + imageData.Length);
+
             uint imageSize = (uint)surfOut.surfSize;
             uint alignment = surfOut.baseAlign;
             uint pitch = surfOut.pitch;
@@ -2429,8 +2432,6 @@ namespace Switch_Toolbox.Library
             var pSurfOut = new surfaceOut();
 
             hwFormat = (uint)((int)surfaceFormat & 0x3F);
-
-
             if (surfaceTileMode == 16)
             {
                 numSamples = (uint)(1 << (int)surfaceAA);

Toolbox/Config.cs

@@ -170,6 +170,9 @@ namespace Toolbox
                     case "UseViewport":
                         bool.TryParse(node.InnerText, out Runtime.UseViewport);
                         break;
+                    case "DisplayViewport":
+                        bool.TryParse(node.InnerText, out Runtime.DisplayViewport);
+                        break;
                 }
             }
         }
@@ -278,6 +281,7 @@ namespace Toolbox
             parentNode.AppendChild(mainSettingsNode);
 
             
+            mainSettingsNode.AppendChild(createNode(doc, "DisplayViewport", Runtime.DisplayViewport.ToString()));
             mainSettingsNode.AppendChild(createNode(doc, "UseViewport", Runtime.UseViewport.ToString()));
             mainSettingsNode.AppendChild(createNode(doc, "UseDebugDomainExceptionHandler", Runtime.UseDebugDomainExceptionHandler.ToString()));
             mainSettingsNode.AppendChild(createNode(doc, "OpenStartupWindow", Runtime.OpenStartupWindow.ToString()));

Toolbox/MainForm.cs

@@ -602,6 +602,11 @@ namespace Toolbox
                     RegisterMenuExtIndex(compressionToolStripMenuItem, ext.CompressionMenuExtensions, compressionToolStripMenuItem.DropDownItems.Count);
             }
         }
+        void RegisterMenuExtIndex(ToolStrip target, ToolStripButton[] list, int index = 0)
+        {
+            foreach (var i in list)
+                target.Items.Insert(index++, i);
+        }
         void RegisterMenuExtIndex(ToolStripMenuItem target, STToolStripItem[] list, int index = 0)
         {
             foreach (var i in list)
@@ -688,6 +693,11 @@ namespace Toolbox
             var menuExtensions = FileManager.GetMenuExtensions(format);
 
             editToolStripMenuItem.DropDownItems.Clear();
+            for (int i = 0; i < stToolStrip1.Items.Count; i++)
+            {
+                if (i > 1)
+                    stToolStrip1.Items.RemoveAt(i);
+            }
 
             if (menuExtensions != null)
             {
@@ -698,6 +708,10 @@ namespace Toolbox
                     if (editToolStripMenuItem.DropDownItems.Count > 0)
                         editToolStripMenuItem.Enabled = true;
                 }
+                if (menuExtensions.IconButtonMenuExtensions != null)
+                {
+                    RegisterMenuExtIndex(stToolStrip1, menuExtensions.IconButtonMenuExtensions, stToolStrip1.Items.Count);
+                }
             }
         }
         private void ResetMenus()