From f22132124c11b0c326d8b3d8a4fc1ec3950a685a Mon Sep 17 00:00:00 2001 From: ww-rm Date: Mon, 3 Mar 2025 19:52:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controls/SpineListView.Designer.cs | 2 +- SpineViewer/Controls/SpineListView.cs | 10 +++--- .../Controls/SpinePreviewer.Designer.cs | 2 +- SpineViewer/Controls/SpinePreviewer.cs | 2 +- .../Dialogs/BatchOpenSpineDialog.Designer.cs | 2 +- SpineViewer/Dialogs/BatchOpenSpineDialog.cs | 2 +- .../Dialogs/OpenSpineDialog.Designer.cs | 2 +- SpineViewer/Dialogs/OpenSpineDialog.cs | 2 +- .../Dialogs/ProgressDialog.Designer.cs | 2 +- SpineViewer/Dialogs/ProgressDialog.cs | 2 +- SpineViewer/MainForm.Designer.cs | 36 +++++++++---------- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/SpineViewer/Controls/SpineListView.Designer.cs b/SpineViewer/Controls/SpineListView.Designer.cs index fb97bc3..17d7429 100644 --- a/SpineViewer/Controls/SpineListView.Designer.cs +++ b/SpineViewer/Controls/SpineListView.Designer.cs @@ -1,4 +1,4 @@ -namespace SpineViewer +namespace SpineViewer.Controls { partial class SpineListView { diff --git a/SpineViewer/Controls/SpineListView.cs b/SpineViewer/Controls/SpineListView.cs index 2a268c2..34f869f 100644 --- a/SpineViewer/Controls/SpineListView.cs +++ b/SpineViewer/Controls/SpineListView.cs @@ -12,7 +12,7 @@ using SpineViewer.Spine; using System.Reflection; using System.Diagnostics; -namespace SpineViewer +namespace SpineViewer.Controls { public partial class SpineListView : UserControl { @@ -40,7 +40,7 @@ namespace SpineViewer /// private void Insert(int index = -1) { - var dialog = new OpenSpineDialog(); + var dialog = new Dialogs.OpenSpineDialog(); if (dialog.ShowDialog() != DialogResult.OK) return; @@ -81,11 +81,11 @@ namespace SpineViewer /// public void BatchAdd() { - var openDialog = new BatchOpenSpineDialog(); + var openDialog = new Dialogs.BatchOpenSpineDialog(); if (openDialog.ShowDialog() != DialogResult.OK) return; - var progressDialog = new ProgressDialog(); + var progressDialog = new Dialogs.ProgressDialog(); progressDialog.DoWork += BatchAdd_Work; progressDialog.RunWorkerAsync(openDialog); progressDialog.ShowDialog(); @@ -94,7 +94,7 @@ namespace SpineViewer private void BatchAdd_Work(object? sender, DoWorkEventArgs e) { var worker = sender as BackgroundWorker; - var arguments = e.Argument as BatchOpenSpineDialog; + var arguments = e.Argument as Dialogs.BatchOpenSpineDialog; var skelPaths = arguments.SkelPaths; var version = arguments.Version; diff --git a/SpineViewer/Controls/SpinePreviewer.Designer.cs b/SpineViewer/Controls/SpinePreviewer.Designer.cs index 9a80372..b62a281 100644 --- a/SpineViewer/Controls/SpinePreviewer.Designer.cs +++ b/SpineViewer/Controls/SpinePreviewer.Designer.cs @@ -1,4 +1,4 @@ -namespace SpineViewer +namespace SpineViewer.Controls { partial class SpinePreviewer { diff --git a/SpineViewer/Controls/SpinePreviewer.cs b/SpineViewer/Controls/SpinePreviewer.cs index abca0cb..2e8bd7c 100644 --- a/SpineViewer/Controls/SpinePreviewer.cs +++ b/SpineViewer/Controls/SpinePreviewer.cs @@ -11,7 +11,7 @@ using System.Security.Policy; using System.Diagnostics; using NLog.Targets; -namespace SpineViewer +namespace SpineViewer.Controls { public partial class SpinePreviewer : UserControl { diff --git a/SpineViewer/Dialogs/BatchOpenSpineDialog.Designer.cs b/SpineViewer/Dialogs/BatchOpenSpineDialog.Designer.cs index e0acd35..20db299 100644 --- a/SpineViewer/Dialogs/BatchOpenSpineDialog.Designer.cs +++ b/SpineViewer/Dialogs/BatchOpenSpineDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace SpineViewer +namespace SpineViewer.Dialogs { partial class BatchOpenSpineDialog { diff --git a/SpineViewer/Dialogs/BatchOpenSpineDialog.cs b/SpineViewer/Dialogs/BatchOpenSpineDialog.cs index 47b6633..bf86a65 100644 --- a/SpineViewer/Dialogs/BatchOpenSpineDialog.cs +++ b/SpineViewer/Dialogs/BatchOpenSpineDialog.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace SpineViewer +namespace SpineViewer.Dialogs { public partial class BatchOpenSpineDialog : Form { diff --git a/SpineViewer/Dialogs/OpenSpineDialog.Designer.cs b/SpineViewer/Dialogs/OpenSpineDialog.Designer.cs index a0d9e81..f47df92 100644 --- a/SpineViewer/Dialogs/OpenSpineDialog.Designer.cs +++ b/SpineViewer/Dialogs/OpenSpineDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace SpineViewer +namespace SpineViewer.Dialogs { partial class OpenSpineDialog { diff --git a/SpineViewer/Dialogs/OpenSpineDialog.cs b/SpineViewer/Dialogs/OpenSpineDialog.cs index b138003..0bfb95a 100644 --- a/SpineViewer/Dialogs/OpenSpineDialog.cs +++ b/SpineViewer/Dialogs/OpenSpineDialog.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace SpineViewer +namespace SpineViewer.Dialogs { public partial class OpenSpineDialog : Form { diff --git a/SpineViewer/Dialogs/ProgressDialog.Designer.cs b/SpineViewer/Dialogs/ProgressDialog.Designer.cs index c08576c..d8739e1 100644 --- a/SpineViewer/Dialogs/ProgressDialog.Designer.cs +++ b/SpineViewer/Dialogs/ProgressDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace SpineViewer +namespace SpineViewer.Dialogs { partial class ProgressDialog { diff --git a/SpineViewer/Dialogs/ProgressDialog.cs b/SpineViewer/Dialogs/ProgressDialog.cs index f750215..91f5c8b 100644 --- a/SpineViewer/Dialogs/ProgressDialog.cs +++ b/SpineViewer/Dialogs/ProgressDialog.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace SpineViewer +namespace SpineViewer.Dialogs { public partial class ProgressDialog : Form { diff --git a/SpineViewer/MainForm.Designer.cs b/SpineViewer/MainForm.Designer.cs index 02d169f..4cc429b 100644 --- a/SpineViewer/MainForm.Designer.cs +++ b/SpineViewer/MainForm.Designer.cs @@ -46,14 +46,14 @@ splitContainer_Functional = new SplitContainer(); splitContainer_Information = new SplitContainer(); groupBox_SkelList = new GroupBox(); - spineListView = new SpineListView(); + spineListView = new SpineViewer.Controls.SpineListView(); propertyGrid_Spine = new PropertyGrid(); splitContainer_Config = new SplitContainer(); groupBox_SkelConfig = new GroupBox(); groupBox_PreviewConfig = new GroupBox(); propertyGrid_Previewer = new PropertyGrid(); groupBox_Preview = new GroupBox(); - spinePreviewer = new SpinePreviewer(); + spinePreviewer = new SpineViewer.Controls.SpinePreviewer(); panel_MainForm = new Panel(); toolTip = new ToolTip(components); menuStrip.SuspendLayout(); @@ -176,7 +176,7 @@ rtbLog.Margin = new Padding(3, 2, 3, 2); rtbLog.Name = "rtbLog"; rtbLog.ReadOnly = true; - rtbLog.Size = new Size(1721, 131); + rtbLog.Size = new Size(1721, 106); rtbLog.TabIndex = 0; rtbLog.Text = ""; rtbLog.WordWrap = false; @@ -199,7 +199,7 @@ splitContainer_MainForm.Panel2.Controls.Add(rtbLog); splitContainer_MainForm.Panel2.Cursor = Cursors.Default; splitContainer_MainForm.Size = new Size(1721, 958); - splitContainer_MainForm.SplitterDistance = 823; + splitContainer_MainForm.SplitterDistance = 848; splitContainer_MainForm.TabIndex = 3; splitContainer_MainForm.TabStop = false; splitContainer_MainForm.SplitterMoved += splitContainer_SplitterMoved; @@ -221,7 +221,7 @@ // splitContainer_Functional.Panel2.Controls.Add(groupBox_Preview); splitContainer_Functional.Panel2.Cursor = Cursors.Default; - splitContainer_Functional.Size = new Size(1721, 823); + splitContainer_Functional.Size = new Size(1721, 848); splitContainer_Functional.SplitterDistance = 725; splitContainer_Functional.TabIndex = 2; splitContainer_Functional.TabStop = false; @@ -244,7 +244,7 @@ // splitContainer_Information.Panel2.Controls.Add(splitContainer_Config); splitContainer_Information.Panel2.Cursor = Cursors.Default; - splitContainer_Information.Size = new Size(725, 823); + splitContainer_Information.Size = new Size(725, 848); splitContainer_Information.SplitterDistance = 346; splitContainer_Information.TabIndex = 1; splitContainer_Information.TabStop = false; @@ -257,7 +257,7 @@ groupBox_SkelList.Dock = DockStyle.Fill; groupBox_SkelList.Location = new Point(0, 0); groupBox_SkelList.Name = "groupBox_SkelList"; - groupBox_SkelList.Size = new Size(346, 823); + groupBox_SkelList.Size = new Size(346, 848); groupBox_SkelList.TabIndex = 0; groupBox_SkelList.TabStop = false; groupBox_SkelList.Text = "模型列表"; @@ -268,7 +268,7 @@ spineListView.Location = new Point(3, 26); spineListView.Name = "spineListView"; spineListView.PropertyGrid = propertyGrid_Spine; - spineListView.Size = new Size(340, 794); + spineListView.Size = new Size(340, 819); spineListView.TabIndex = 0; // // propertyGrid_Spine @@ -277,7 +277,7 @@ propertyGrid_Spine.HelpVisible = false; propertyGrid_Spine.Location = new Point(3, 26); propertyGrid_Spine.Name = "propertyGrid_Spine"; - propertyGrid_Spine.Size = new Size(369, 457); + propertyGrid_Spine.Size = new Size(369, 470); propertyGrid_Spine.TabIndex = 0; propertyGrid_Spine.ToolbarVisible = false; propertyGrid_Spine.PropertyValueChanged += propertyGrid_PropertyValueChanged; @@ -299,8 +299,8 @@ // splitContainer_Config.Panel2.Controls.Add(groupBox_PreviewConfig); splitContainer_Config.Panel2.Cursor = Cursors.Default; - splitContainer_Config.Size = new Size(375, 823); - splitContainer_Config.SplitterDistance = 486; + splitContainer_Config.Size = new Size(375, 848); + splitContainer_Config.SplitterDistance = 499; splitContainer_Config.TabIndex = 0; splitContainer_Config.TabStop = false; splitContainer_Config.SplitterMoved += splitContainer_SplitterMoved; @@ -312,7 +312,7 @@ groupBox_SkelConfig.Dock = DockStyle.Fill; groupBox_SkelConfig.Location = new Point(0, 0); groupBox_SkelConfig.Name = "groupBox_SkelConfig"; - groupBox_SkelConfig.Size = new Size(375, 486); + groupBox_SkelConfig.Size = new Size(375, 499); groupBox_SkelConfig.TabIndex = 0; groupBox_SkelConfig.TabStop = false; groupBox_SkelConfig.Text = "模型参数"; @@ -323,7 +323,7 @@ groupBox_PreviewConfig.Dock = DockStyle.Fill; groupBox_PreviewConfig.Location = new Point(0, 0); groupBox_PreviewConfig.Name = "groupBox_PreviewConfig"; - groupBox_PreviewConfig.Size = new Size(375, 333); + groupBox_PreviewConfig.Size = new Size(375, 345); groupBox_PreviewConfig.TabIndex = 1; groupBox_PreviewConfig.TabStop = false; groupBox_PreviewConfig.Text = "画面参数"; @@ -334,7 +334,7 @@ propertyGrid_Previewer.HelpVisible = false; propertyGrid_Previewer.Location = new Point(3, 26); propertyGrid_Previewer.Name = "propertyGrid_Previewer"; - propertyGrid_Previewer.Size = new Size(369, 304); + propertyGrid_Previewer.Size = new Size(369, 316); propertyGrid_Previewer.TabIndex = 1; propertyGrid_Previewer.ToolbarVisible = false; propertyGrid_Previewer.PropertyValueChanged += propertyGrid_PropertyValueChanged; @@ -345,7 +345,7 @@ groupBox_Preview.Dock = DockStyle.Fill; groupBox_Preview.Location = new Point(0, 0); groupBox_Preview.Name = "groupBox_Preview"; - groupBox_Preview.Size = new Size(992, 823); + groupBox_Preview.Size = new Size(992, 848); groupBox_Preview.TabIndex = 1; groupBox_Preview.TabStop = false; groupBox_Preview.Text = "预览画面"; @@ -357,7 +357,7 @@ spinePreviewer.Location = new Point(3, 26); spinePreviewer.Name = "spinePreviewer"; spinePreviewer.PropertyGrid = propertyGrid_Previewer; - spinePreviewer.Size = new Size(986, 794); + spinePreviewer.Size = new Size(986, 819); spinePreviewer.SpineListView = spineListView; spinePreviewer.TabIndex = 0; spinePreviewer.MouseUp += spinePreviewer_MouseUp; @@ -441,9 +441,9 @@ private GroupBox groupBox_Preview; private ToolTip toolTip; private PropertyGrid propertyGrid_Spine; - private SpineListView spineListView; + private Controls.SpineListView spineListView; private PropertyGrid propertyGrid_Previewer; - private SpinePreviewer spinePreviewer; + private Controls.SpinePreviewer spinePreviewer; private ToolStripMenuItem toolStripMenuItem_Function; private ToolStripMenuItem toolStripMenuItem_ResetAnimation; }