From c09a3cc27f083454a1bb1dd69dbcc84ecea0cb27 Mon Sep 17 00:00:00 2001 From: MayNL Date: Mon, 22 Jun 2026 18:03:06 -0400 Subject: [PATCH] Removed "Import Skin" tool --- .../Controls/Editor/PckEditor.Designer.cs | 13 +--- PCK-Studio/Controls/Editor/PckEditor.cs | 57 ---------------- PCK-Studio/Controls/Editor/PckEditor.resx | 68 ++++++------------- 3 files changed, 22 insertions(+), 116 deletions(-) diff --git a/PCK-Studio/Controls/Editor/PckEditor.Designer.cs b/PCK-Studio/Controls/Editor/PckEditor.Designer.cs index 942e80df..6e0ad411 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.Designer.cs +++ b/PCK-Studio/Controls/Editor/PckEditor.Designer.cs @@ -66,7 +66,6 @@ namespace PckStudio.Controls this.behavioursbinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.entityMaterialsbinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importSkinsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importSkinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importExtractedSkinsFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -444,18 +443,11 @@ namespace PckStudio.Controls // importSkinsToolStripMenuItem // this.importSkinsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.importSkinToolStripMenuItem, - this.importExtractedSkinsFolderToolStripMenuItem, - this.importFileToolStripMenuItem}); + this.importFileToolStripMenuItem, + this.importExtractedSkinsFolderToolStripMenuItem}); resources.ApplyResources(this.importSkinsToolStripMenuItem, "importSkinsToolStripMenuItem"); this.importSkinsToolStripMenuItem.Name = "importSkinsToolStripMenuItem"; // - // importSkinToolStripMenuItem - // - resources.ApplyResources(this.importSkinToolStripMenuItem, "importSkinToolStripMenuItem"); - this.importSkinToolStripMenuItem.Name = "importSkinToolStripMenuItem"; - this.importSkinToolStripMenuItem.Click += new System.EventHandler(this.importSkinToolStripMenuItem_Click); - // // importExtractedSkinsFolderToolStripMenuItem // resources.ApplyResources(this.importExtractedSkinsFolderToolStripMenuItem, "importExtractedSkinsFolderToolStripMenuItem"); @@ -807,7 +799,6 @@ namespace PckStudio.Controls private System.Windows.Forms.ToolStripMenuItem behavioursbinToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem entityMaterialsbinToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importSkinsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem importSkinToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importExtractedSkinsFolderToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem; diff --git a/PCK-Studio/Controls/Editor/PckEditor.cs b/PCK-Studio/Controls/Editor/PckEditor.cs index 146a1aae..ae2dbb90 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.cs +++ b/PCK-Studio/Controls/Editor/PckEditor.cs @@ -966,63 +966,6 @@ namespace PckStudio.Controls return; } - [Obsolete("Refactor or remove this")] - private void importSkinToolStripMenuItem_Click(object sender, EventArgs e) - { - using (OpenFileDialog contents = new OpenFileDialog()) - { - contents.Title = "Select Extracted Skin File"; - contents.Filter = "Skin File (*.png)|*.png"; - - if (contents.ShowDialog() == DialogResult.OK) - { - string skinNameImport = Path.GetFileName(contents.FileName); - byte[] data = File.ReadAllBytes(contents.FileName); - PckAsset mfNew = EditorValue.File.CreateNewAsset(skinNameImport, PckAssetType.SkinFile); - mfNew.SetData(data); - string propertyFile = Path.GetFileNameWithoutExtension(contents.FileName) + ".txt"; - if (File.Exists(propertyFile)) - { - string[] txtProperties = File.ReadAllLines(propertyFile); - if ((txtProperties.Contains("DISPLAYNAMEID") && txtProperties.Contains("DISPLAYNAME")) || - txtProperties.Contains("THEMENAMEID") && txtProperties.Contains("THEMENAME") && - TryGetLocFile(out LOCFile locFile)) - { - // do stuff - //l.AddLocKey(locThemeId, locTheme); - //using (var stream = new MemoryStream()) - //{ - // LOCFileWriter.Write(stream, locFile); - // locdata.SetData(stream.ToArray()); - //} - } - - try - { - foreach (string prop in txtProperties) - { - string[] arg = prop.Split(':'); - if (arg.Length < 2) - continue; - string key = arg[0]; - string value = arg[1]; - if (key == "DISPLAYNAMEID" || key == "THEMENAMEID") - { - - } - mfNew.AddParameter(key, value); - } - _wasModified = true; - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } - } - } - } - } - private void folderToolStripMenuItem_Click(object sender, EventArgs e) { TextPrompt folderNamePrompt = new TextPrompt(); diff --git a/PCK-Studio/Controls/Editor/PckEditor.resx b/PCK-Studio/Controls/Editor/PckEditor.resx index 4b34f037..b80a18d8 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.resx +++ b/PCK-Studio/Controls/Editor/PckEditor.resx @@ -912,7 +912,7 @@ True - 76, 57 + 76, 51 0, 0 @@ -957,7 +957,7 @@ False - 215, 27 + 215, 21 146, 20 @@ -1002,7 +1002,7 @@ False - 215, 59 + 215, 53 146, 20 @@ -1026,7 +1026,7 @@ Bottom, Right - 215, 85 + 215, 79 146, 33 @@ -1059,7 +1059,7 @@ True - 138, -50 + 138, -56 0, 0 @@ -1348,32 +1348,16 @@ - 147, 22 + 180, 22 Create - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xOdTWsmQAAAImSURBVDhPpc/d - T1JxHMdxLosny82tHI9pRSeKWt4oA3mQw+aQ1lq2pdFKBQ5x6OzMaYkmlSWksS6aF8Jqri4UbT1g5jS6 - 7D9p66Yu6ybOp50vAoN10/ptr52d7fd9f89RKP73AFDYTBoweg1OGjSwGVuIRa8inYf2kWPtSmI1qOie - fF+erQSMLbDq1I0BnYocObyfdLRXMAZ5kRYndOp6QB5sdq7zIPEwB+BhWtHLtBF5WCZ/XUNgfIjF7PV+ - zI0GyWL8MhZvDiIbCeJJNIgF7gKZuuTGnUEnTpu1jYGVVBhbmThKWZF8WUqR0oJYkR0nhYkhrE9cRdfR - 1npgdXoMxQdxbM7xWLsbJuuzCWykbmFZGMaycAW7GZHkuQHkuH5SCxRmwtisBqZHIb+/TvEkLw6TnYyA - 3YyAPBdAjgvQsxaQB399/wpJksDan4PtXkUxOYYPyQh29jb7etbA2l/JQyhLv2lJLVB8yOPnj28oSxJ8 - 9hfw9azgfTKKrWQEpXkRnzIi/N0FsPaXdEcql1GYidYD+REWbydDKCZv4ON9kXC9NsRcZ2pK6Tg+p+NA - m4KkLnbVA7kRP97cDqE4FcK7ewKJO0+Bd9RtP0pgez7x98DTkBfPrrmxFHLBZVLBbVIjPeDA40BddbAZ - BQSfFYKXAd9nqQTManj1SuI3a0nzYEOA9zOI9R1HzGeBw6yC06yG06gkng5tg+rg5PmzlV/411PbvHf+ - ACl773zoakfrAAAAAElFTkSuQmCC - - - + 227, 22 - - Import Skin + + Import File @@ -1392,12 +1376,6 @@ Import Extracted Skins Folder - - 227, 22 - - - Import File - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1407,7 +1385,7 @@ - 147, 22 + 180, 22 Import @@ -1419,13 +1397,13 @@ Export as 3DS Texture - 147, 22 + 180, 22 Export - 144, 6 + 177, 6 222, 22 @@ -1590,7 +1568,7 @@ Export Icon - 147, 22 + 180, 22 File Functions @@ -1605,16 +1583,16 @@ - 147, 22 + 180, 22 Extract - 144, 6 + 177, 6 - 147, 22 + 180, 22 Clone @@ -1627,7 +1605,7 @@ - 147, 22 + 180, 22 Rename @@ -1643,19 +1621,19 @@ - 147, 22 + 180, 22 Replace - 147, 22 + 180, 22 Delete - 148, 214 + 181, 236 contextMenuPCKEntries @@ -1899,12 +1877,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - importSkinToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - importExtractedSkinsFolderToolStripMenuItem