diff --git a/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs index 30b48e51..a8cc94c4 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs @@ -29,42 +29,45 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.Label label1; + System.Windows.Forms.Label label3; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddSkinPrompt)); System.Windows.Forms.Label label2; - this.label3 = new System.Windows.Forms.Label(); - this.displayBox = new System.Windows.Forms.PictureBox(); + System.Windows.Forms.Label label1; this.textTheme = new System.Windows.Forms.TextBox(); this.contextMenuSkin = new System.Windows.Forms.ContextMenuStrip(this.components); this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuCape = new System.Windows.Forms.ContextMenuStrip(this.components); this.replaceToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.skinPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); - this.capePictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); - this.buttonSkin = new MetroFramework.Controls.MetroButton(); - this.buttonModelGen = new MetroFramework.Controls.MetroButton(); this.buttonDone = new MetroFramework.Controls.MetroButton(); + this.buttonModelGen = new MetroFramework.Controls.MetroButton(); + this.buttonCape = new MetroFramework.Controls.MetroButton(); + this.buttonSkin = new MetroFramework.Controls.MetroButton(); + this.displayBox = new System.Windows.Forms.PictureBox(); this.radioButtonAuto = new MetroFramework.Controls.MetroRadioButton(); this.radioButtonManual = new MetroFramework.Controls.MetroRadioButton(); - this.labelSelectTexture = new MetroFramework.Controls.MetroLabel(); this.textSkinID = new MetroFramework.Controls.MetroTextBox(); this.textSkinName = new MetroFramework.Controls.MetroTextBox(); this.textThemeName = new MetroFramework.Controls.MetroTextBox(); + this.labelSelectTexture = new MetroFramework.Controls.MetroLabel(); this.capeLabel = new MetroFramework.Controls.MetroLabel(); this.buttonAnimGen = new MetroFramework.Controls.MetroButton(); - this.buttonCape = new MetroFramework.Controls.MetroButton(); - label1 = new System.Windows.Forms.Label(); + this.capePictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); + this.skinPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); + label3 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); + label1 = new System.Windows.Forms.Label(); + this.contextMenuSkin.SuspendLayout(); + this.contextMenuCape.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.displayBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.skinPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.capePictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.skinPictureBox)).BeginInit(); this.SuspendLayout(); // - // label1 + // label3 // - resources.ApplyResources(label1, "label1"); - label1.ForeColor = System.Drawing.Color.White; - label1.Name = "label1"; + resources.ApplyResources(label3, "label3"); + label3.ForeColor = System.Drawing.Color.White; + label3.Name = "label3"; // // label2 // @@ -72,18 +75,11 @@ label2.ForeColor = System.Drawing.Color.White; label2.Name = "label2"; // - // label3 + // label1 // - this.label3.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // displayBox - // - this.displayBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); - resources.ApplyResources(this.displayBox, "displayBox"); - this.displayBox.Name = "displayBox"; - this.displayBox.TabStop = false; + resources.ApplyResources(label1, "label1"); + label1.ForeColor = System.Drawing.Color.White; + label1.Name = "label1"; // // textTheme // @@ -92,6 +88,8 @@ // // contextMenuSkin // + this.contextMenuSkin.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.replaceToolStripMenuItem}); this.contextMenuSkin.Name = "contextMenuSkin"; resources.ApplyResources(this.contextMenuSkin, "contextMenuSkin"); // @@ -103,6 +101,8 @@ // // contextMenuCape // + this.contextMenuCape.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.replaceToolStripMenuItem1}); this.contextMenuCape.Name = "contextMenuCape"; resources.ApplyResources(this.contextMenuCape, "contextMenuCape"); // @@ -111,23 +111,30 @@ resources.ApplyResources(this.replaceToolStripMenuItem1, "replaceToolStripMenuItem1"); this.replaceToolStripMenuItem1.Name = "replaceToolStripMenuItem1"; // - // skinPictureBox + // buttonDone // - resources.ApplyResources(this.skinPictureBox, "skinPictureBox"); - this.skinPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.skinPictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; - this.skinPictureBox.Name = "skinPictureBox"; - this.skinPictureBox.TabStop = false; - this.skinPictureBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.skinPictureBox_MouseClick); + resources.ApplyResources(this.buttonDone, "buttonDone"); + this.buttonDone.Name = "buttonDone"; + this.buttonDone.Theme = MetroFramework.MetroThemeStyle.Dark; + this.buttonDone.UseSelectable = true; + this.buttonDone.Click += new System.EventHandler(this.CreateButton_Click); // - // capePictureBox + // buttonModelGen // - resources.ApplyResources(this.capePictureBox, "capePictureBox"); - this.capePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.capePictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; - this.capePictureBox.Name = "capePictureBox"; - this.capePictureBox.TabStop = false; - this.capePictureBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.capePictureBox_MouseClick); + resources.ApplyResources(this.buttonModelGen, "buttonModelGen"); + this.buttonModelGen.Name = "buttonModelGen"; + this.buttonModelGen.Theme = MetroFramework.MetroThemeStyle.Dark; + this.buttonModelGen.UseSelectable = true; + this.buttonModelGen.Click += new System.EventHandler(this.CreateCustomModel_Click); + // + // buttonCape + // + this.buttonCape.BackgroundImage = global::PckStudio.Properties.Resources.HamburgerMenuIcon; + resources.ApplyResources(this.buttonCape, "buttonCape"); + this.buttonCape.Name = "buttonCape"; + this.buttonCape.Theme = MetroFramework.MetroThemeStyle.Dark; + this.buttonCape.UseSelectable = true; + this.buttonCape.Click += new System.EventHandler(this.buttonCape_Click); // // buttonSkin // @@ -138,21 +145,12 @@ this.buttonSkin.UseSelectable = true; this.buttonSkin.Click += new System.EventHandler(this.buttonSkin_Click); // - // buttonModelGen + // displayBox // - resources.ApplyResources(this.buttonModelGen, "buttonModelGen"); - this.buttonModelGen.Name = "buttonModelGen"; - this.buttonModelGen.Theme = MetroFramework.MetroThemeStyle.Dark; - this.buttonModelGen.UseSelectable = true; - this.buttonModelGen.Click += new System.EventHandler(this.CreateCustomModel_Click); - // - // buttonDone - // - resources.ApplyResources(this.buttonDone, "buttonDone"); - this.buttonDone.Name = "buttonDone"; - this.buttonDone.Theme = MetroFramework.MetroThemeStyle.Dark; - this.buttonDone.UseSelectable = true; - this.buttonDone.Click += new System.EventHandler(this.CreateButton_Click); + this.displayBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); + resources.ApplyResources(this.displayBox, "displayBox"); + this.displayBox.Name = "displayBox"; + this.displayBox.TabStop = false; // // radioButtonAuto // @@ -174,12 +172,6 @@ this.radioButtonManual.UseSelectable = true; this.radioButtonManual.CheckedChanged += new System.EventHandler(this.radioButtonManual_CheckedChanged); // - // labelSelectTexture - // - resources.ApplyResources(this.labelSelectTexture, "labelSelectTexture"); - this.labelSelectTexture.Name = "labelSelectTexture"; - this.labelSelectTexture.Theme = MetroFramework.MetroThemeStyle.Dark; - // // textSkinID // // @@ -188,7 +180,6 @@ this.textSkinID.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); this.textSkinID.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); this.textSkinID.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); - this.textSkinID.CustomButton.Margin = ((System.Windows.Forms.Padding)(resources.GetObject("resource.Margin"))); this.textSkinID.CustomButton.Name = ""; this.textSkinID.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); this.textSkinID.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; @@ -221,7 +212,6 @@ this.textSkinName.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image1"))); this.textSkinName.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode1"))); this.textSkinName.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location1"))); - this.textSkinName.CustomButton.Margin = ((System.Windows.Forms.Padding)(resources.GetObject("resource.Margin1"))); this.textSkinName.CustomButton.Name = ""; this.textSkinName.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size1"))); this.textSkinName.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; @@ -253,7 +243,6 @@ this.textThemeName.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image2"))); this.textThemeName.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode2"))); this.textThemeName.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location2"))); - this.textThemeName.CustomButton.Margin = ((System.Windows.Forms.Padding)(resources.GetObject("resource.Margin2"))); this.textThemeName.CustomButton.Name = ""; this.textThemeName.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size2"))); this.textThemeName.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; @@ -277,6 +266,12 @@ this.textThemeName.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); this.textThemeName.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // + // labelSelectTexture + // + resources.ApplyResources(this.labelSelectTexture, "labelSelectTexture"); + this.labelSelectTexture.Name = "labelSelectTexture"; + this.labelSelectTexture.Theme = MetroFramework.MetroThemeStyle.Dark; + // // capeLabel // resources.ApplyResources(this.capeLabel, "capeLabel"); @@ -291,14 +286,23 @@ this.buttonAnimGen.UseSelectable = true; this.buttonAnimGen.Click += new System.EventHandler(this.buttonAnimGen_Click); // - // buttonCape + // capePictureBox // - this.buttonCape.BackgroundImage = global::PckStudio.Properties.Resources.HamburgerMenuIcon; - resources.ApplyResources(this.buttonCape, "buttonCape"); - this.buttonCape.Name = "buttonCape"; - this.buttonCape.Theme = MetroFramework.MetroThemeStyle.Dark; - this.buttonCape.UseSelectable = true; - this.buttonCape.Click += new System.EventHandler(this.buttonCape_Click); + resources.ApplyResources(this.capePictureBox, "capePictureBox"); + this.capePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.capePictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; + this.capePictureBox.Name = "capePictureBox"; + this.capePictureBox.TabStop = false; + this.capePictureBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.capePictureBox_MouseClick); + // + // skinPictureBox + // + resources.ApplyResources(this.skinPictureBox, "skinPictureBox"); + this.skinPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.skinPictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; + this.skinPictureBox.Name = "skinPictureBox"; + this.skinPictureBox.TabStop = false; + this.skinPictureBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.skinPictureBox_MouseClick); // // AddSkinPrompt // @@ -320,43 +324,42 @@ this.Controls.Add(this.capePictureBox); this.Controls.Add(this.skinPictureBox); this.Controls.Add(this.displayBox); - this.Controls.Add(this.label3); + this.Controls.Add(label3); this.Controls.Add(label2); this.Controls.Add(label1); - this.ForeColor = System.Drawing.Color.White; this.MaximizeBox = false; this.Name = "AddSkinPrompt"; this.Load += new System.EventHandler(this.AddNewSkin_Load); + this.contextMenuSkin.ResumeLayout(false); + this.contextMenuCape.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.displayBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.skinPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.capePictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.skinPictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); } #endregion - - private System.Windows.Forms.Label label3; - private System.Windows.Forms.PictureBox displayBox; private System.Windows.Forms.TextBox textTheme; private System.Windows.Forms.ContextMenuStrip contextMenuSkin; private System.Windows.Forms.ToolStripMenuItem replaceToolStripMenuItem; private System.Windows.Forms.ContextMenuStrip contextMenuCape; private System.Windows.Forms.ToolStripMenuItem replaceToolStripMenuItem1; - private ToolboxItems.InterpolationPictureBox skinPictureBox; - private ToolboxItems.InterpolationPictureBox capePictureBox; - private MetroFramework.Controls.MetroButton buttonSkin; - private MetroFramework.Controls.MetroButton buttonModelGen; private MetroFramework.Controls.MetroButton buttonDone; + private MetroFramework.Controls.MetroButton buttonModelGen; + private MetroFramework.Controls.MetroButton buttonCape; + private MetroFramework.Controls.MetroButton buttonSkin; + private System.Windows.Forms.PictureBox displayBox; private MetroFramework.Controls.MetroRadioButton radioButtonAuto; private MetroFramework.Controls.MetroRadioButton radioButtonManual; + private MetroFramework.Controls.MetroTextBox textSkinID; + private MetroFramework.Controls.MetroTextBox textSkinName; + private MetroFramework.Controls.MetroTextBox textThemeName; + private PckStudio.ToolboxItems.InterpolationPictureBox skinPictureBox; + private PckStudio.ToolboxItems.InterpolationPictureBox capePictureBox; + private MetroFramework.Controls.MetroButton buttonAnimGen; private MetroFramework.Controls.MetroLabel labelSelectTexture; - private MetroFramework.Controls.MetroTextBox textSkinID; - private MetroFramework.Controls.MetroTextBox textSkinName; - private MetroFramework.Controls.MetroTextBox textThemeName; private MetroFramework.Controls.MetroLabel capeLabel; - private MetroFramework.Controls.MetroButton buttonAnimGen; - private MetroFramework.Controls.MetroButton buttonCape; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs index 69e16b34..92761663 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs @@ -14,6 +14,10 @@ using System.Windows.Forms; namespace PckStudio.Forms.Additional_Popups { + // ATTENTION + // 4 lines of code below have been commented out due to errors. + // - EternalModz + public partial class AddSkinPrompt : ThemeForm { public PckAsset SkinAsset => _skin; @@ -23,7 +27,7 @@ namespace PckStudio.Forms.Additional_Popups private LOCFile currentLoc; private PckAsset _skin = new PckAsset("dlcskinXYXYXYXY", PckAssetType.SkinFile); private PckAsset _cape; - private SkinANIM anim = new SkinANIM(); + private SkinANIM _anim = SkinANIM.Empty; private Random rng = new Random(); private eSkinType skinType; @@ -49,19 +53,19 @@ namespace PckStudio.Forms.Additional_Popups switch (img.Height) { case 64: - anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64, true); + //_anim = _anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64, true); MessageBox.Show(this, "64x64 Skin Detected"); skinType = eSkinType._64x64; break; case 32: - anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64 | SkinAnimFlag.SLIM_MODEL, false); + //_anim = _anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64 | SkinAnimFlag.SLIM_MODEL, false); MessageBox.Show(this, "64x32 Skin Detected"); skinType = eSkinType._64x32; break; default: if (img.Width == img.Height) { - anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64, true); + //_anim = _anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64, true); MessageBox.Show(this, "64x64 HD Skin Detected"); skinType = eSkinType._64x64HD; break; @@ -69,7 +73,7 @@ namespace PckStudio.Forms.Additional_Popups if (img.Height == img.Width / 2) { - anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64 | SkinAnimFlag.SLIM_MODEL, false); + //_anim = _anim.SetFlag(SkinAnimFlag.RESOLUTION_64x64 | SkinAnimFlag.SLIM_MODEL, false); MessageBox.Show(this, "64x32 HD Skin Detected"); skinType = eSkinType._64x32HD; break; @@ -91,43 +95,43 @@ namespace PckStudio.Forms.Additional_Popups private void DrawModel() { - bool isSlim = anim.GetFlag(SkinAnimFlag.SLIM_MODEL); + bool isSlim = _anim.GetFlag(SkinAnimFlag.SLIM_MODEL); Pen outlineColor = Pens.LightGray; Brush fillColor = Brushes.Gray; Image previewTexture = new Bitmap(displayBox.Width, displayBox.Height); using (Graphics g = Graphics.FromImage(previewTexture)) { - if (!anim.GetFlag(SkinAnimFlag.HEAD_DISABLED)) + if (!_anim.GetFlag(SkinAnimFlag.HEAD_DISABLED)) { //Head g.DrawRectangle(outlineColor, 70, 15, 40, 40); g.FillRectangle(fillColor, 71, 16, 39, 39); } - if (!anim.GetFlag(SkinAnimFlag.BODY_DISABLED)) + if (!_anim.GetFlag(SkinAnimFlag.BODY_DISABLED)) { //Body g.DrawRectangle(outlineColor, 70, 55, 40, 60); g.FillRectangle(fillColor, 71, 56, 39, 59); } - if (!anim.GetFlag(SkinAnimFlag.RIGHT_ARM_DISABLED)) + if (!_anim.GetFlag(SkinAnimFlag.RIGHT_ARM_DISABLED)) { //Arm0 g.DrawRectangle(outlineColor, isSlim ? 55 : 50, 55, isSlim ? 15 : 20, 60); g.FillRectangle(fillColor, isSlim ? 56 : 51, 56, isSlim ? 14 : 19, 59); } - if (!anim.GetFlag(SkinAnimFlag.LEFT_ARM_DISABLED)) + if (!_anim.GetFlag(SkinAnimFlag.LEFT_ARM_DISABLED)) { //Arm1 g.DrawRectangle(outlineColor, 110, 55, isSlim ? 15 : 20, 60); g.FillRectangle(fillColor, 111, 56, isSlim ? 14 : 19, 59); } - if (!anim.GetFlag(SkinAnimFlag.RIGHT_LEG_DISABLED)) + if (!_anim.GetFlag(SkinAnimFlag.RIGHT_LEG_DISABLED)) { //Leg0 g.DrawRectangle(outlineColor, 70, 115, 20, 60); g.FillRectangle(fillColor, 71, 116, 19, 59); } - if (!anim.GetFlag(SkinAnimFlag.LEFT_LEG_DISABLED)) + if (!_anim.GetFlag(SkinAnimFlag.LEFT_LEG_DISABLED)) { //Leg1 g.DrawRectangle(outlineColor, 90, 115, 20, 60); @@ -236,18 +240,18 @@ namespace PckStudio.Forms.Additional_Popups private void CreateButton_Click(object sender, EventArgs e) { - if (!int.TryParse(textSkinID.Text, out int _skinId)) + if (!int.TryParse(textSkinID.Text, out int skinId)) { MessageBox.Show(this, "The Skin ID Must be a Unique 8 Digit Number Thats Not Already in Use", "Invalid Skin ID", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - string skinId = _skinId.ToString("d08"); - _skin.Filename = $"dlcskin{skinId}.png"; + string skinIdStr = skinId.ToString("d08"); + _skin.Filename = $"dlcskin{skinIdStr}.png"; _skin.AddProperty("DISPLAYNAME", textSkinName.Text); if (currentLoc is not null) { - string skinDisplayNameLocKey = $"IDS_dlcskin{skinId}_DISPLAYNAME"; + string skinDisplayNameLocKey = $"IDS_dlcskin{skinIdStr}_DISPLAYNAME"; _skin.AddProperty("DISPLAYNAMEID", skinDisplayNameLocKey); currentLoc.AddLocKey(skinDisplayNameLocKey, textSkinName.Text); } @@ -257,17 +261,17 @@ namespace PckStudio.Forms.Additional_Popups _skin.AddProperty("THEMENAME", textThemeName.Text); if (currentLoc is not null) { - _skin.AddProperty("THEMENAMEID", $"IDS_dlcskin{skinId}_THEMENAME"); - currentLoc.AddLocKey($"IDS_dlcskin{skinId}_THEMENAME", textThemeName.Text); + _skin.AddProperty("THEMENAMEID", $"IDS_dlcskin{skinIdStr}_THEMENAME"); + currentLoc.AddLocKey($"IDS_dlcskin{skinIdStr}_THEMENAME", textThemeName.Text); } } - _skin.AddProperty("ANIM", anim); + _skin.AddProperty("ANIM", _anim); _skin.AddProperty("GAME_FLAGS", "0x18"); _skin.AddProperty("FREE", "1"); if (HasCape) { - _cape.Filename = $"dlccape{skinId}.png"; + _cape.Filename = $"dlccape{skinIdStr}.png"; _skin.AddProperty("CAPEPATH", _cape.Filename); } _skin.SetTexture(skinPictureBox.Image); @@ -321,10 +325,10 @@ namespace PckStudio.Forms.Additional_Popups private void buttonAnimGen_Click(object sender, EventArgs e) { - using ANIMEditor diag = new ANIMEditor(anim.ToString()); + using ANIMEditor diag = new ANIMEditor(_anim); if (diag.ShowDialog(this) == DialogResult.OK) { - anim = diag.ResultAnim; + _anim = diag.ResultAnim; DrawModel(); } } diff --git a/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.resx b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.resx index d65f0422..52a5695e 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.resx @@ -117,95 +117,29 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + False - + True - - NoControl - - - - 394, 63 - - - 6, 0, 6, 0 - - - 70, 25 - - - 102 - - - Skin ID - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 19 - - - False - - - True - - - NoControl - - - 394, 126 - - - 6, 0, 6, 0 - - - 102, 25 - - - 104 - - - Skin Name - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 18 - NoControl + - 394, 188 + 251, 117 - 6, 0, 6, 0 + 4, 0, 4, 0 - 130, 25 + 78, 15 - 106 + 128 Theme Name @@ -222,32 +156,77 @@ 17 - + + False + + + True + + NoControl - - 26, 58 + + 251, 80 - - 6, 6, 6, 6 + + 4, 0, 4, 0 - - 337, 332 + + 64, 15 - - 107 + + 127 - - displayBox + + Skin Name - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label2 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 16 + + 18 + + + False + + + True + + + NoControl + + + 251, 42 + + + 4, 0, 4, 0 + + + 43, 15 + + + 126 + + + Skin ID + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 102, 78 @@ -267,15 +246,6 @@ 17, 17 - - 61, 4 - - - contextMenuSkin - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -292,18 +262,18 @@ Replace + + 116, 26 + + + contextMenuSkin + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 172, 17 - - 61, 4 - - - contextMenuCape - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -318,143 +288,29 @@ Add Cape - - None + + 127, 26 - - NoControl + + contextMenuCape - - 535, 233 - - - 6, 6, 6, 6 - - - 149, 156 - - - Zoom - - - 108 - - - skinPictureBox - - - PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null - - - $this - - - 15 - - - None - - - NoControl - - - 704, 233 - - - 6, 6, 6, 6 - - - 149, 156 - - - StretchImage - - - 109 - - - False - - - capePictureBox - - - PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null - - - $this - - - 14 - - - Center - - - 642, 234 - - - 6, 6, 6, 6 - - - 42, 43 - - - 110 - - - buttonSkin - - - MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 13 - - - 26, 438 - - - 6, 6, 6, 6 - - - 165, 44 - - - 113 - - - Edit Model - - - buttonModelGen - - - MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 12 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 False - 722, 440 + 459, 268 - 6, 6, 6, 6 + 4, 4, 4, 4 - 138, 44 + 88, 26 - 115 + 135 Create Skin @@ -471,20 +327,131 @@ 11 + + 17, 267 + + + 4, 4, 4, 4 + + + 105, 26 + + + 134 + + + Edit Model + + + buttonModelGen + + + MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 12 + + + Center + + + 517, 212 + + + 4, 4, 4, 4 + + + 27, 26 + + + 133 + + + False + + + buttonCape + + + MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 2 + + + Center + + + 409, 212 + + + 4, 4, 4, 4 + + + 27, 26 + + + 132 + + + buttonSkin + + + MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 13 + + + NoControl + + + 17, 39 + + + 4, 4, 4, 4 + + + 214, 199 + + + 129 + + + displayBox + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + True - 685, 58 + 452, 27 - 6, 6, 6, 6 + 4, 4, 4, 4 75, 15 - 117 + 136 Auto-Gen @@ -505,16 +472,16 @@ True - 685, 87 + 452, 50 - 6, 6, 6, 6 + 4, 4, 4, 4 63, 15 - 118 + 137 Manual @@ -531,42 +498,6 @@ 9 - - True - - - False - - - 556, 325 - - - 6, 0, 6, 0 - - - 61, 19 - - - 119 - - - Add Skin - - - MiddleCenter - - - labelSelectTexture - - - MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 8 - @@ -574,13 +505,10 @@ NoControl - 96, 2 - - - 6, 6, 6, 6 + 64, 2 - 39, 39 + 21, 21 1 @@ -589,16 +517,16 @@ False - 535, 58 + 340, 39 - 6, 6, 6, 6 + 4, 4, 4, 4 - 138, 44 + 88, 26 - 121 + 139 textSkinID @@ -619,13 +547,10 @@ NoControl - 277, 2 - - - 6, 6, 6, 6 + 179, 2 - 39, 39 + 21, 21 1 @@ -634,16 +559,16 @@ False - 535, 121 + 340, 77 - 6, 6, 6, 6 + 4, 4, 4, 4 - 319, 44 + 203, 26 - 122 + 140 textSkinName @@ -664,13 +589,10 @@ NoControl - 277, 2 - - - 6, 6, 6, 6 + 179, 2 - 39, 39 + 21, 21 1 @@ -679,16 +601,16 @@ False - 535, 176 + 340, 110 - 6, 6, 6, 6 + 4, 4, 4, 4 - 319, 44 + 203, 26 - 123 + 141 textThemeName @@ -702,6 +624,42 @@ 5 + + True + + + False + + + 354, 182 + + + 4, 0, 4, 0 + + + 61, 19 + + + 138 + + + Add Skin + + + MiddleCenter + + + labelSelectTexture + + + MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + $this + + + 8 + True @@ -709,16 +667,16 @@ False - 717, 326 + 456, 182 - 6, 0, 6, 0 + 4, 0, 4, 0 69, 19 - 124 + 142 Add Cape @@ -745,16 +703,16 @@ False - 198, 438 + 126, 267 - 6, 6, 6, 6 + 4, 4, 4, 4 - 165, 44 + 105, 26 - 125 + 143 Edit Skin Flags @@ -771,47 +729,86 @@ 3 - - Center + + None - - 811, 234 + + NoControl - - 6, 6, 6, 6 + + 448, 144 - - 42, 43 + + 4, 4, 4, 4 - - 111 + + 96, 94 - + + StretchImage + + + 131 + + False - - buttonCape + + capePictureBox - - MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null - + $this - - 2 + + 14 + + + None + + + NoControl + + + 340, 144 + + + 4, 4, 4, 4 + + + 96, 94 + + + Zoom + + + 130 + + + skinPictureBox + + + PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null + + + $this + + + 15 True - 11, 25 + 7, 15 - 886, 511 + 564, 321 - Segoe UI, 14.25pt + Segoe UI, 9pt @@ -3319,17 +3316,23 @@ AP//AAA= + + NoControl + 0, 0 - 6, 6, 6, 6 + 4, 4, 4, 4 - - 37, 116, 37, 39 + + 561, 335 - WindowsDefaultLocation + CenterParent + + + Skin Creator replaceToolStripMenuItem