More image editor fixes

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

@@ -28,16 +28,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageEditorBase));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.stPanel2 = new Switch_Toolbox.Library.Forms.STPanel();
             this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
             this.stPanel4 = new Switch_Toolbox.Library.Forms.STPanel();
             this.pictureBoxCustom1 = new Switch_Toolbox.Library.Forms.PictureBoxCustom();
-            this.stContextMenuStrip2 = new Switch_Toolbox.Library.Forms.STContextMenuStrip(this.components);
+            this.stContextMenuStrip2 = new Switch_Toolbox.Library.Forms.STContextMenuStrip();
             this.copyImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.stPanel3 = new Switch_Toolbox.Library.Forms.STPanel();
+            this.alphaBtn = new Switch_Toolbox.Library.Forms.STButton();
             this.editBtn = new Switch_Toolbox.Library.Forms.STButton();
             this.saveBtn = new Switch_Toolbox.Library.Forms.STButton();
             this.arrayLevelCounterLabel = new Switch_Toolbox.Library.Forms.STLabel();
@@ -58,6 +58,8 @@
             this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.propertyGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.displayVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.displayAlphaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.useComponentSelectorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.imageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.generateMipmapsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -70,8 +72,6 @@
             this.adjustmentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.hueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.brightnessContrastToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.displayAlphaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.useComponentSelectorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.SuspendLayout();
@@ -165,6 +165,7 @@
             // 
             // stPanel3
             // 
+            this.stPanel3.Controls.Add(this.alphaBtn);
             this.stPanel3.Controls.Add(this.editBtn);
             this.stPanel3.Controls.Add(this.saveBtn);
             this.stPanel3.Controls.Add(this.arrayLevelCounterLabel);
@@ -178,6 +179,21 @@
             this.stPanel3.Size = new System.Drawing.Size(520, 51);
             this.stPanel3.TabIndex = 3;
             // 
+            // alphaBtn
+            // 
+            this.alphaBtn.BackColor = System.Drawing.Color.Transparent;
+            this.alphaBtn.BackgroundImage = global::Switch_Toolbox.Library.Properties.Resources.AlphaIcon;
+            this.alphaBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.alphaBtn.Enabled = false;
+            this.alphaBtn.FlatAppearance.BorderSize = 0;
+            this.alphaBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.alphaBtn.Location = new System.Drawing.Point(70, 3);
+            this.alphaBtn.Name = "alphaBtn";
+            this.alphaBtn.Size = new System.Drawing.Size(24, 23);
+            this.alphaBtn.TabIndex = 17;
+            this.alphaBtn.UseVisualStyleBackColor = false;
+            this.alphaBtn.Click += new System.EventHandler(this.alphaBtn_Click);
+            // 
             // editBtn
             // 
             this.editBtn.BackColor = System.Drawing.Color.Transparent;
@@ -382,6 +398,20 @@
             this.displayVerticalToolStripMenuItem.CheckedChanged += new System.EventHandler(this.displayVerticalToolStripMenuItem_CheckedChanged);
             this.displayVerticalToolStripMenuItem.Click += new System.EventHandler(this.displayVerticalToolStripMenuItem_Click);
             // 
+            // displayAlphaToolStripMenuItem
+            // 
+            this.displayAlphaToolStripMenuItem.Name = "displayAlphaToolStripMenuItem";
+            this.displayAlphaToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
+            this.displayAlphaToolStripMenuItem.Text = "Display Alpha";
+            this.displayAlphaToolStripMenuItem.Click += new System.EventHandler(this.displayAlphaToolStripMenuItem_Click);
+            // 
+            // useComponentSelectorToolStripMenuItem
+            // 
+            this.useComponentSelectorToolStripMenuItem.Name = "useComponentSelectorToolStripMenuItem";
+            this.useComponentSelectorToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
+            this.useComponentSelectorToolStripMenuItem.Text = "Use Component Selector";
+            this.useComponentSelectorToolStripMenuItem.Click += new System.EventHandler(this.useComponentSelectorToolStripMenuItem_Click);
+            // 
             // imageToolStripMenuItem
             // 
             this.imageToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -477,20 +507,6 @@
             this.brightnessContrastToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
             this.brightnessContrastToolStripMenuItem.Text = "Brightness / Contrast";
             // 
