diff --git a/SpineViewer/Dialogs/BatchOpenSpineDialog.cs b/SpineViewer/Dialogs/BatchOpenSpineDialog.cs index ef5b06d..d31a583 100644 --- a/SpineViewer/Dialogs/BatchOpenSpineDialog.cs +++ b/SpineViewer/Dialogs/BatchOpenSpineDialog.cs @@ -13,8 +13,7 @@ namespace SpineViewer.Dialogs { public partial class BatchOpenSpineDialog : Form { - public string[] SkelPaths { get; private set; } - public Spine.Version Version { get; private set; } + public BatchOpenSpineDialogResult Result { get; private set; } public BatchOpenSpineDialog() { @@ -66,9 +65,7 @@ namespace SpineViewer.Dialogs return; } - SkelPaths = listBox_FilePath.Items.Cast().ToArray(); - Version = version; - + Result = new(version, listBox_FilePath.Items.Cast().ToArray()); DialogResult = DialogResult.OK; } @@ -77,4 +74,10 @@ namespace SpineViewer.Dialogs DialogResult = DialogResult.Cancel; } } + + public class BatchOpenSpineDialogResult(Spine.Version version, string[] skelPaths) + { + public Spine.Version Version { get; } = version; + public string[] SkelPaths { get; } = skelPaths; + } } diff --git a/SpineViewer/Dialogs/OpenSpineDialog.cs b/SpineViewer/Dialogs/OpenSpineDialog.cs index e99c62a..fdfd61e 100644 --- a/SpineViewer/Dialogs/OpenSpineDialog.cs +++ b/SpineViewer/Dialogs/OpenSpineDialog.cs @@ -12,9 +12,7 @@ namespace SpineViewer.Dialogs { public partial class OpenSpineDialog : Form { - public string SkelPath { get; private set; } - public string? AtlasPath { get; private set; } - public Spine.Version Version { get; private set; } + public OpenSpineDialogResult Result { get; private set; } public OpenSpineDialog() { @@ -84,10 +82,7 @@ namespace SpineViewer.Dialogs return; } - SkelPath = skelPath; - AtlasPath = atlasPath; - Version = version; - + Result = new(version, skelPath, atlasPath); DialogResult = DialogResult.OK; } @@ -96,4 +91,11 @@ namespace SpineViewer.Dialogs DialogResult = DialogResult.Cancel; } } + + public class OpenSpineDialogResult(Spine.Version version, string skelPath, string? atlasPath = null) + { + public Spine.Version Version { get; } = version; + public string SkelPath { get; } = skelPath; + public string? AtlasPath { get; } = atlasPath; + } }