From 94e5fbfb8fa54e62aee4f717216b7bd618043658 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:06:23 +0200 Subject: [PATCH] Move AddNewSkin to Additional-Popups --- .../AddSkinPrompt.Designer.cs} | 6 +++--- .../AddSkinPrompt.cs} | 6 +++--- .../AddSkinPrompt.ja.resx} | 0 .../AddSkinPrompt.resx} | 0 PCK-Studio/MainForm.cs | 2 +- PCK-Studio/PckStudio.csproj | 14 +++++++------- 6 files changed, 14 insertions(+), 14 deletions(-) rename PCK-Studio/Forms/{Skins-And-Textures/AddNewSkin.Designer.cs => Additional-Popups/AddSkinPrompt.Designer.cs} (99%) rename PCK-Studio/Forms/{Skins-And-Textures/AddNewSkin.cs => Additional-Popups/AddSkinPrompt.cs} (98%) rename PCK-Studio/Forms/{Skins-And-Textures/addnewskin.ja.resx => Additional-Popups/AddSkinPrompt.ja.resx} (100%) rename PCK-Studio/Forms/{Skins-And-Textures/AddNewSkin.resx => Additional-Popups/AddSkinPrompt.resx} (100%) diff --git a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs similarity index 99% rename from PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs index 17e1ef1f..bd3df23c 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.Designer.cs @@ -1,6 +1,6 @@ -namespace PckStudio.Popups +namespace PckStudio.Forms.Additional_Popups { - partial class AddNewSkin + partial class AddSkinPrompt { /// /// Required designer variable. @@ -30,7 +30,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label label3; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddNewSkin)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddSkinPrompt)); System.Windows.Forms.Label label2; System.Windows.Forms.Label label1; this.textTheme = new System.Windows.Forms.TextBox(); diff --git a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs similarity index 98% rename from PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs rename to PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs index def7994e..7fed446d 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.cs @@ -13,9 +13,9 @@ using PckStudio.Forms; using PckStudio.Extensions; -namespace PckStudio.Popups +namespace PckStudio.Forms.Additional_Popups { - public partial class AddNewSkin : MetroFramework.Forms.MetroForm + public partial class AddSkinPrompt : MetroFramework.Forms.MetroForm { public PckAsset SkinAsset => _skin; public PckAsset CapeAsset => _cape; @@ -39,7 +39,7 @@ private enum eSkinType Custom, } - public AddNewSkin(LOCFile loc) + public AddSkinPrompt(LOCFile loc) { InitializeComponent(); currentLoc = loc; diff --git a/PCK-Studio/Forms/Skins-And-Textures/addnewskin.ja.resx b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.ja.resx similarity index 100% rename from PCK-Studio/Forms/Skins-And-Textures/addnewskin.ja.resx rename to PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.ja.resx diff --git a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.resx b/PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.resx similarity index 100% rename from PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.resx rename to PCK-Studio/Forms/Additional-Popups/AddSkinPrompt.resx diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index c420de93..4912cee9 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -1020,7 +1020,7 @@ private void createSkinToolStripMenuItem_Click(object sender, EventArgs e) { LOCFile locFile = null; TryGetLocFile(out locFile); - using AddNewSkin add = new AddNewSkin(locFile); + using AddSkinPrompt add = new AddSkinPrompt(locFile); if (add.ShowDialog(this) == DialogResult.OK) { if (currentPCK.HasAsset("Skins.pck", PckAssetType.SkinDataFile)) // Prioritize Skins.pck diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index c82f17d4..4fc86490 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -352,11 +352,11 @@ AddPropertyPrompt.cs - + Form - - AddNewSkin.cs + + AddSkinPrompt.cs Form @@ -501,11 +501,11 @@ AddPropertyPrompt.cs - - AddNewSkin.cs + + AddSkinPrompt.cs - - AddNewSkin.cs + + AddSkinPrompt.cs Designer