From 9bfda0090ce03eb9620baa1fb01f75ae999a6b9a Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 12 Aug 2023 10:43:11 +0200 Subject: [PATCH] Moved ToolboxItems out of 'Classes' folder and moved AnimationPictureBox to ToolboxItems --- .../Forms/Editor/AnimationEditor.Designer.cs | 4 +-- .../Editor/GameRuleFileEditor.Designer.cs | 28 +++++++++---------- PCK-Studio/Forms/Editor/GameRuleFileEditor.cs | 1 + .../Editor/TextureAtlasEditor.Designer.cs | 8 +++--- .../Skins-And-Textures/AddNewSkin.Designer.cs | 8 +++--- .../generateModel.Designer.cs | 4 +-- PCK-Studio/MainForm.Designer.cs | 4 +-- PCK-Studio/PckStudio.csproj | 8 +++--- .../AnimationPictureBox.cs | 3 +- .../ToolboxItems/BlendPictureBox.cs | 2 +- .../InterpolationPictureBox.cs} | 4 +-- .../ToolStripRadioButtonMenuItem.cs | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) rename PCK-Studio/{Forms/Editor => ToolboxItems}/AnimationPictureBox.cs (98%) rename PCK-Studio/{Classes => }/ToolboxItems/BlendPictureBox.cs (95%) rename PCK-Studio/{Classes/ToolboxItems/PictureBoxWithInterpolationMode.cs => ToolboxItems/InterpolationPictureBox.cs} (86%) rename PCK-Studio/{Classes => }/ToolboxItems/ToolStripRadioButtonMenuItem.cs (99%) diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs b/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs index bbf6e5bd..dfe5cdfa 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs @@ -58,7 +58,7 @@ this.InterpolationCheckbox = new MetroFramework.Controls.MetroCheckBox(); this.AnimationStartStopBtn = new MetroFramework.Controls.MetroButton(); this.tileLabel = new MetroFramework.Controls.MetroLabel(); - this.animationPictureBox = new PckStudio.Forms.Editor.AnimationPictureBox(); + this.animationPictureBox = new PckStudio.ToolboxItems.AnimationPictureBox(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.animationPictureBox)).BeginInit(); @@ -373,7 +373,7 @@ private System.Windows.Forms.MenuStrip menuStrip; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem1; - private PckStudio.Forms.Editor.AnimationPictureBox animationPictureBox; + private PckStudio.ToolboxItems.AnimationPictureBox animationPictureBox; private MetroFramework.Controls.MetroCheckBox InterpolationCheckbox; private MetroFramework.Controls.MetroButton AnimationStartStopBtn; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; diff --git a/PCK-Studio/Forms/Editor/GameRuleFileEditor.Designer.cs b/PCK-Studio/Forms/Editor/GameRuleFileEditor.Designer.cs index 5320010b..d7e8c3de 100644 --- a/PCK-Studio/Forms/Editor/GameRuleFileEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/GameRuleFileEditor.Designer.cs @@ -46,14 +46,14 @@ this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.compressionLvlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.levelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); - this.compressedToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); - this.compressedRLEToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); - this.compressedRLECRCToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); + this.noneToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); + this.compressedToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); + this.compressedRLEToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); + this.compressedRLECRCToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); this.typeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.wiiUPSVitaToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); - this.pS3ToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); - this.xbox360ToolStripMenuItem = new PckStudio.ToolStripRadioButtonMenuItem(); + this.wiiUPSVitaToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); + this.pS3ToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); + this.xbox360ToolStripMenuItem = new PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.MessageContextMenu.SuspendLayout(); this.DetailContextMenu.SuspendLayout(); @@ -360,15 +360,15 @@ private System.Windows.Forms.ToolStripMenuItem compressionLvlToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem levelToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem noneToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem compressedToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem compressedRLEToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem compressedRLECRCToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem noneToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem compressedToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem compressedRLEToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem compressedRLECRCToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem typeToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem wiiUPSVitaToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem pS3ToolStripMenuItem; - private PckStudio.ToolStripRadioButtonMenuItem xbox360ToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem wiiUPSVitaToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem pS3ToolStripMenuItem; + private PckStudio.ToolboxItems.ToolStripRadioButtonMenuItem xbox360ToolStripMenuItem; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs b/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs index 9f2e20e1..f69049c9 100644 --- a/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs +++ b/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs @@ -29,6 +29,7 @@ using System.Diagnostics; using OMI.Formats.Pck; using PckStudio.Forms.Additional_Popups; using PckStudio.Properties; +using PckStudio.ToolboxItems; namespace PckStudio.Forms.Editor { diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs index 7aac5d5f..28639a54 100644 --- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs @@ -38,8 +38,8 @@ this.applyColorMaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.playAnimationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.originalPictureBox = new PckStudio.PictureBoxWithInterpolationMode(); - this.selectTilePictureBox = new PckStudio.Forms.Editor.AnimationPictureBox(); + this.originalPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); + this.selectTilePictureBox = new PckStudio.ToolboxItems.AnimationPictureBox(); this.replaceButton = new MetroFramework.Controls.MetroButton(); this.animationButton = new MetroFramework.Controls.MetroButton(); this.tileNameLabel = new MetroFramework.Controls.MetroLabel(); @@ -279,12 +279,12 @@ #endregion - private PckStudio.Forms.Editor.AnimationPictureBox selectTilePictureBox; + private PckStudio.ToolboxItems.AnimationPictureBox selectTilePictureBox; private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private MetroFramework.Controls.MetroButton replaceButton; - private PictureBoxWithInterpolationMode originalPictureBox; + private PckStudio.ToolboxItems.InterpolationPictureBox originalPictureBox; private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private MetroFramework.Controls.MetroButton animationButton; private System.Windows.Forms.ToolStripMenuItem extractTileToolStripMenuItem; diff --git a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs index 3aa1d4b1..34a940d0 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.Designer.cs @@ -52,8 +52,8 @@ this.textThemeName = new MetroFramework.Controls.MetroTextBox(); this.label4 = new System.Windows.Forms.Label(); this.buttonAnimGen = new System.Windows.Forms.Button(); - this.capePictureBox = new PckStudio.PictureBoxWithInterpolationMode(); - this.skinPictureBoxTexture = new PckStudio.PictureBoxWithInterpolationMode(); + this.capePictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); + this.skinPictureBoxTexture = new PckStudio.ToolboxItems.InterpolationPictureBox(); label3 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); @@ -357,7 +357,7 @@ private System.Windows.Forms.Button buttonModelGen; private System.Windows.Forms.Button buttonCape; private System.Windows.Forms.Button buttonSkin; - private PictureBoxWithInterpolationMode capePictureBox; + private PckStudio.ToolboxItems.InterpolationPictureBox capePictureBox; private System.Windows.Forms.PictureBox displayBox; private System.Windows.Forms.RadioButton radioAUTO; private System.Windows.Forms.RadioButton radioLOCAL; @@ -365,7 +365,7 @@ private MetroFramework.Controls.MetroTextBox textSkinID; private MetroFramework.Controls.MetroTextBox textSkinName; private MetroFramework.Controls.MetroTextBox textThemeName; - private PictureBoxWithInterpolationMode skinPictureBoxTexture; + private PckStudio.ToolboxItems.InterpolationPictureBox skinPictureBoxTexture; private System.Windows.Forms.Button buttonAnimGen; private System.Windows.Forms.Label labelSelectTexture; private System.Windows.Forms.Label label4; diff --git a/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs index 5ac8d63d..f4864d91 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs @@ -60,7 +60,7 @@ this.comboParent = new System.Windows.Forms.ComboBox(); this.buttonEXPORT = new System.Windows.Forms.Button(); this.buttonIMPORT = new System.Windows.Forms.Button(); - this.uvPictureBox = new PckStudio.PictureBoxWithInterpolationMode(); + this.uvPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); this.buttonImportModel = new System.Windows.Forms.Button(); this.displayBox = new System.Windows.Forms.PictureBox(); this.buttonExportModel = new System.Windows.Forms.Button(); @@ -629,7 +629,7 @@ private System.Windows.Forms.Button buttonExportModel; private System.Windows.Forms.PictureBox displayBox; private System.Windows.Forms.Button buttonImportModel; - private PckStudio.PictureBoxWithInterpolationMode uvPictureBox; + private PckStudio.ToolboxItems.InterpolationPictureBox uvPictureBox; private System.Windows.Forms.Button buttonIMPORT; private System.Windows.Forms.Button buttonEXPORT; private System.Windows.Forms.ComboBox comboParent; diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs index 4afcb7c0..c498d019 100644 --- a/PCK-Studio/MainForm.Designer.cs +++ b/PCK-Studio/MainForm.Designer.cs @@ -147,7 +147,7 @@ this.label11 = new MetroFramework.Controls.MetroLabel(); this.treeViewMain = new System.Windows.Forms.TreeView(); this.imageList = new System.Windows.Forms.ImageList(this.components); - this.previewPictureBox = new PckStudio.PictureBoxWithInterpolationMode(); + this.previewPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); this.LittleEndianCheckBox = new MetroFramework.Controls.MetroCheckBox(); logoPictureBox = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(logoPictureBox)).BeginInit(); @@ -1219,7 +1219,7 @@ private MetroFramework.Controls.MetroLabel metroLabel2; private MetroFramework.Controls.MetroTextBox entryDataTextBox; private MetroFramework.Controls.MetroLabel fileEntryCountLabel; - private PictureBoxWithInterpolationMode previewPictureBox; + private PckStudio.ToolboxItems.InterpolationPictureBox previewPictureBox; private MetroFramework.Controls.MetroLabel labelImageSize; private MetroFramework.Controls.MetroButton buttonEdit; private System.Windows.Forms.ToolStripMenuItem skinPackToolStripMenuItem; diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 31879f0c..7f022fc1 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -132,13 +132,13 @@ - + Component - + Component - + Component @@ -274,7 +274,7 @@ MultiTextPrompt.cs - + Component diff --git a/PCK-Studio/Forms/Editor/AnimationPictureBox.cs b/PCK-Studio/ToolboxItems/AnimationPictureBox.cs similarity index 98% rename from PCK-Studio/Forms/Editor/AnimationPictureBox.cs rename to PCK-Studio/ToolboxItems/AnimationPictureBox.cs index d12edd93..5903520f 100644 --- a/PCK-Studio/Forms/Editor/AnimationPictureBox.cs +++ b/PCK-Studio/ToolboxItems/AnimationPictureBox.cs @@ -25,9 +25,8 @@ using System.Runtime.CompilerServices; using PckStudio.Extensions; using PckStudio.Internal; -using PckStudio.ToolboxItems; -namespace PckStudio.Forms.Editor +namespace PckStudio.ToolboxItems { internal class AnimationPictureBox : BlendPictureBox { diff --git a/PCK-Studio/Classes/ToolboxItems/BlendPictureBox.cs b/PCK-Studio/ToolboxItems/BlendPictureBox.cs similarity index 95% rename from PCK-Studio/Classes/ToolboxItems/BlendPictureBox.cs rename to PCK-Studio/ToolboxItems/BlendPictureBox.cs index e66ff10f..cd0307d6 100644 --- a/PCK-Studio/Classes/ToolboxItems/BlendPictureBox.cs +++ b/PCK-Studio/ToolboxItems/BlendPictureBox.cs @@ -9,7 +9,7 @@ using PckStudio.Extensions; namespace PckStudio.ToolboxItems { - internal class BlendPictureBox : PictureBoxWithInterpolationMode + internal class BlendPictureBox : InterpolationPictureBox { [DefaultValue(false)] [Category("Blending")] diff --git a/PCK-Studio/Classes/ToolboxItems/PictureBoxWithInterpolationMode.cs b/PCK-Studio/ToolboxItems/InterpolationPictureBox.cs similarity index 86% rename from PCK-Studio/Classes/ToolboxItems/PictureBoxWithInterpolationMode.cs rename to PCK-Studio/ToolboxItems/InterpolationPictureBox.cs index e613398a..3da28235 100644 --- a/PCK-Studio/Classes/ToolboxItems/PictureBoxWithInterpolationMode.cs +++ b/PCK-Studio/ToolboxItems/InterpolationPictureBox.cs @@ -1,12 +1,12 @@ using System.Drawing.Drawing2D; using System.Windows.Forms; -namespace PckStudio +namespace PckStudio.ToolboxItems { /// /// Inherits from PictureBox; adds Interpolation Mode Setting /// - public class PictureBoxWithInterpolationMode : PictureBox + public class InterpolationPictureBox : PictureBox { public InterpolationMode InterpolationMode { get; set; } diff --git a/PCK-Studio/Classes/ToolboxItems/ToolStripRadioButtonMenuItem.cs b/PCK-Studio/ToolboxItems/ToolStripRadioButtonMenuItem.cs similarity index 99% rename from PCK-Studio/Classes/ToolboxItems/ToolStripRadioButtonMenuItem.cs rename to PCK-Studio/ToolboxItems/ToolStripRadioButtonMenuItem.cs index 233124df..fa46be72 100644 --- a/PCK-Studio/Classes/ToolboxItems/ToolStripRadioButtonMenuItem.cs +++ b/PCK-Studio/ToolboxItems/ToolStripRadioButtonMenuItem.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using System.Windows.Forms.VisualStyles; // source: -namespace PckStudio +namespace PckStudio.ToolboxItems { public class ToolStripRadioButtonMenuItem : ToolStripMenuItem {