-            // displayAlphaToolStripMenuItem
-            // 
-            this.displayAlphaToolStripMenuItem.Name = "displayAlphaToolStripMenuItem";
-            this.displayAlphaToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
-            this.displayAlphaToolStripMenuItem.Text = "Display Alpha";
-            this.displayAlphaToolStripMenuItem.Click += new System.EventHandler(this.displayAlphaToolStripMenuItem_Click);
-            // 
-            // useComponentSelectorToolStripMenuItem
-            // 
-            this.useComponentSelectorToolStripMenuItem.Name = "useComponentSelectorToolStripMenuItem";
-            this.useComponentSelectorToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
-            this.useComponentSelectorToolStripMenuItem.Text = "Use Component Selector";
-            this.useComponentSelectorToolStripMenuItem.Click += new System.EventHandler(this.useComponentSelectorToolStripMenuItem_Click);
-            // 
             // ImageEditorBase
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -557,5 +573,6 @@
         private System.Windows.Forms.ToolStripMenuItem redoToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem displayAlphaToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem useComponentSelectorToolStripMenuItem;
+        private STButton alphaBtn;
     }
 }

Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs

@@ -116,8 +116,6 @@ namespace Switch_Toolbox.Library.Forms
         public bool HasGreenChannel = true;
         public bool HasAlphaChannel = true;
 
-        public bool UseComponetSelector = false;
-
         ImagePropertiesEditor propertiesEditor;
 
         public bool ShowChannelEditor = true;
@@ -160,7 +158,8 @@ namespace Switch_Toolbox.Library.Forms
         {
             InitializeComponent();
 
-            componentSelector.Checked = UseComponetSelector;
+            useComponentSelectorToolStripMenuItem.Checked = Runtime.ImageEditor.UseComponetSelector;
+            displayAlphaToolStripMenuItem.Checked = Runtime.ImageEditor.DisplayAlpha;
 
             propertiesEditor = new ImagePropertiesEditor();
             propertiesEditor.Dock = DockStyle.Fill;
@@ -354,16 +353,21 @@ namespace Switch_Toolbox.Library.Forms
                     BitmapExtension.SetChannel(image, STChannelType.Alpha, STChannelType.Alpha, STChannelType.Alpha, STChannelType.One);
                 else
                 {
-                    if (UseComponetSelector)
+                    if (Runtime.ImageEditor.UseComponetSelector)
                     {
-                        if (displayAlphaToolStripMenuItem.Checked)
+                        if (Runtime.ImageEditor.DisplayAlpha)
                             BitmapExtension.SetChannel(image, ActiveTexture.RedChannel, ActiveTexture.GreenChannel, ActiveTexture.BlueChannel, ActiveTexture.AlphaChannel);
                         else
                             BitmapExtension.SetChannel(image, ActiveTexture.RedChannel, ActiveTexture.GreenChannel, ActiveTexture.BlueChannel, STChannelType.One);
                     }
+                    else
+                    {
+                        if (Runtime.ImageEditor.DisplayAlpha)
+                            BitmapExtension.SetChannel(image, STChannelType.Red, STChannelType.Green, STChannelType.Blue, STChannelType.Alpha);
                         else
                             BitmapExtension.SetChannel(image, STChannelType.Red, STChannelType.Green, STChannelType.Blue, STChannelType.One);
                     }
+                }
 
                 DecodeProcessFinished = true;
 
@@ -998,7 +1002,8 @@ namespace Switch_Toolbox.Library.Forms
             if (currentCacheIndex == ImageCache.Count)
                 return;
 
-            if (currentCacheIndex == -1) {
+            if (currentCacheIndex == -1)
+            {
                 currentCacheIndex = ImageCache.Count;
             }
             else
@@ -1010,20 +1015,36 @@ namespace Switch_Toolbox.Library.Forms
             ApplyEdit(ImageCache[currentCacheIndex]);
         }
 
-        private void componentSelector_CheckedChanged(object sender, EventArgs e)
+        private void displayAlphaToolStripMenuItem_Click(object sender, EventArgs e) {
-        {
+            UpdateAlphaEnable();
-            UseComponetSelector = useComponentSelectorToolStripMenuItem.Checked;
-            UpdateMipDisplay();
-        }
-
-        private void displayAlphaToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-
         }
 
         private void useComponentSelectorToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            if (useComponentSelectorToolStripMenuItem.Checked)
+                useComponentSelectorToolStripMenuItem.Checked = false;
+            else
+                useComponentSelectorToolStripMenuItem.Checked = true;
 
+            Runtime.ImageEditor.UseComponetSelector = useComponentSelectorToolStripMenuItem.Checked;
+            UpdateMipDisplay();
+        }
+
+        private void UpdateAlphaEnable()
+        {
+            if (displayAlphaToolStripMenuItem.Checked)
+                displayAlphaToolStripMenuItem.Checked = false;
+            else
+                displayAlphaToolStripMenuItem.Checked = true;
+
+            alphaBtn.Enabled = displayAlphaToolStripMenuItem.Checked; 
+            Runtime.ImageEditor.DisplayAlpha = displayAlphaToolStripMenuItem.Checked;
+            UpdateMipDisplay();
+        }
+
+        private void alphaBtn_Click(object sender, EventArgs e)
+        {
+            UpdateAlphaEnable();
         }
     }
 }

Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.resx

