diff --git a/SpineViewer/src/SkelBatchSelectForm.Designer.cs b/SpineViewer/src/BatchOpenSpineDialog.Designer.cs similarity index 96% rename from SpineViewer/src/SkelBatchSelectForm.Designer.cs rename to SpineViewer/src/BatchOpenSpineDialog.Designer.cs index 0224f9e..5d58bad 100644 --- a/SpineViewer/src/SkelBatchSelectForm.Designer.cs +++ b/SpineViewer/src/BatchOpenSpineDialog.Designer.cs @@ -1,6 +1,6 @@ namespace SpineViewer.src { - partial class SkelBatchSelectForm + partial class BatchOpenSpineDialog { /// /// Required designer variable. diff --git a/SpineViewer/src/SkelBatchSelectForm.cs b/SpineViewer/src/BatchOpenSpineDialog.cs similarity index 77% rename from SpineViewer/src/SkelBatchSelectForm.cs rename to SpineViewer/src/BatchOpenSpineDialog.cs index f2f0762..30e9d94 100644 --- a/SpineViewer/src/SkelBatchSelectForm.cs +++ b/SpineViewer/src/BatchOpenSpineDialog.cs @@ -10,9 +10,9 @@ using System.Windows.Forms; namespace SpineViewer.src { - public partial class SkelBatchSelectForm: Form + public partial class BatchOpenSpineDialog: Form { - public SkelBatchSelectForm() + public BatchOpenSpineDialog() { InitializeComponent(); } diff --git a/SpineViewer/src/SkelBatchSelectForm.resx b/SpineViewer/src/BatchOpenSpineDialog.resx similarity index 100% rename from SpineViewer/src/SkelBatchSelectForm.resx rename to SpineViewer/src/BatchOpenSpineDialog.resx diff --git a/SpineViewer/src/MainForm.Designer.cs b/SpineViewer/src/MainForm.Designer.cs index a958e48..7a669b0 100644 --- a/SpineViewer/src/MainForm.Designer.cs +++ b/SpineViewer/src/MainForm.Designer.cs @@ -44,10 +44,10 @@ splitContainer_Functional = new SplitContainer(); splitContainer_Information = new SplitContainer(); groupBox_SkelList = new GroupBox(); - listViewSkel = new ListViewSkel(); + spineListView = new SpineListView(); + propertyGrid_Skel = new PropertyGrid(); splitContainer_Config = new SplitContainer(); groupBox_SkelConfig = new GroupBox(); - propertyGrid_Skel = new PropertyGrid(); groupBox_PreviewConfig = new GroupBox(); groupBox_Preview = new GroupBox(); panel_PreviewContainer = new Panel(); @@ -239,7 +239,7 @@ // // groupBox_SkelList // - groupBox_SkelList.Controls.Add(listViewSkel); + groupBox_SkelList.Controls.Add(spineListView); groupBox_SkelList.Dock = DockStyle.Fill; groupBox_SkelList.Location = new Point(0, 0); groupBox_SkelList.Name = "groupBox_SkelList"; @@ -248,14 +248,24 @@ groupBox_SkelList.TabStop = false; groupBox_SkelList.Text = "模型列表"; // - // listViewSkel + // spineListView // - listViewSkel.Dock = DockStyle.Fill; - listViewSkel.Location = new Point(3, 26); - listViewSkel.Name = "listViewSkel"; - listViewSkel.PropertyGrid = propertyGrid_Skel; - listViewSkel.Size = new Size(330, 703); - listViewSkel.TabIndex = 0; + spineListView.Dock = DockStyle.Fill; + spineListView.Location = new Point(3, 26); + spineListView.Name = "spineListView"; + spineListView.PropertyGrid = propertyGrid_Skel; + spineListView.Size = new Size(330, 703); + spineListView.TabIndex = 0; + // + // propertyGrid_Skel + // + propertyGrid_Skel.Dock = DockStyle.Fill; + propertyGrid_Skel.HelpVisible = false; + propertyGrid_Skel.Location = new Point(3, 26); + propertyGrid_Skel.Name = "propertyGrid_Skel"; + propertyGrid_Skel.Size = new Size(352, 464); + propertyGrid_Skel.TabIndex = 0; + propertyGrid_Skel.ToolbarVisible = false; // // splitContainer_Config // @@ -292,16 +302,6 @@ groupBox_SkelConfig.TabStop = false; groupBox_SkelConfig.Text = "模型参数"; // - // propertyGrid_Skel - // - propertyGrid_Skel.Dock = DockStyle.Fill; - propertyGrid_Skel.HelpVisible = false; - propertyGrid_Skel.Location = new Point(3, 26); - propertyGrid_Skel.Name = "propertyGrid_Skel"; - propertyGrid_Skel.Size = new Size(352, 464); - propertyGrid_Skel.TabIndex = 0; - propertyGrid_Skel.ToolbarVisible = false; - // // groupBox_PreviewConfig // groupBox_PreviewConfig.Dock = DockStyle.Fill; @@ -430,6 +430,6 @@ private OpenFileDialog openFileDialog_Atlas; private ToolTip toolTip1; private PropertyGrid propertyGrid_Skel; - private ListViewSkel listViewSkel; + private SpineListView spineListView; } } diff --git a/SpineViewer/src/MainForm.cs b/SpineViewer/src/MainForm.cs index a5ea6f9..48a1269 100644 --- a/SpineViewer/src/MainForm.cs +++ b/SpineViewer/src/MainForm.cs @@ -45,18 +45,18 @@ namespace SpineViewer private void toolStripMenuItem_Open_Click(object sender, EventArgs e) { - listViewSkel.Add(); + spineListView.Add(); } private void toolStripMenuItem_BatchOpen_Click(object sender, EventArgs e) { - listViewSkel.BatchAdd(); + spineListView.BatchAdd(); } private void toolStripMenuItem_Export_Click(object sender, EventArgs e) { var a = new SizeF(10, 100); - listViewSkel.Spines[0].Position = listViewSkel.Spines[0].Position + a; + spineListView.Spines[0].Position = spineListView.Spines[0].Position + a; } private void toolStripMenuItem_Exit_Click(object sender, EventArgs e) diff --git a/SpineViewer/src/SkelSelectDialog.Designer.cs b/SpineViewer/src/OpenSpineDialog.Designer.cs similarity index 99% rename from SpineViewer/src/SkelSelectDialog.Designer.cs rename to SpineViewer/src/OpenSpineDialog.Designer.cs index 97c3805..5532fc6 100644 --- a/SpineViewer/src/SkelSelectDialog.Designer.cs +++ b/SpineViewer/src/OpenSpineDialog.Designer.cs @@ -1,6 +1,6 @@ namespace SpineViewer { - partial class SkelSelectDialog + partial class OpenSpineDialog { /// /// Required designer variable. diff --git a/SpineViewer/src/SkelSelectDialog.cs b/SpineViewer/src/OpenSpineDialog.cs similarity index 96% rename from SpineViewer/src/SkelSelectDialog.cs rename to SpineViewer/src/OpenSpineDialog.cs index 211f029..b138003 100644 --- a/SpineViewer/src/SkelSelectDialog.cs +++ b/SpineViewer/src/OpenSpineDialog.cs @@ -11,13 +11,13 @@ using System.Windows.Forms; namespace SpineViewer { - public partial class SkelSelectDialog : Form + 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 SkelSelectDialog() + public OpenSpineDialog() { InitializeComponent(); comboBox_Version.DataSource = VersionHelper.Versions.ToList(); diff --git a/SpineViewer/src/SkelSelectDialog.resx b/SpineViewer/src/OpenSpineDialog.resx similarity index 100% rename from SpineViewer/src/SkelSelectDialog.resx rename to SpineViewer/src/OpenSpineDialog.resx diff --git a/SpineViewer/src/ListViewSkel.Designer.cs b/SpineViewer/src/SpineListView.Designer.cs similarity index 99% rename from SpineViewer/src/ListViewSkel.Designer.cs rename to SpineViewer/src/SpineListView.Designer.cs index a5cd737..6d3cc7e 100644 --- a/SpineViewer/src/ListViewSkel.Designer.cs +++ b/SpineViewer/src/SpineListView.Designer.cs @@ -1,6 +1,6 @@ namespace SpineViewer { - partial class ListViewSkel + partial class SpineListView { /// /// 必需的设计器变量。 diff --git a/SpineViewer/src/ListViewSkel.cs b/SpineViewer/src/SpineListView.cs similarity index 96% rename from SpineViewer/src/ListViewSkel.cs rename to SpineViewer/src/SpineListView.cs index 83eb2f2..fa742c1 100644 --- a/SpineViewer/src/ListViewSkel.cs +++ b/SpineViewer/src/SpineListView.cs @@ -14,7 +14,7 @@ using SpineViewer.src; namespace SpineViewer { - public partial class ListViewSkel : UserControl + public partial class SpineListView : UserControl { [Browsable(true), Category("自定义"), Description("用于显示骨骼属性的属性页")] public PropertyGrid? PropertyGrid { get; set; } @@ -26,7 +26,7 @@ namespace SpineViewer public ReadOnlyCollection Spines { get => spines.AsReadOnly(); } private readonly List spines = []; - public ListViewSkel() + public SpineListView() { InitializeComponent(); } @@ -36,7 +36,7 @@ namespace SpineViewer /// public void Add() { - var dialog = new SkelSelectDialog(); + var dialog = new OpenSpineDialog(); if (dialog.ShowDialog() == DialogResult.OK) { try @@ -73,7 +73,7 @@ namespace SpineViewer return; var index = listView.SelectedIndices[0]; - var dialog = new SkelSelectDialog(); + var dialog = new OpenSpineDialog(); dialog.ShowDialog(); try { diff --git a/SpineViewer/src/ListViewSkel.resx b/SpineViewer/src/SpineListView.resx similarity index 100% rename from SpineViewer/src/ListViewSkel.resx rename to SpineViewer/src/SpineListView.resx