Moved ToolboxItems out of 'Classes' folder and moved AnimationPictureBox to ToolboxItems

This commit is contained in:
miku-666
2023-08-12 10:43:11 +02:00
parent e8e3445bcc
commit 9bfda0090c
12 changed files with 38 additions and 38 deletions

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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
{

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -132,13 +132,13 @@
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<Compile Include="Classes\ToolboxItems\BlendPictureBox.cs">
<Compile Include="ToolboxItems\BlendPictureBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Classes\ToolboxItems\PictureBoxWithInterpolationMode.cs">
<Compile Include="ToolboxItems\InterpolationPictureBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Classes\ToolboxItems\ToolStripRadioButtonMenuItem.cs">
<Compile Include="ToolboxItems\ToolStripRadioButtonMenuItem.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Classes\Utils\BinkaConverter.cs" />
@@ -274,7 +274,7 @@
<DependentUpon>MultiTextPrompt.cs</DependentUpon>
</Compile>
<Compile Include="Internal\Animation.cs" />
<Compile Include="Forms\Editor\AnimationPictureBox.cs">
<Compile Include="ToolboxItems\AnimationPictureBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Forms\Editor\MaterialsEditor.cs">

View File

@@ -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
{

View File

@@ -9,7 +9,7 @@ using PckStudio.Extensions;
namespace PckStudio.ToolboxItems
{
internal class BlendPictureBox : PictureBoxWithInterpolationMode
internal class BlendPictureBox : InterpolationPictureBox
{
[DefaultValue(false)]
[Category("Blending")]

View File

@@ -1,12 +1,12 @@
using System.Drawing.Drawing2D;
using System.Windows.Forms;
namespace PckStudio
namespace PckStudio.ToolboxItems
{
/// <summary>
/// Inherits from PictureBox; adds Interpolation Mode Setting
/// </summary>
public class PictureBoxWithInterpolationMode : PictureBox
public class InterpolationPictureBox : PictureBox
{
public InterpolationMode InterpolationMode { get; set; }

View File

@@ -4,7 +4,7 @@ using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
// source: <https://learn.microsoft.com/en-us/dotnet/desktop/winforms/controls/how-to-display-option-buttons-in-a-menustrip-windows-forms?view=netframeworkdesktop-4.8>
namespace PckStudio
namespace PckStudio.ToolboxItems
{
public class ToolStripRadioButtonMenuItem : ToolStripMenuItem
{