From 56aa41bb66dabe4850fd4e742cfba154dc6f01ea Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sun, 14 May 2023 16:56:12 +0200 Subject: [PATCH] AddFilePrompt - Changes namespace and changed 'Filetype' to be 'PckFile.FileData.FileType' --- .../Forms/Additional-Popups/AddFilePrompt.Designer.cs | 2 +- PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs | 5 +++-- PCK-Studio/MainForm.cs | 7 +++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs index 50dbca23..8668ede0 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.Designer.cs @@ -1,4 +1,4 @@ -namespace PckStudio +namespace PckStudio.Popups { partial class AddFilePrompt { diff --git a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs index 70b1b436..43fdff5a 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/AddFilePrompt.cs @@ -1,8 +1,9 @@ using System; using System.Windows.Forms; using MetroFramework.Forms; +using OMI.Formats.Pck; -namespace PckStudio +namespace PckStudio.Popups { public partial class AddFilePrompt : MetroForm { @@ -11,7 +12,7 @@ namespace PckStudio /// otherwise /// public string Filepath => DialogResult == DialogResult.OK ? InputTextBox.Text : string.Empty; - public int Filetype => FileTypeComboBox.SelectedIndex; + public PckFile.FileData.FileType Filetype => (PckFile.FileData.FileType)FileTypeComboBox.SelectedIndex; public AddFilePrompt(string initialText) : this(initialText, -1) { } diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 4a9577fa..648f9af2 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -29,6 +29,7 @@ using PckStudio.Classes.IO.PCK; using PckStudio.Classes.IO._3DST; using PckStudio.Internal; using PckStudio.Features; +using PckStudio.Popups; namespace PckStudio { @@ -2172,8 +2173,10 @@ namespace PckStudio using AddFilePrompt diag = new AddFilePrompt("res/" + Path.GetFileName(ofd.FileName)); if (diag.ShowDialog(this) == DialogResult.OK) { - PckFile.FileData file = currentPCK.CreateNewFile(diag.Filepath, (PckFile.FileData.FileType)diag.Filetype); - file.SetData(File.ReadAllBytes(ofd.FileName)); + PckFile.FileData file = currentPCK.CreateNewFile( + diag.Filepath, + diag.Filetype, + () => File.ReadAllBytes(ofd.FileName)); if (IsSubPCKNode(treeViewMain.SelectedNode.FullPath)) RebuildSubPCK(treeViewMain.SelectedNode); //else treeViewMain.Nodes.Add();