diff --git a/PCK-Studio/Controls/Editor/PckEditor.Designer.cs b/PCK-Studio/Controls/Editor/PckEditor.Designer.cs index 9fdc03d7..c2a17c3e 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.Designer.cs +++ b/PCK-Studio/Controls/Editor/PckEditor.Designer.cs @@ -68,7 +68,6 @@ namespace PckStudio.Controls this.importSkinsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importSkinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importExtractedSkinsFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addTextureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.as3DSTextureFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -447,7 +446,6 @@ namespace PckStudio.Controls this.importSkinsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.importSkinToolStripMenuItem, this.importExtractedSkinsFolderToolStripMenuItem, - this.addTextureToolStripMenuItem, this.addFileToolStripMenuItem}); resources.ApplyResources(this.importSkinsToolStripMenuItem, "importSkinsToolStripMenuItem"); this.importSkinsToolStripMenuItem.Name = "importSkinsToolStripMenuItem"; @@ -464,13 +462,6 @@ namespace PckStudio.Controls this.importExtractedSkinsFolderToolStripMenuItem.Name = "importExtractedSkinsFolderToolStripMenuItem"; this.importExtractedSkinsFolderToolStripMenuItem.Click += new System.EventHandler(this.importExtractedSkinsFolder); // - // addTextureToolStripMenuItem - // - this.addTextureToolStripMenuItem.Image = global::PckStudio.Properties.Resources.AddTexture; - this.addTextureToolStripMenuItem.Name = "addTextureToolStripMenuItem"; - resources.ApplyResources(this.addTextureToolStripMenuItem, "addTextureToolStripMenuItem"); - this.addTextureToolStripMenuItem.Click += new System.EventHandler(this.addTextureToolStripMenuItem_Click); - // // addFileToolStripMenuItem // this.addFileToolStripMenuItem.Image = global::PckStudio.Properties.Resources.blank; @@ -818,7 +809,6 @@ namespace PckStudio.Controls private System.Windows.Forms.ToolStripMenuItem importSkinsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importSkinToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importExtractedSkinsFolderToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem addTextureToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem addFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem as3DSTextureFileToolStripMenuItem; diff --git a/PCK-Studio/Controls/Editor/PckEditor.cs b/PCK-Studio/Controls/Editor/PckEditor.cs index da30dc76..3b0cb7ce 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.cs +++ b/PCK-Studio/Controls/Editor/PckEditor.cs @@ -980,28 +980,6 @@ namespace PckStudio.Controls return; } - private void addTextureToolStripMenuItem_Click(object sender, EventArgs e) - { - using OpenFileDialog fileDialog = new OpenFileDialog(); - fileDialog.Filter = "Texture File(*.png,*.tga)|*.png;*.tga"; - if (fileDialog.ShowDialog(this) == DialogResult.OK) - { - using TextPrompt renamePrompt = new TextPrompt(Path.GetFileName(fileDialog.FileName)); - renamePrompt.LabelText = "Path"; - if (renamePrompt.ShowDialog(this) == DialogResult.OK && !string.IsNullOrEmpty(renamePrompt.NewText)) - { - if (EditorValue.File.Contains(renamePrompt.NewText, PckAssetType.TextureFile)) - { - MessageBox.Show(this, $"'{renamePrompt.NewText}' already exists.", "Import failed", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return; - } - PckAsset asset = EditorValue.File.CreateNewAsset(renamePrompt.NewText, PckAssetType.TextureFile, () => File.ReadAllBytes(fileDialog.FileName)); - BuildMainTreeView(); - _wasModified = true; - } - } - } - [Obsolete("Refactor or remove this")] private void importSkinToolStripMenuItem_Click(object sender, EventArgs e) { diff --git a/PCK-Studio/Controls/Editor/PckEditor.resx b/PCK-Studio/Controls/Editor/PckEditor.resx index 3bf2f640..b53ff066 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.resx +++ b/PCK-Studio/Controls/Editor/PckEditor.resx @@ -912,7 +912,7 @@ True - 76, 63 + 76, 60 0, 0 @@ -957,7 +957,7 @@ False - 215, 33 + 215, 30 146, 20 @@ -1002,7 +1002,7 @@ False - 215, 65 + 215, 62 146, 20 @@ -1026,7 +1026,7 @@ Bottom, Right - 215, 91 + 215, 88 146, 33 @@ -1059,7 +1059,7 @@ True - 138, -44 + 138, -47 0, 0 @@ -1261,7 +1261,7 @@ - 172, 22 + 180, 22 Folder @@ -1283,7 +1283,7 @@ - 172, 22 + 180, 22 Skin @@ -1305,37 +1305,37 @@ - 172, 22 + 180, 22 Animated Texture - 172, 22 + 180, 22 Audio.pck - 172, 22 + 180, 22 Colours.col - 172, 22 + 180, 22 Skins.pck - 172, 22 + 180, 22 Behaviours.bin - 172, 22 + 180, 22 EntityMaterials.bin @@ -1392,12 +1392,6 @@ Import Extracted Skins Folder - - 227, 22 - - - Add Texture - 227, 22 @@ -1524,19 +1518,19 @@ Generate MipMap Texture - 180, 22 + 163, 22 Models Version 1 - 180, 22 + 163, 22 Models Version 2 - 180, 22 + 163, 22 Models Version 3 @@ -1548,25 +1542,25 @@ Set Model Container version - 180, 22 + 147, 22 BOX Version 0 - 180, 22 + 147, 22 BOX Version 1 - 180, 22 + 147, 22 BOX Version 2 - 180, 22 + 147, 22 BOX Version 3 @@ -1917,12 +1911,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - addTextureToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - addFileToolStripMenuItem