From 868d09fe9ba3ba799165d4740bd8d8f2c096cba5 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:56:57 +0100 Subject: [PATCH] Changed every Form to inherit from 'ThemeForm' --- .../Forms/Additional-Popups/AboutThisProgram.cs | 3 ++- .../Forms/Additional-Popups/AddPCKPassword.cs | 5 ++--- .../Forms/Additional-Popups/Animation/ChangeTile.cs | 3 ++- .../Additional-Popups/Animation/FrameEditor.cs | 4 ++-- .../Additional-Popups/Animation/SetBulkSpeed.cs | 3 ++- .../Additional-Popups/Audio/addCategory.Designer.cs | 2 +- .../Forms/Additional-Popups/Audio/addCategory.cs | 6 +++--- .../Forms/Additional-Popups/Audio/addCategory.resx | 5 ++++- .../Forms/Additional-Popups/Audio/creditsEditor.cs | 5 +++-- .../Forms/Additional-Popups/Audio/pleaseWait.cs | 3 ++- PCK-Studio/Forms/Additional-Popups/ChangeLogForm.cs | 9 ++------- .../Forms/Additional-Popups/CreateTexturePack.cs | 4 ++-- .../Forms/Additional-Popups/Grf/AddParameter.cs | 5 +++-- .../Forms/Additional-Popups/Loc/AddLanguage.cs | 5 +++-- PCK-Studio/Forms/Additional-Popups/LockPrompt.cs | 5 +++-- PCK-Studio/Forms/Additional-Popups/MetaList.cs | 5 ++--- PCK-Studio/Forms/Additional-Popups/MipMapPrompt.cs | 4 ++-- PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs | 4 ++-- PCK-Studio/Forms/Additional-Popups/TextPrompt.cs | 5 +++-- PCK-Studio/Forms/Editor/AnimationEditor.cs | 4 ++-- PCK-Studio/Forms/Editor/AudioEditor.cs | 4 ++-- PCK-Studio/Forms/Editor/COLEditor.cs | 4 ++-- PCK-Studio/Forms/Editor/GRFEditor.cs | 3 ++- PCK-Studio/Forms/Editor/LOCEditor.cs | 4 ++-- .../Forms/Skins-And-Textures/AdvancedOptions.cs | 3 ++- PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs | 4 ++-- PCK-Studio/Forms/Skins-And-Textures/addMeta.cs | 5 +++-- PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs | 3 ++- .../Forms/Skins-And-Textures/generateModel.cs | 4 ++-- PCK-Studio/Forms/Utilities/PCK Manager.cs | 4 ++-- PCK-Studio/Forms/Utilities/PckCenterBeta.cs | 13 ++----------- PCK-Studio/Forms/Utilities/Preferences.cs | 4 ++-- PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs | 3 ++- PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs | 5 +++-- .../Forms/Utilities/TextureConverterUtility.cs | 4 ++-- PCK-Studio/Forms/Utilities/installPS3.cs | 4 ++-- PCK-Studio/Forms/Utilities/installVita.cs | 4 ++-- PCK-Studio/Forms/Utilities/installWiiU.cs | 3 ++- PCK-Studio/Forms/Utilities/pckCenter.cs | 3 ++- PCK-Studio/Forms/Utilities/pckCenterOpen.cs | 3 ++- 40 files changed, 89 insertions(+), 84 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/AboutThisProgram.cs b/PCK-Studio/Forms/Additional-Popups/AboutThisProgram.cs index e5ad03ae..3da5b858 100644 --- a/PCK-Studio/Forms/Additional-Popups/AboutThisProgram.cs +++ b/PCK-Studio/Forms/Additional-Popups/AboutThisProgram.cs @@ -1,10 +1,11 @@ using System; using System.Windows.Forms; using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class AboutThisProgram : Form + public partial class AboutThisProgram : ThemeForm { int count = 0; public AboutThisProgram() diff --git a/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.cs b/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.cs index 1c34ca0e..ece3b9c0 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.cs @@ -1,11 +1,10 @@ using System; using System.Text; -using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class AddPCKPassword : Form + public partial class AddPCKPassword : ThemeForm { public string Password { get; private set; } public AddPCKPassword() diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs index b3987e69..d74bc85b 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Windows.Forms; using MetroFramework.Forms; using Newtonsoft.Json.Linq; +using PckStudio.Classes.ToolboxItems; using PckStudio.Forms.Utilities; namespace PckStudio.Forms.Additional_Popups.Animation { - public partial class ChangeTile : Form + public partial class ChangeTile : ThemeForm { string selectedTile = ""; diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs index fea68954..34f1fdd0 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs @@ -1,11 +1,11 @@ using System; using System.Drawing; -using MetroFramework.Forms; using System.Windows.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms.Additional_Popups.Animation { - public partial class FrameEditor : Form + public partial class FrameEditor : ThemeForm { public int FrameTextureIndex => FrameList.SelectedNode.Index; public int FrameTime => (int)FrameTimeUpDown.Value; diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.cs b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.cs index 9036a8e1..5f6086cc 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.cs @@ -1,10 +1,11 @@ using System; using MetroFramework.Forms; using System.Windows.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms.Additional_Popups.Animation { - public partial class SetBulkSpeed : Form + public partial class SetBulkSpeed : ThemeForm { public int time => (int)TimeUpDown.Value; public SetBulkSpeed(TreeView treeView) diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs index cf0e999e..7983ae6b 100644 --- a/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs @@ -75,7 +75,7 @@ this.Controls.Add(this.button1); this.Controls.Add(this.label2); this.ForeColor = System.Drawing.Color.White; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AddCategory"; diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.cs b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.cs index 6a06b1e6..ecc969f7 100644 --- a/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.cs +++ b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.cs @@ -1,18 +1,18 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Windows.Forms; // Audio Editor by MattNL namespace PckStudio.Forms.Additional_Popups.Audio { - public partial class AddCategory : Form + public partial class AddCategory : ThemeForm { private string _category = string.Empty; public string Category => _category; public AddCategory(string[] avalibleCategories) { InitializeComponent(); - this.FormBorderStyle = FormBorderStyle.None; comboBox1.Items.AddRange(avalibleCategories); } diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.resx b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.resx index 7d7f5772..01f9bdaf 100644 --- a/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.resx +++ b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.resx @@ -2457,6 +2457,9 @@ vbLH9tge22N7bI/tsT22x/bYHttjC+3/B71iqRn22EDpAAAAAElFTkSuQmCC + + 0, 0 + CenterScreen @@ -2464,6 +2467,6 @@ AddCategory - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + PckStudio.Classes.ToolboxItems.ThemeForm, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.cs b/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.cs index cfb5a76b..0c34341b 100644 --- a/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.cs +++ b/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.cs @@ -1,11 +1,12 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Windows.Forms; // Audio Editor by MattNL namespace PckStudio.Forms.Additional_Popups.Audio { - public partial class CreditsEditor : Form + public partial class CreditsEditor : ThemeForm { public string Credits => richTextBox1.Text; public CreditsEditor(string cred) diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs b/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs index 23cab2e6..34a0656b 100644 --- a/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs +++ b/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs @@ -1,9 +1,10 @@ using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; using System.Windows.Forms; namespace PckStudio.Forms.Additional_Popups.Audio { - public partial class PleaseWait : Form + public partial class PleaseWait : ThemeForm { public PleaseWait() { diff --git a/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.cs b/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.cs index 773a867f..9bf60258 100644 --- a/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.cs +++ b/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.cs @@ -1,15 +1,10 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; +using PckStudio.Classes.ToolboxItems; using PckStudio.Properties; namespace PckStudio.Forms.Additional_Popups { - public partial class ChangeLogForm : Form + public partial class ChangeLogForm : ThemeForm { public ChangeLogForm() { diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs index 7155f909..0185c5d0 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs +++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs @@ -1,10 +1,10 @@ using System; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class CreateTexturePack : Form + public partial class CreateTexturePack : ThemeForm { /// /// Text entered only access when DialogResult == DialogResult.OK diff --git a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.cs b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.cs index a515977b..6492e4d0 100644 --- a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.cs +++ b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.cs @@ -1,9 +1,10 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Windows.Forms; namespace PckStudio.Forms.Additional_Popups.Grf { - public partial class AddParameter : Form + public partial class AddParameter : ThemeForm { public string ParameterName => NameTextBox.Text; public string ParameterValue => ValueTextBox.Text; diff --git a/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.cs b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.cs index 5be36d01..49767ea1 100644 --- a/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.cs +++ b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.cs @@ -1,9 +1,10 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Windows.Forms; namespace PckStudio.Forms.Additional_Popups.Loc { - public partial class AddLanguage : Form + public partial class AddLanguage : ThemeForm { public string SelectedLanguage => LanguageComboBox.Text; public AddLanguage(string[] avalibleLanguages) diff --git a/PCK-Studio/Forms/Additional-Popups/LockPrompt.cs b/PCK-Studio/Forms/Additional-Popups/LockPrompt.cs index e3e318a9..662c340b 100644 --- a/PCK-Studio/Forms/Additional-Popups/LockPrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/LockPrompt.cs @@ -1,10 +1,11 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Text; using System.Windows.Forms; namespace PckStudio.Forms { - public partial class LockPrompt : Form + public partial class LockPrompt : ThemeForm { string pass; diff --git a/PCK-Studio/Forms/Additional-Popups/MetaList.cs b/PCK-Studio/Forms/Additional-Popups/MetaList.cs index 515a5c52..ce66c567 100644 --- a/PCK-Studio/Forms/Additional-Popups/MetaList.cs +++ b/PCK-Studio/Forms/Additional-Popups/MetaList.cs @@ -1,10 +1,9 @@ -using System; +using PckStudio.Classes.ToolboxItems; using System.Collections.Generic; -using System.Windows.Forms; namespace PckStudio { - public partial class MetaList : Form + public partial class MetaList : ThemeForm { public MetaList(List metaTags) { diff --git a/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.cs b/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.cs index a543e1ce..f140f953 100644 --- a/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/MipMapPrompt.cs @@ -1,10 +1,10 @@ using System; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class MipMapPrompt : Form + public partial class MipMapPrompt : ThemeForm { /// /// Text entered only access when DialogResult == DialogResult.OK diff --git a/PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs index 23d23ddd..1582b8d6 100644 --- a/PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs @@ -1,10 +1,10 @@ using System; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class RenamePrompt : Form + public partial class RenamePrompt : ThemeForm { /// /// Text entered only access when DialogResult == DialogResult.OK diff --git a/PCK-Studio/Forms/Additional-Popups/TextPrompt.cs b/PCK-Studio/Forms/Additional-Popups/TextPrompt.cs index 9f714e20..73ff9a18 100644 --- a/PCK-Studio/Forms/Additional-Popups/TextPrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/TextPrompt.cs @@ -1,9 +1,10 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Windows.Forms; namespace PckStudio.Forms.Additional_Popups { - public partial class TextPrompt : Form + public partial class TextPrompt : ThemeForm { public string[] TextOutput => DialogResult == DialogResult.OK ? PromptTextBox.Lines : null; public TextPrompt(string[] list = null) diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs index 1c4c31df..9ad0c6aa 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs @@ -1,4 +1,4 @@ -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; @@ -17,7 +17,7 @@ using PckStudio.Forms.Utilities; namespace PckStudio.Forms.Editor { - public partial class AnimationEditor : Form + public partial class AnimationEditor : ThemeForm { PCKFile.FileData animationFile; Animation currentAnimation; diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs index edd07c41..44708f08 100644 --- a/PCK-Studio/Forms/Editor/AudioEditor.cs +++ b/PCK-Studio/Forms/Editor/AudioEditor.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; using System.Diagnostics; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.PCK; using PckStudio.Forms.Additional_Popups.Audio; @@ -15,7 +15,7 @@ using PckStudio.Forms.Additional_Popups.Audio; namespace PckStudio.Forms.Editor { - public partial class AudioEditor : Form + public partial class AudioEditor : ThemeForm { public string defaultType = "yes"; Classes.Bink BINK = new Classes.Bink(); diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs index f26420cc..715994a8 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.cs @@ -4,13 +4,13 @@ using System.Drawing; using System.IO; using System.Linq; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.COL; namespace PckStudio.Forms.Editor { - public partial class COLEditor : Form + public partial class COLEditor : ThemeForm { COLFile default_colourfile = COLFileReader.Read(new MemoryStream(Properties.Resources.tu69colours)); COLFile colourfile; diff --git a/PCK-Studio/Forms/Editor/GRFEditor.cs b/PCK-Studio/Forms/Editor/GRFEditor.cs index 1490fa5c..d1f9516d 100644 --- a/PCK-Studio/Forms/Editor/GRFEditor.cs +++ b/PCK-Studio/Forms/Editor/GRFEditor.cs @@ -8,10 +8,11 @@ using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.GRF; using PckStudio.Forms.Additional_Popups.Grf; using PckStudio.Classes.Misc; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms.Editor { - public partial class GRFEditor : Form + public partial class GRFEditor : ThemeForm { private PCKFile.FileData _pckfile; private GRFFile _file; diff --git a/PCK-Studio/Forms/Editor/LOCEditor.cs b/PCK-Studio/Forms/Editor/LOCEditor.cs index 7c02368a..3ac3b48c 100644 --- a/PCK-Studio/Forms/Editor/LOCEditor.cs +++ b/PCK-Studio/Forms/Editor/LOCEditor.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq; using System.Collections.Generic; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; using PckStudio.Classes.Misc; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.LOC; @@ -12,7 +12,7 @@ using PckStudio.Forms.Additional_Popups.Loc; namespace PckStudio.Forms.Editor { - public partial class LOCEditor : Form + public partial class LOCEditor : ThemeForm { DataTable tbl; LOCFile currentLoc; diff --git a/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs index 66f4cbe7..9d170abf 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs @@ -1,4 +1,5 @@ using PckStudio.Classes.FileTypes; +using PckStudio.Classes.ToolboxItems; using System; using System.Data; using System.Drawing; @@ -8,7 +9,7 @@ using System.Windows.Forms; namespace PckStudio { - public partial class AdvancedOptions : Form + public partial class AdvancedOptions : ThemeForm { PCKFile currentPCK; diff --git a/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs b/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs index d24c9df4..f95b117c 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs @@ -1,13 +1,13 @@ using System; using System.Drawing; -using System.Windows.Forms; using PckStudio.Classes.Models.DefaultModels; +using PckStudio.Classes.ToolboxItems; using PckStudio.Classes.Utils; using PckStudio.Models; namespace PckStudio.Forms { - public partial class SkinPreview : Form + public partial class SkinPreview : ThemeForm { Image Texture; ModelBase Model; diff --git a/PCK-Studio/Forms/Skins-And-Textures/addMeta.cs b/PCK-Studio/Forms/Skins-And-Textures/addMeta.cs index 52b4ff17..74235704 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/addMeta.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/addMeta.cs @@ -1,9 +1,10 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Windows.Forms; namespace PckStudio { - public partial class AddMeta : Form + public partial class AddMeta : ThemeForm { public string PropertyName => textBox1.Text; public string PropertyValue => textBox2.Text; diff --git a/PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs b/PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs index ddbd2536..1b55f800 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs @@ -7,10 +7,11 @@ using PckStudio.Classes.FileTypes; using System.Drawing.Imaging; using PckStudio.Classes.Utils; using PckStudio.Classes._3ds.Utils; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class AddNewSkin : Form + public partial class AddNewSkin : ThemeForm { public PCKFile.FileData SkinFile => skin; diff --git a/PCK-Studio/Forms/Skins-And-Textures/generateModel.cs b/PCK-Studio/Forms/Skins-And-Textures/generateModel.cs index c3486750..e09f0dfc 100644 --- a/PCK-Studio/Forms/Skins-And-Textures/generateModel.cs +++ b/PCK-Studio/Forms/Skins-And-Textures/generateModel.cs @@ -8,13 +8,13 @@ using System.Windows.Forms; using System.Collections; using System.IO; using Newtonsoft.Json; -using MetroFramework.Forms; using PckStudio.Classes.FileTypes; using System.Text.RegularExpressions; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class GenerateModel : Form + public partial class GenerateModel : ThemeForm { PictureBox skinPreview; diff --git a/PCK-Studio/Forms/Utilities/PCK Manager.cs b/PCK-Studio/Forms/Utilities/PCK Manager.cs index 517b1d70..6bfb1e26 100644 --- a/PCK-Studio/Forms/Utilities/PCK Manager.cs +++ b/PCK-Studio/Forms/Utilities/PCK Manager.cs @@ -1,11 +1,11 @@ using System; using System.IO; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class PCK_Manager : Form + public partial class PCK_Manager : ThemeForm { public PCK_Manager() { diff --git a/PCK-Studio/Forms/Utilities/PckCenterBeta.cs b/PCK-Studio/Forms/Utilities/PckCenterBeta.cs index 68b890e7..0d40673f 100644 --- a/PCK-Studio/Forms/Utilities/PckCenterBeta.cs +++ b/PCK-Studio/Forms/Utilities/PckCenterBeta.cs @@ -1,17 +1,8 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Windows.Media.Imaging; -using MetroFramework.Forms; -using PckStudio.Classes.Misc; +using PckStudio.Classes.ToolboxItems; using PckStudio.Classes.Networking; using PckStudio.Classes.IO; using PckStudio.API.PCKCenter.model; @@ -19,7 +10,7 @@ using PckStudio.API.PCKCenter; namespace PckStudio.Forms.Utilities { - public partial class PCKCenterBeta : Form + public partial class PCKCenterBeta : ThemeForm { public PCKCenterBeta() { diff --git a/PCK-Studio/Forms/Utilities/Preferences.cs b/PCK-Studio/Forms/Utilities/Preferences.cs index 1192b56d..a4845fd4 100644 --- a/PCK-Studio/Forms/Utilities/Preferences.cs +++ b/PCK-Studio/Forms/Utilities/Preferences.cs @@ -1,11 +1,11 @@ using System; using System.IO; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class Preferences : Form + public partial class Preferences : ThemeForm { public Preferences() { diff --git a/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs index 0df7524b..92bde908 100644 --- a/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs +++ b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs @@ -5,10 +5,11 @@ using System.Linq; using System.IO; using System.Windows.Forms; using PckStudio.Classes.Utils; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms.Utilities.Skins { - public partial class ANIMEditor : Form + public partial class ANIMEditor : ThemeForm { public bool saved = false; readonly SkinANIM initialANIM; diff --git a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs index a57bdae7..8b45ed5f 100644 --- a/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs +++ b/PCK-Studio/Forms/Utilities/Skins/BoxEditor.cs @@ -1,10 +1,11 @@ -using System; +using PckStudio.Classes.ToolboxItems; +using System; using System.Text.RegularExpressions; using System.Windows.Forms; namespace PckStudio.Forms.Utilities.Skins { - public partial class BoxEditor : Form + public partial class BoxEditor : ThemeForm { public string Result; diff --git a/PCK-Studio/Forms/Utilities/TextureConverterUtility.cs b/PCK-Studio/Forms/Utilities/TextureConverterUtility.cs index babdf33b..85647a2c 100644 --- a/PCK-Studio/Forms/Utilities/TextureConverterUtility.cs +++ b/PCK-Studio/Forms/Utilities/TextureConverterUtility.cs @@ -3,13 +3,13 @@ using System.IO; using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; using PckStudio.Properties; using PckStudio.Classes.FileTypes; namespace PckStudio.Forms.Utilities { - public partial class TextureConverterUtility : Form + public partial class TextureConverterUtility : ThemeForm { public TextureConverterUtility(TreeView tv0, PCKFile pck) { diff --git a/PCK-Studio/Forms/Utilities/installPS3.cs b/PCK-Studio/Forms/Utilities/installPS3.cs index fc2e6ccd..a5cc922d 100644 --- a/PCK-Studio/Forms/Utilities/installPS3.cs +++ b/PCK-Studio/Forms/Utilities/installPS3.cs @@ -6,11 +6,11 @@ using System.Drawing; using System.IO; using System.Net; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class InstallPS3 : Form + public partial class InstallPS3 : ThemeForm { string loca = ""; string dlcPath = ""; diff --git a/PCK-Studio/Forms/Utilities/installVita.cs b/PCK-Studio/Forms/Utilities/installVita.cs index ecf56be7..2b024d5d 100644 --- a/PCK-Studio/Forms/Utilities/installVita.cs +++ b/PCK-Studio/Forms/Utilities/installVita.cs @@ -6,11 +6,11 @@ using System.Drawing; using System.IO; using System.Net; using System.Windows.Forms; -using MetroFramework.Forms; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class InstallVita : Form + public partial class InstallVita : ThemeForm { public InstallVita(string mod) { diff --git a/PCK-Studio/Forms/Utilities/installWiiU.cs b/PCK-Studio/Forms/Utilities/installWiiU.cs index 98042a5b..da826659 100644 --- a/PCK-Studio/Forms/Utilities/installWiiU.cs +++ b/PCK-Studio/Forms/Utilities/installWiiU.cs @@ -11,10 +11,11 @@ using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.PCK; using PckStudio.Classes.IO.ARC; using System.Diagnostics; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class InstallWiiU : Form + public partial class InstallWiiU : ThemeForm { string loca = ""; string dlcPath = ""; diff --git a/PCK-Studio/Forms/Utilities/pckCenter.cs b/PCK-Studio/Forms/Utilities/pckCenter.cs index 11bcf492..ea2bd490 100644 --- a/PCK-Studio/Forms/Utilities/pckCenter.cs +++ b/PCK-Studio/Forms/Utilities/pckCenter.cs @@ -10,10 +10,11 @@ using System.Diagnostics; using PckStudio.Classes.Misc; using PckStudio.API.PCKCenter.model; using PckStudio.API.PCKCenter; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class PCKCenter : Form + public partial class PCKCenter : ThemeForm { string[] mods; static string hosturl = Program.BaseAPIUrl; diff --git a/PCK-Studio/Forms/Utilities/pckCenterOpen.cs b/PCK-Studio/Forms/Utilities/pckCenterOpen.cs index 30a386a2..ff0e50e0 100644 --- a/PCK-Studio/Forms/Utilities/pckCenterOpen.cs +++ b/PCK-Studio/Forms/Utilities/pckCenterOpen.cs @@ -17,10 +17,11 @@ using PckStudio; using System.IO.Compression; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.PCK; +using PckStudio.Classes.ToolboxItems; namespace PckStudio.Forms { - public partial class PCKCenterOpen : Form + public partial class PCKCenterOpen : ThemeForm { string name; string author;