From a4e161e045a05ea30eb6c1caa7b3caadb3d1e9ec Mon Sep 17 00:00:00 2001 From: ww-rm Date: Tue, 4 Mar 2025 13:09:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controls/SpineListView.Designer.cs | 71 +++++++++---------- SpineViewer/Controls/SpineListView.cs | 4 +- SpineViewer/MainForm.Designer.cs | 68 +++++++++--------- 3 files changed, 68 insertions(+), 75 deletions(-) diff --git a/SpineViewer/Controls/SpineListView.Designer.cs b/SpineViewer/Controls/SpineListView.Designer.cs index 17d7429..b2d0fdd 100644 --- a/SpineViewer/Controls/SpineListView.Designer.cs +++ b/SpineViewer/Controls/SpineListView.Designer.cs @@ -31,24 +31,23 @@ components = new System.ComponentModel.Container(); listView = new ListView(); columnHeader_Name = new ColumnHeader(); - columnHeader_Version = new ColumnHeader(); contextMenuStrip = new ContextMenuStrip(components); toolStripMenuItem_Add = new ToolStripMenuItem(); toolStripMenuItem_Insert = new ToolStripMenuItem(); toolStripMenuItem_Remove = new ToolStripMenuItem(); toolStripSeparator1 = new ToolStripSeparator(); - toolStripMenuItem_BatchAdd = new ToolStripMenuItem(); - toolStripMenuItem_RemoveAll = new ToolStripMenuItem(); - toolStripSeparator2 = new ToolStripSeparator(); toolStripMenuItem_MoveUp = new ToolStripMenuItem(); toolStripMenuItem_MoveDown = new ToolStripMenuItem(); + toolStripSeparator2 = new ToolStripSeparator(); + toolStripMenuItem_BatchAdd = new ToolStripMenuItem(); + toolStripMenuItem_RemoveAll = new ToolStripMenuItem(); contextMenuStrip.SuspendLayout(); SuspendLayout(); // // listView // listView.AllowDrop = true; - listView.Columns.AddRange(new ColumnHeader[] { columnHeader_Name, columnHeader_Version }); + listView.Columns.AddRange(new ColumnHeader[] { columnHeader_Name }); listView.ContextMenuStrip = contextMenuStrip; listView.Dock = DockStyle.Fill; listView.FullRowSelect = true; @@ -69,25 +68,20 @@ // columnHeader_Name // columnHeader_Name.Text = "名称"; - columnHeader_Name.Width = 150; - // - // columnHeader_Version - // - columnHeader_Version.Text = "版本"; - columnHeader_Version.Width = 150; + columnHeader_Name.Width = 250; // // contextMenuStrip // contextMenuStrip.ImageScalingSize = new Size(24, 24); contextMenuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem_Add, toolStripMenuItem_Insert, toolStripMenuItem_Remove, toolStripSeparator1, toolStripMenuItem_MoveUp, toolStripMenuItem_MoveDown, toolStripSeparator2, toolStripMenuItem_BatchAdd, toolStripMenuItem_RemoveAll }); contextMenuStrip.Name = "contextMenuStrip"; - contextMenuStrip.Size = new Size(241, 259); + contextMenuStrip.Size = new Size(188, 226); contextMenuStrip.Opening += contextMenuStrip_Opening; // // toolStripMenuItem_Add // toolStripMenuItem_Add.Name = "toolStripMenuItem_Add"; - toolStripMenuItem_Add.Size = new Size(240, 30); + toolStripMenuItem_Add.Size = new Size(187, 30); toolStripMenuItem_Add.Text = "添加(&A)..."; toolStripMenuItem_Add.Click += toolStripMenuItem_Add_Click; // @@ -95,7 +89,7 @@ // toolStripMenuItem_Insert.Enabled = false; toolStripMenuItem_Insert.Name = "toolStripMenuItem_Insert"; - toolStripMenuItem_Insert.Size = new Size(240, 30); + toolStripMenuItem_Insert.Size = new Size(187, 30); toolStripMenuItem_Insert.Text = "插入(&I)..."; toolStripMenuItem_Insert.Click += toolStripMenuItem_Insert_Click; // @@ -103,19 +97,38 @@ // toolStripMenuItem_Remove.Enabled = false; toolStripMenuItem_Remove.Name = "toolStripMenuItem_Remove"; - toolStripMenuItem_Remove.Size = new Size(240, 30); + toolStripMenuItem_Remove.Size = new Size(187, 30); toolStripMenuItem_Remove.Text = "移除(&R)"; toolStripMenuItem_Remove.Click += toolStripMenuItem_Remove_Click; // // toolStripSeparator1 // toolStripSeparator1.Name = "toolStripSeparator1"; - toolStripSeparator1.Size = new Size(237, 6); + toolStripSeparator1.Size = new Size(184, 6); + // + // toolStripMenuItem_MoveUp + // + toolStripMenuItem_MoveUp.Name = "toolStripMenuItem_MoveUp"; + toolStripMenuItem_MoveUp.Size = new Size(187, 30); + toolStripMenuItem_MoveUp.Text = "上移(&U)"; + toolStripMenuItem_MoveUp.Click += toolStripMenuItem_MoveUp_Click; + // + // toolStripMenuItem_MoveDown + // + toolStripMenuItem_MoveDown.Name = "toolStripMenuItem_MoveDown"; + toolStripMenuItem_MoveDown.Size = new Size(187, 30); + toolStripMenuItem_MoveDown.Text = "下移(&D)"; + toolStripMenuItem_MoveDown.Click += toolStripMenuItem_MoveDown_Click; + // + // toolStripSeparator2 + // + toolStripSeparator2.Name = "toolStripSeparator2"; + toolStripSeparator2.Size = new Size(184, 6); // // toolStripMenuItem_BatchAdd // toolStripMenuItem_BatchAdd.Name = "toolStripMenuItem_BatchAdd"; - toolStripMenuItem_BatchAdd.Size = new Size(240, 30); + toolStripMenuItem_BatchAdd.Size = new Size(187, 30); toolStripMenuItem_BatchAdd.Text = "批量添加(&B)..."; toolStripMenuItem_BatchAdd.Click += toolStripMenuItem_BatchAdd_Click; // @@ -123,29 +136,10 @@ // toolStripMenuItem_RemoveAll.Enabled = false; toolStripMenuItem_RemoveAll.Name = "toolStripMenuItem_RemoveAll"; - toolStripMenuItem_RemoveAll.Size = new Size(240, 30); + toolStripMenuItem_RemoveAll.Size = new Size(187, 30); toolStripMenuItem_RemoveAll.Text = "移除全部(&X)"; toolStripMenuItem_RemoveAll.Click += toolStripMenuItem_RemoveAll_Click; // - // toolStripSeparator2 - // - toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new Size(237, 6); - // - // toolStripMenuItem_MoveUp - // - toolStripMenuItem_MoveUp.Name = "toolStripMenuItem_MoveUp"; - toolStripMenuItem_MoveUp.Size = new Size(240, 30); - toolStripMenuItem_MoveUp.Text = "上移(&U)"; - toolStripMenuItem_MoveUp.Click += toolStripMenuItem_MoveUp_Click; - // - // toolStripMenuItem_MoveDown - // - toolStripMenuItem_MoveDown.Name = "toolStripMenuItem_MoveDown"; - toolStripMenuItem_MoveDown.Size = new Size(240, 30); - toolStripMenuItem_MoveDown.Text = "下移(&D)"; - toolStripMenuItem_MoveDown.Click += toolStripMenuItem_MoveDown_Click; - // // SpineListView // AutoScaleDimensions = new SizeF(11F, 24F); @@ -158,8 +152,6 @@ } #endregion - private ColumnHeader columnHeader_Name; - private ColumnHeader columnHeader_Version; private ContextMenuStrip contextMenuStrip; private ToolStripMenuItem toolStripMenuItem_Add; private ToolStripMenuItem toolStripMenuItem_Insert; @@ -171,5 +163,6 @@ private ToolStripMenuItem toolStripMenuItem_MoveUp; private ToolStripMenuItem toolStripMenuItem_MoveDown; private ToolStripSeparator toolStripSeparator2; + private ColumnHeader columnHeader_Name; } } diff --git a/SpineViewer/Controls/SpineListView.cs b/SpineViewer/Controls/SpineListView.cs index 94a4626..f566b70 100644 --- a/SpineViewer/Controls/SpineListView.cs +++ b/SpineViewer/Controls/SpineListView.cs @@ -54,7 +54,7 @@ namespace SpineViewer.Controls // 锁定外部的读操作 lock (Spines) { spines.Insert(index, spine); } - listView.Items.Insert(index, new ListViewItem([spine.Name, spine.Version.String()], -1) { ToolTipText = spine.SkelPath }); + listView.Items.Insert(index, new ListViewItem(spine.Name) { ToolTipText = spine.SkelPath }); // 选中新增项 listView.SelectedIndices.Clear(); @@ -119,7 +119,7 @@ namespace SpineViewer.Controls { var spine = Spine.Spine.New(version, skelPath); lock (Spines) { spines.Add(spine); } - listView.Invoke(() => listView.Items.Add(new ListViewItem([spine.Name, spine.Version.String()], -1) { ToolTipText = spine.SkelPath })); + listView.Invoke(() => listView.Items.Add(new ListViewItem(spine.Name) { ToolTipText = spine.SkelPath })); success++; } catch (Exception ex) diff --git a/SpineViewer/MainForm.Designer.cs b/SpineViewer/MainForm.Designer.cs index 4874053..76c5c20 100644 --- a/SpineViewer/MainForm.Designer.cs +++ b/SpineViewer/MainForm.Designer.cs @@ -41,6 +41,8 @@ toolStripMenuItem_Function = new ToolStripMenuItem(); toolStripMenuItem_ResetAnimation = new ToolStripMenuItem(); toolStripMenuItem_Help = new ToolStripMenuItem(); + toolStripMenuItem_Diagnostics = new ToolStripMenuItem(); + toolStripSeparator3 = new ToolStripSeparator(); toolStripMenuItem_About = new ToolStripMenuItem(); rtbLog = new RichTextBox(); splitContainer_MainForm = new SplitContainer(); @@ -57,8 +59,6 @@ spinePreviewer = new SpineViewer.Controls.SpinePreviewer(); panel_MainForm = new Panel(); toolTip = new ToolTip(components); - toolStripSeparator3 = new ToolStripSeparator(); - toolStripMenuItem_Diagnostics = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)splitContainer_MainForm).BeginInit(); splitContainer_MainForm.Panel1.SuspendLayout(); @@ -105,40 +105,40 @@ // toolStripMenuItem_Open.Name = "toolStripMenuItem_Open"; toolStripMenuItem_Open.ShortcutKeys = Keys.Control | Keys.O; - toolStripMenuItem_Open.Size = new Size(270, 34); + toolStripMenuItem_Open.Size = new Size(254, 34); toolStripMenuItem_Open.Text = "打开(&O)..."; toolStripMenuItem_Open.Click += toolStripMenuItem_Open_Click; // // toolStripMenuItem_BatchOpen // toolStripMenuItem_BatchOpen.Name = "toolStripMenuItem_BatchOpen"; - toolStripMenuItem_BatchOpen.Size = new Size(270, 34); + toolStripMenuItem_BatchOpen.Size = new Size(254, 34); toolStripMenuItem_BatchOpen.Text = "批量打开(&B)..."; toolStripMenuItem_BatchOpen.Click += toolStripMenuItem_BatchOpen_Click; // // toolStripSeparator1 // toolStripSeparator1.Name = "toolStripSeparator1"; - toolStripSeparator1.Size = new Size(267, 6); + toolStripSeparator1.Size = new Size(251, 6); // // toolStripMenuItem_Export // toolStripMenuItem_Export.Name = "toolStripMenuItem_Export"; toolStripMenuItem_Export.ShortcutKeys = Keys.Control | Keys.S; - toolStripMenuItem_Export.Size = new Size(270, 34); + toolStripMenuItem_Export.Size = new Size(254, 34); toolStripMenuItem_Export.Text = "导出(&E)..."; toolStripMenuItem_Export.Click += toolStripMenuItem_Export_Click; // // toolStripSeparator2 // toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new Size(267, 6); + toolStripSeparator2.Size = new Size(251, 6); // // toolStripMenuItem_Exit // toolStripMenuItem_Exit.Name = "toolStripMenuItem_Exit"; toolStripMenuItem_Exit.ShortcutKeys = Keys.Alt | Keys.F4; - toolStripMenuItem_Exit.Size = new Size(270, 34); + toolStripMenuItem_Exit.Size = new Size(254, 34); toolStripMenuItem_Exit.Text = "退出(&X)"; toolStripMenuItem_Exit.Click += toolStripMenuItem_Exit_Click; // @@ -152,7 +152,7 @@ // toolStripMenuItem_ResetAnimation // toolStripMenuItem_ResetAnimation.Name = "toolStripMenuItem_ResetAnimation"; - toolStripMenuItem_ResetAnimation.Size = new Size(270, 34); + toolStripMenuItem_ResetAnimation.Size = new Size(242, 34); toolStripMenuItem_ResetAnimation.Text = "重置动画时间(&R)"; toolStripMenuItem_ResetAnimation.Click += toolStripMenuItem_ResetAnimation_Click; // @@ -163,10 +163,22 @@ toolStripMenuItem_Help.Size = new Size(88, 28); toolStripMenuItem_Help.Text = "帮助(&H)"; // + // toolStripMenuItem_Diagnostics + // + toolStripMenuItem_Diagnostics.Name = "toolStripMenuItem_Diagnostics"; + toolStripMenuItem_Diagnostics.Size = new Size(208, 34); + toolStripMenuItem_Diagnostics.Text = "诊断信息(&D)"; + toolStripMenuItem_Diagnostics.Click += toolStripMenuItem_Diagnostics_Click; + // + // toolStripSeparator3 + // + toolStripSeparator3.Name = "toolStripSeparator3"; + toolStripSeparator3.Size = new Size(205, 6); + // // toolStripMenuItem_About // toolStripMenuItem_About.Name = "toolStripMenuItem_About"; - toolStripMenuItem_About.Size = new Size(270, 34); + toolStripMenuItem_About.Size = new Size(208, 34); toolStripMenuItem_About.Text = "关于(&A)"; toolStripMenuItem_About.Click += toolStripMenuItem_About_Click; // @@ -226,7 +238,7 @@ splitContainer_Functional.Panel2.Controls.Add(groupBox_Preview); splitContainer_Functional.Panel2.Cursor = Cursors.Default; splitContainer_Functional.Size = new Size(1721, 848); - splitContainer_Functional.SplitterDistance = 725; + splitContainer_Functional.SplitterDistance = 682; splitContainer_Functional.TabIndex = 2; splitContainer_Functional.TabStop = false; splitContainer_Functional.SplitterMoved += splitContainer_SplitterMoved; @@ -248,8 +260,8 @@ // splitContainer_Information.Panel2.Controls.Add(splitContainer_Config); splitContainer_Information.Panel2.Cursor = Cursors.Default; - splitContainer_Information.Size = new Size(725, 848); - splitContainer_Information.SplitterDistance = 346; + splitContainer_Information.Size = new Size(682, 848); + splitContainer_Information.SplitterDistance = 270; splitContainer_Information.TabIndex = 1; splitContainer_Information.TabStop = false; splitContainer_Information.SplitterMoved += splitContainer_SplitterMoved; @@ -261,7 +273,7 @@ groupBox_SkelList.Dock = DockStyle.Fill; groupBox_SkelList.Location = new Point(0, 0); groupBox_SkelList.Name = "groupBox_SkelList"; - groupBox_SkelList.Size = new Size(346, 848); + groupBox_SkelList.Size = new Size(270, 848); groupBox_SkelList.TabIndex = 0; groupBox_SkelList.TabStop = false; groupBox_SkelList.Text = "模型列表"; @@ -272,7 +284,7 @@ spineListView.Location = new Point(3, 26); spineListView.Name = "spineListView"; spineListView.PropertyGrid = propertyGrid_Spine; - spineListView.Size = new Size(340, 819); + spineListView.Size = new Size(264, 819); spineListView.TabIndex = 0; // // propertyGrid_Spine @@ -281,7 +293,7 @@ propertyGrid_Spine.HelpVisible = false; propertyGrid_Spine.Location = new Point(3, 26); propertyGrid_Spine.Name = "propertyGrid_Spine"; - propertyGrid_Spine.Size = new Size(369, 470); + propertyGrid_Spine.Size = new Size(402, 470); propertyGrid_Spine.TabIndex = 0; propertyGrid_Spine.ToolbarVisible = false; propertyGrid_Spine.PropertyValueChanged += propertyGrid_PropertyValueChanged; @@ -303,7 +315,7 @@ // splitContainer_Config.Panel2.Controls.Add(groupBox_PreviewConfig); splitContainer_Config.Panel2.Cursor = Cursors.Default; - splitContainer_Config.Size = new Size(375, 848); + splitContainer_Config.Size = new Size(408, 848); splitContainer_Config.SplitterDistance = 499; splitContainer_Config.TabIndex = 0; splitContainer_Config.TabStop = false; @@ -316,7 +328,7 @@ groupBox_SkelConfig.Dock = DockStyle.Fill; groupBox_SkelConfig.Location = new Point(0, 0); groupBox_SkelConfig.Name = "groupBox_SkelConfig"; - groupBox_SkelConfig.Size = new Size(375, 499); + groupBox_SkelConfig.Size = new Size(408, 499); groupBox_SkelConfig.TabIndex = 0; groupBox_SkelConfig.TabStop = false; groupBox_SkelConfig.Text = "模型参数"; @@ -327,7 +339,7 @@ groupBox_PreviewConfig.Dock = DockStyle.Fill; groupBox_PreviewConfig.Location = new Point(0, 0); groupBox_PreviewConfig.Name = "groupBox_PreviewConfig"; - groupBox_PreviewConfig.Size = new Size(375, 345); + groupBox_PreviewConfig.Size = new Size(408, 345); groupBox_PreviewConfig.TabIndex = 1; groupBox_PreviewConfig.TabStop = false; groupBox_PreviewConfig.Text = "画面参数"; @@ -338,7 +350,7 @@ propertyGrid_Previewer.HelpVisible = false; propertyGrid_Previewer.Location = new Point(3, 26); propertyGrid_Previewer.Name = "propertyGrid_Previewer"; - propertyGrid_Previewer.Size = new Size(369, 316); + propertyGrid_Previewer.Size = new Size(402, 316); propertyGrid_Previewer.TabIndex = 1; propertyGrid_Previewer.ToolbarVisible = false; propertyGrid_Previewer.PropertyValueChanged += propertyGrid_PropertyValueChanged; @@ -349,7 +361,7 @@ groupBox_Preview.Dock = DockStyle.Fill; groupBox_Preview.Location = new Point(0, 0); groupBox_Preview.Name = "groupBox_Preview"; - groupBox_Preview.Size = new Size(992, 848); + groupBox_Preview.Size = new Size(1035, 848); groupBox_Preview.TabIndex = 1; groupBox_Preview.TabStop = false; groupBox_Preview.Text = "预览画面"; @@ -361,7 +373,7 @@ spinePreviewer.Location = new Point(3, 26); spinePreviewer.Name = "spinePreviewer"; spinePreviewer.PropertyGrid = propertyGrid_Previewer; - spinePreviewer.Size = new Size(986, 819); + spinePreviewer.Size = new Size(1029, 819); spinePreviewer.SpineListView = spineListView; spinePreviewer.TabIndex = 0; spinePreviewer.MouseUp += spinePreviewer_MouseUp; @@ -380,18 +392,6 @@ // toolTip.ShowAlways = true; // - // toolStripSeparator3 - // - toolStripSeparator3.Name = "toolStripSeparator3"; - toolStripSeparator3.Size = new Size(267, 6); - // - // toolStripMenuItem_Diagnostics - // - toolStripMenuItem_Diagnostics.Name = "toolStripMenuItem_Diagnostics"; - toolStripMenuItem_Diagnostics.Size = new Size(270, 34); - toolStripMenuItem_Diagnostics.Text = "诊断信息(&D)"; - toolStripMenuItem_Diagnostics.Click += toolStripMenuItem_Diagnostics_Click; - // // MainForm // AutoScaleDimensions = new SizeF(11F, 24F);