LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-10 12:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move AudioEditor to Forms/Editor and related files to Additional-Popups and renamed some namespaces related to Additional-Popups

Browse Source
This commit is contained in:
miku-666
2022-08-06 01:04:51 +02:00
parent 61f02c19c9
commit 8522fabd60
17 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.Designer.cs → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace PckStudio
namespace PckStudio.Forms.Additional_Popups.Audio
{
partial class addCategory
{

2
MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.cs → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.cs
View File

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

0
MinecraftUSkinEditor/Forms/Utilities/Audio/addCategory.resx → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.resx
View File

2
MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.Designer.cs → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace PckStudio
namespace PckStudio.Forms.Additional_Popups.Audio
{
partial class creditsEditor
{

2
MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.cs → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.cs
View File

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

0
MinecraftUSkinEditor/Forms/Utilities/Audio/creditsEditor.resx → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.resx
View File

2
MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.Designer.cs → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace PckStudio.Forms.Utilities.Audio
namespace PckStudio.Forms.Additional_Popups.Audio
{
partial class pleaseWait
{

2
MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.cs → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.cs
View File

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

0
MinecraftUSkinEditor/Forms/Utilities/Audio/pleaseWait.resx → MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.resx
View File

2
MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace PckStudio.Forms.Utilities.Grf
namespace PckStudio.Forms.Additional_Popups.Grf
{
partial class AddParameter
{

2
MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs
View File

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

2
MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.Designer.cs → MinecraftUSkinEditor/Forms/Editor/AudioEditor.Designer.cs generated
View File

@@ -1,5 +1,5 @@

namespace PckStudio.Forms.Utilities
namespace PckStudio.Forms.Editor
{
partial class AudioEditor
{

21
MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.cs → MinecraftUSkinEditor/Forms/Editor/AudioEditor.cs
View File

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

0
MinecraftUSkinEditor/Forms/Utilities/Audio/AudioEditor.resx → MinecraftUSkinEditor/Forms/Editor/AudioEditor.resx
View File

2
MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs
View File

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

5
MinecraftUSkinEditor/MainForm.cs
View File

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

24
MinecraftUSkinEditor/PckStudio.csproj
View File

@@ -233,16 +233,16 @@
<Compile Include="Forms\Utilities\Animation\SetBulkSpeed.Designer.cs">
<DependentUpon>SetBulkSpeed.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Utilities\Audio\creditsEditor.cs">
<Compile Include="Forms\Additional-Popups\Audio\creditsEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\Utilities\Audio\creditsEditor.Designer.cs">
<Compile Include="Forms\Additional-Popups\Audio\creditsEditor.Designer.cs">
<DependentUpon>creditsEditor.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Utilities\Audio\addCategory.cs">
<Compile Include="Forms\Additional-Popups\Audio\addCategory.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\Utilities\Audio\addCategory.Designer.cs">
<Compile Include="Forms\Additional-Popups\Audio\addCategory.Designer.cs">
<DependentUpon>addCategory.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Skins-And-Textures\addMeta.cs">
@@ -281,10 +281,10 @@
<Compile Include="Forms\Additional-Popups\Grf\AddParameter.Designer.cs">
<DependentUpon>AddParameter.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Utilities\Audio\pleaseWait.cs">
<Compile Include="Forms\Additional-Popups\Audio\pleaseWait.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\Utilities\Audio\pleaseWait.Designer.cs">
<Compile Include="Forms\Additional-Popups\Audio\pleaseWait.Designer.cs">
<DependentUpon>pleaseWait.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Utilities\Skins\ANIMEditor.cs">
@@ -329,10 +329,10 @@
<Compile Include="Forms\Utilities\Animation\FrameEditor.Designer.cs">
<DependentUpon>FrameEditor.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Utilities\Audio\AudioEditor.cs">
<Compile Include="Forms\Editor\AudioEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\Utilities\Audio\AudioEditor.Designer.cs">
<Compile Include="Forms\Editor\AudioEditor.Designer.cs">
<DependentUpon>AudioEditor.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Utilities\installPS3.cs">
@@ -458,11 +458,11 @@
<EmbeddedResource Include="Forms\Utilities\Animation\SetBulkSpeed.resx">
<DependentUpon>SetBulkSpeed.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Utilities\Audio\creditsEditor.resx">
<EmbeddedResource Include="Forms\Additional-Popups\Audio\creditsEditor.resx">
<DependentUpon>creditsEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Utilities\Audio\addCategory.resx">
<EmbeddedResource Include="Forms\Additional-Popups\Audio\addCategory.resx">
<DependentUpon>addCategory.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Skins-And-Textures\addMeta.ja.resx">
@@ -494,7 +494,7 @@
<EmbeddedResource Include="Forms\Additional-Popups\Grf\AddParameter.resx">
<DependentUpon>AddParameter.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Utilities\Audio\pleaseWait.resx">
<EmbeddedResource Include="Forms\Additional-Popups\Audio\pleaseWait.resx">
<DependentUpon>pleaseWait.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Utilities\Skins\ANIMEditor.resx">
@@ -529,7 +529,7 @@
<EmbeddedResource Include="Forms\Utilities\Animation\FrameEditor.resx">
<DependentUpon>FrameEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Utilities\Audio\AudioEditor.resx">
<EmbeddedResource Include="Forms\Editor\AudioEditor.resx">
<DependentUpon>AudioEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>