diff --git a/PCK-Studio/Controls/Editor/PckEditor.Designer.cs b/PCK-Studio/Controls/Editor/PckEditor.Designer.cs index c2a17c3e..942e80df 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.Designer.cs +++ b/PCK-Studio/Controls/Editor/PckEditor.Designer.cs @@ -68,7 +68,7 @@ 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.addFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.as3DSTextureFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); @@ -446,7 +446,7 @@ namespace PckStudio.Controls this.importSkinsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.importSkinToolStripMenuItem, this.importExtractedSkinsFolderToolStripMenuItem, - this.addFileToolStripMenuItem}); + this.importFileToolStripMenuItem}); resources.ApplyResources(this.importSkinsToolStripMenuItem, "importSkinsToolStripMenuItem"); this.importSkinsToolStripMenuItem.Name = "importSkinsToolStripMenuItem"; // @@ -462,12 +462,12 @@ namespace PckStudio.Controls this.importExtractedSkinsFolderToolStripMenuItem.Name = "importExtractedSkinsFolderToolStripMenuItem"; this.importExtractedSkinsFolderToolStripMenuItem.Click += new System.EventHandler(this.importExtractedSkinsFolder); // - // addFileToolStripMenuItem + // importFileToolStripMenuItem // - this.addFileToolStripMenuItem.Image = global::PckStudio.Properties.Resources.blank; - this.addFileToolStripMenuItem.Name = "addFileToolStripMenuItem"; - resources.ApplyResources(this.addFileToolStripMenuItem, "addFileToolStripMenuItem"); - this.addFileToolStripMenuItem.Click += new System.EventHandler(this.addFileToolStripMenuItem_Click); + this.importFileToolStripMenuItem.Image = global::PckStudio.Properties.Resources.blank; + this.importFileToolStripMenuItem.Name = "importFileToolStripMenuItem"; + resources.ApplyResources(this.importFileToolStripMenuItem, "importFileToolStripMenuItem"); + this.importFileToolStripMenuItem.Click += new System.EventHandler(this.importFileToolStripMenuItem_Click); // // exportToolStripMenuItem // @@ -809,7 +809,7 @@ 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 addFileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem importFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem as3DSTextureFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem miscFunctionsToolStripMenuItem; diff --git a/PCK-Studio/Controls/Editor/PckEditor.cs b/PCK-Studio/Controls/Editor/PckEditor.cs index d3fd651f..e6f6fdc7 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.cs +++ b/PCK-Studio/Controls/Editor/PckEditor.cs @@ -953,7 +953,7 @@ namespace PckStudio.Controls return audioFile; } - private void addFileToolStripMenuItem_Click(object sender, EventArgs e) + private void importFileToolStripMenuItem_Click(object sender, EventArgs e) { using var ofd = new OpenFileDialog(); // Suddenly, and randomly, this started throwing an exception because it wasn't formatted correctly? diff --git a/PCK-Studio/Controls/Editor/PckEditor.resx b/PCK-Studio/Controls/Editor/PckEditor.resx index b53ff066..4b34f037 100644 --- a/PCK-Studio/Controls/Editor/PckEditor.resx +++ b/PCK-Studio/Controls/Editor/PckEditor.resx @@ -912,7 +912,7 @@ True - 76, 60 + 76, 57 0, 0 @@ -957,7 +957,7 @@ False - 215, 30 + 215, 27 146, 20 @@ -1002,7 +1002,7 @@ False - 215, 62 + 215, 59 146, 20 @@ -1026,7 +1026,7 @@ Bottom, Right - 215, 88 + 215, 85 146, 33 @@ -1059,7 +1059,7 @@ True - 138, -47 + 138, -50 0, 0 @@ -1261,7 +1261,7 @@ - 180, 22 + 172, 22 Folder @@ -1283,7 +1283,7 @@ - 180, 22 + 172, 22 Skin @@ -1305,37 +1305,37 @@ - 180, 22 + 172, 22 Animated Texture - 180, 22 + 172, 22 Audio.pck - 180, 22 + 172, 22 Colours.col - 180, 22 + 172, 22 Skins.pck - 180, 22 + 172, 22 Behaviours.bin - 180, 22 + 172, 22 EntityMaterials.bin @@ -1348,7 +1348,7 @@ - 180, 22 + 147, 22 Create @@ -1392,11 +1392,11 @@ Import Extracted Skins Folder - + 227, 22 - - Add File + + Import File @@ -1407,7 +1407,7 @@ - 180, 22 + 147, 22 Import @@ -1419,13 +1419,13 @@ Export as 3DS Texture - 180, 22 + 147, 22 Export - 177, 6 + 144, 6 222, 22 @@ -1590,7 +1590,7 @@ Export Icon - 180, 22 + 147, 22 File Functions @@ -1605,16 +1605,16 @@ - 180, 22 + 147, 22 Extract - 177, 6 + 144, 6 - 180, 22 + 147, 22 Clone @@ -1627,7 +1627,7 @@ - 180, 22 + 147, 22 Rename @@ -1643,19 +1643,19 @@ - 180, 22 + 147, 22 Replace - 180, 22 + 147, 22 Delete - 181, 236 + 148, 214 contextMenuPCKEntries @@ -1911,10 +1911,10 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - addFileToolStripMenuItem + + importFileToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089