@@ -117,9 +117,6 @@
   <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>
@@ -331,6 +328,9 @@
   <metadata name="stContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>184, 17</value>
   </metadata>
+  <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/Properties/Resources.Designer.cs

@@ -70,6 +70,16 @@ namespace Switch_Toolbox.Library.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap AlphaIcon {
+            get {
+                object obj = ResourceManager.GetObject("AlphaIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

Switch_Toolbox_Library/Properties/Resources.resx

@@ -142,6 +142,9 @@
   <data name="stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -166,17 +169,14 @@
   <data name="Bone" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Bone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="diffuseSphere" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\diffuseSphere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="boneWeightGradient2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boneWeightGradient2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="maximize_sele1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\maximize_sele.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="IconCurve" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="diffuseSphere" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DataTyypes\IconCurve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\diffuseSphere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="skeleton" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\skeleton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -190,6 +190,9 @@
   <data name="mesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mesh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="IconVec3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DataTyypes\IconVec3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrowL" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrowL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -211,8 +214,11 @@
   <data name="DefaultTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DefaultTexture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Byaml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="PauseBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Byaml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Playback\PauseBtn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="minimize_sele1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\minimize_sele.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="diffuseSDR" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Cubemaps\diffuseSDR.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -223,9 +229,6 @@
   <data name="model" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\model.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="skeletonAnimation" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\skeletonAnimation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="IconFloat" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DataTyypes\IconFloat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -235,15 +238,18 @@
   <data name="specularSDR" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Cubemaps\specularSDR.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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="normalsSphere" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\normalsSphere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileBlank" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\FileBank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="boneWeightGradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boneWeightGradient.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="IconList" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DataTyypes\IconList.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -265,9 +271,6 @@
   <data name="normalMapSphere" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\normalMapSphere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Aamp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Aamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Texture" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Texture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -286,14 +289,11 @@
   <data name="TextureMaterialMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TextureMaterialMap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="minimize_sele1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\minimize_sele.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="minimize_sele" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Forms\Toolbar\images\minimize_sele.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="IconVec3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Aamp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DataTyypes\IconVec3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Aamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="QuestionCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\QuestionCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -310,8 +310,8 @@
   <data name="LoadingImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\LoadingImage.gif;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">
+  <data name="IconCurve" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\InjectTexErrored.dds;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\DataTyypes\IconCurve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Bnsh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Bnsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -328,8 +328,11 @@
   <data name="CheckerBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CheckerBackground.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">
+  <data name="Byaml" 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>
+    <value>..\Resources\Byaml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="skeletonAnimation" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\skeletonAnimation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="UVPattern" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\UVPattern.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -340,8 +343,8 @@
   <data name="ResetArrowR" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Playback\ResetArrowR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PauseBtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="FileBlank" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Playback\PauseBtn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\FileBank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Hovered" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CheckBox\Hovered.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -355,7 +358,7 @@
   <data name="minimize1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="AlphaIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\AlphaIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

Switch_Toolbox_Library/Switch_Toolbox_Library.csproj

@@ -1029,6 +1029,9 @@
   <ItemGroup>
     <None Include="Resources\Edit.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AlphaIcon.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>