From 8522fabd601c71ae93d59edd32cc065897e020a8 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 6 Aug 2022 01:04:51 +0200 Subject: [PATCH] Move AudioEditor to `Forms/Editor` and related files to `Additional-Popups` and renamed some namespaces related to `Additional-Popups` --- .../Audio/addCategory.Designer.cs | 2 +- .../Audio/addCategory.cs | 2 +- .../Audio/addCategory.resx | 0 .../Audio/creditsEditor.Designer.cs | 2 +- .../Audio/creditsEditor.cs | 2 +- .../Audio/creditsEditor.resx | 0 .../Audio/pleaseWait.Designer.cs | 2 +- .../Audio/pleaseWait.cs | 2 +- .../Audio/pleaseWait.resx | 0 .../Grf/AddParameter.Designer.cs | 2 +- .../Additional-Popups/Grf/AddParameter.cs | 2 +- .../Audio => Editor}/AudioEditor.Designer.cs | 2 +- .../Audio => Editor}/AudioEditor.cs | 21 +++++++--------- .../Audio => Editor}/AudioEditor.resx | 0 .../Forms/Editor/GRFEditor.cs | 2 +- MinecraftUSkinEditor/MainForm.cs | 5 ++-- MinecraftUSkinEditor/PckStudio.csproj | 24 +++++++++---------- 17 files changed, 33 insertions(+), 37 deletions(-) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/addCategory.Designer.cs (98%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/addCategory.cs (94%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/addCategory.resx (100%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/creditsEditor.Designer.cs (98%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/creditsEditor.cs (92%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/creditsEditor.resx (100%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/pleaseWait.Designer.cs (97%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/pleaseWait.cs (87%) rename MinecraftUSkinEditor/Forms/{Utilities => Additional-Popups}/Audio/pleaseWait.resx (100%) rename MinecraftUSkinEditor/Forms/{Utilities/Audio => Editor}/AudioEditor.Designer.cs (99%) rename MinecraftUSkinEditor/Forms/{Utilities/Audio => Editor}/AudioEditor.cs (96%) rename MinecraftUSkinEditor/Forms/{Utilities/Audio => Editor}/AudioEditor.resx (100%) diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.Designer.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.Designer.cs similarity index 98% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.Designer.cs rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.Designer.cs index 225e34bb..cb7dbe12 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.Designer.cs @@ -1,4 +1,4 @@ -namespace PckStudio +namespace PckStudio.Forms.Additional_Popups.Audio { partial class addCategory { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.cs similarity index 94% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.cs rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.cs index e0030883..aecd9c6b 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; // Audio Editor by MattNL -namespace PckStudio +namespace PckStudio.Forms.Additional_Popups.Audio { public partial class addCategory : MetroFramework.Forms.MetroForm { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.resx b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.resx rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.Designer.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs similarity index 98% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.Designer.cs rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs index 9287ccd5..72ab8658 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs @@ -1,4 +1,4 @@ -namespace PckStudio +namespace PckStudio.Forms.Additional_Popups.Audio { partial class creditsEditor { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.cs similarity index 92% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.cs rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.cs index 8503a1b9..c769d246 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; // Audio Editor by MattNL -namespace PckStudio +namespace PckStudio.Forms.Additional_Popups.Audio { public partial class creditsEditor : MetroFramework.Forms.MetroForm { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.resx b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.resx rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.Designer.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs similarity index 97% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.Designer.cs rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs index 9b76cde6..3e8cd5fd 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs @@ -1,4 +1,4 @@ -namespace PckStudio.Forms.Utilities.Audio +namespace PckStudio.Forms.Additional_Popups.Audio { partial class pleaseWait { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.cs similarity index 87% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.cs rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.cs index 1c351e45..23fe5fcd 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using MetroFramework.Forms; -namespace PckStudio.Forms.Utilities.Audio +namespace PckStudio.Forms.Additional_Popups.Audio { public partial class pleaseWait : MetroForm { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.resx b/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.resx rename to MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs index 5f33767f..0e4fac52 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs @@ -1,4 +1,4 @@ -namespace PckStudio.Forms.Utilities.Grf +namespace PckStudio.Forms.Additional_Popups.Grf { partial class AddParameter { diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs b/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs index 322fdf44..6a7c2252 100644 --- a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs +++ b/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace PckStudio.Forms.Utilities.Grf +namespace PckStudio.Forms.Additional_Popups.Grf { public partial class AddParameter : MetroFramework.Forms.MetroForm { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.Designer.cs b/MinecraftUSkinEditor/Forms/Editor/AudioEditor.Designer.cs similarity index 99% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.Designer.cs rename to MinecraftUSkinEditor/Forms/Editor/AudioEditor.Designer.cs index 024a9c19..9afe8a3a 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.Designer.cs +++ b/MinecraftUSkinEditor/Forms/Editor/AudioEditor.Designer.cs @@ -1,5 +1,5 @@  -namespace PckStudio.Forms.Utilities +namespace PckStudio.Forms.Editor { partial class AudioEditor { diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs b/MinecraftUSkinEditor/Forms/Editor/AudioEditor.cs similarity index 96% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs rename to MinecraftUSkinEditor/Forms/Editor/AudioEditor.cs index d2809444..4cf09777 100644 --- a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs +++ b/MinecraftUSkinEditor/Forms/Editor/AudioEditor.cs @@ -1,24 +1,21 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using System.Diagnostics; using MetroFramework.Forms; using System.Collections; using PckStudio.Classes.FileTypes; -using PckStudio.Classes.IO; using PckStudio.Classes.IO.PCK; -using System.Diagnostics; +using PckStudio.Forms.Additional_Popups.Audio; // Audio Editor by MattNL // additional work and optimization by Miku-666 -namespace PckStudio.Forms.Utilities +namespace PckStudio.Forms.Editor { public partial class AudioEditor : MetroForm { @@ -56,17 +53,17 @@ namespace PckStudio.Forms.Utilities }; private string GetCategoryFromId(PCKAudioFile.AudioCategory.EAudioType categoryId) - { - return categoryId >= PCKAudioFile.AudioCategory.EAudioType.Overworld - && categoryId <= PCKAudioFile.AudioCategory.EAudioType.Unused ? Categories[(int)categoryId] : "Not valid"; - } + => categoryId >= PCKAudioFile.AudioCategory.EAudioType.Overworld && + categoryId <= PCKAudioFile.AudioCategory.EAudioType.Unused + ? Categories[(int)categoryId] + : "Not valid"; private PCKAudioFile.AudioCategory.EAudioType GetCategoryId(string category) { return (PCKAudioFile.AudioCategory.EAudioType)Categories.IndexOf(category); } - public static PCKFile.FileData CreateAudioPck(bool isLittle) + public static PCKFile.FileData CreateAudioPck(bool isLittle) { // create actual valid pck file structure PCKAudioFile audioPck = new PCKAudioFile(); @@ -301,7 +298,7 @@ namespace PckStudio.Forms.Utilities if (Path.GetExtension(file) == ".wav") // Convert Wave to BINKA { Cursor.Current = Cursors.WaitCursor; - Audio.pleaseWait waitDiag = new Audio.pleaseWait(); + pleaseWait waitDiag = new pleaseWait(); waitDiag.Show(this); int error_code = 0; diff --git a/MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.resx b/MinecraftUSkinEditor/Forms/Editor/AudioEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.resx rename to MinecraftUSkinEditor/Forms/Editor/AudioEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs b/MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs index 12ab3162..0e0fa29e 100644 --- a/MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs +++ b/MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs @@ -1,6 +1,6 @@ using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.GRF; -using PckStudio.Forms.Utilities.Grf; +using PckStudio.Forms.Additional_Popups.Grf; using RichPresenceClient; using System; using System.Collections.Generic; diff --git a/MinecraftUSkinEditor/MainForm.cs b/MinecraftUSkinEditor/MainForm.cs index cec9986d..bce20f95 100644 --- a/MinecraftUSkinEditor/MainForm.cs +++ b/MinecraftUSkinEditor/MainForm.cs @@ -8,15 +8,14 @@ using System.Drawing.Drawing2D; using System.Diagnostics; using PckStudio.Properties; using Ohana3DS_Rebirth.Ohana; -using PckStudio.Forms; using System.Drawing.Imaging; using RichPresenceClient; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO; using PckStudio.Classes.IO.LOC; -using PckStudio.Forms.Utilities; using PckStudio.Classes.IO.GRF; -using PckStudio.Classes.Utils; +using PckStudio.Forms; +using PckStudio.Forms.Utilities; using PckStudio.Forms.Editor; namespace PckStudio diff --git a/MinecraftUSkinEditor/PckStudio.csproj b/MinecraftUSkinEditor/PckStudio.csproj index 88cd4914..589b6ce3 100644 --- a/MinecraftUSkinEditor/PckStudio.csproj +++ b/MinecraftUSkinEditor/PckStudio.csproj @@ -233,16 +233,16 @@ SetBulkSpeed.cs - + Form - + creditsEditor.cs - + Form - + addCategory.cs @@ -281,10 +281,10 @@ AddParameter.cs - + Form - + pleaseWait.cs @@ -329,10 +329,10 @@ FrameEditor.cs - + Form - + AudioEditor.cs @@ -458,11 +458,11 @@ SetBulkSpeed.cs - + creditsEditor.cs Designer - + addCategory.cs @@ -494,7 +494,7 @@ AddParameter.cs - + pleaseWait.cs @@ -529,7 +529,7 @@ FrameEditor.cs - + AudioEditor.cs Designer