From 67c9ea929109042e7d883e1ddf9acb95521946a9 Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Sat, 30 Aug 2025 01:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=BD=A8=E9=81=93=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD=E8=87=B3=E5=8F=B3=E9=94=AE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SpineViewer/Resources/Strings/en.xaml         |  1 +
 SpineViewer/Resources/Strings/ja.xaml         |  1 +
 SpineViewer/Resources/Strings/zh.xaml         |  1 +
 .../MainWindow/SpineObjectTabViewModel.cs     | 24 ++++++++++++++++---
 SpineViewer/Views/MainWindow.xaml             |  7 +++---
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/SpineViewer/Resources/Strings/en.xaml b/SpineViewer/Resources/Strings/en.xaml
index f0aae8e..c33b0a0 100644
--- a/SpineViewer/Resources/Strings/en.xaml
+++ b/SpineViewer/Resources/Strings/en.xaml
@@ -84,6 +84,7 @@
     <s:String x:Key="Str_Animation">Animation</s:String>
     <s:String x:Key="Str_AppendTrack">Add</s:String>
     <s:String x:Key="Str_InsertTrack">Insert</s:String>
+    <s:String x:Key="Str_ClearTrack">Clear</s:String>
 
     <s:String x:Key="Str_Debug">Debug</s:String>
     <s:String x:Key="Str_DebugTexture">Texture</s:String>
diff --git a/SpineViewer/Resources/Strings/ja.xaml b/SpineViewer/Resources/Strings/ja.xaml
index caa0a12..d8377e9 100644
--- a/SpineViewer/Resources/Strings/ja.xaml
+++ b/SpineViewer/Resources/Strings/ja.xaml
@@ -84,6 +84,7 @@
     <s:String x:Key="Str_Animation">アニメーション</s:String>
     <s:String x:Key="Str_AppendTrack">追加</s:String>
     <s:String x:Key="Str_InsertTrack">挿入</s:String>
+    <s:String x:Key="Str_ClearTrack">削除</s:String>
 
     <s:String x:Key="Str_Debug">デバッグ</s:String>
     <s:String x:Key="Str_DebugTexture">テクスチャ</s:String>
diff --git a/SpineViewer/Resources/Strings/zh.xaml b/SpineViewer/Resources/Strings/zh.xaml
index 4131f7d..3b39b0b 100644
--- a/SpineViewer/Resources/Strings/zh.xaml
+++ b/SpineViewer/Resources/Strings/zh.xaml
@@ -84,6 +84,7 @@
     <s:String x:Key="Str_Animation">动画</s:String>
     <s:String x:Key="Str_AppendTrack">添加</s:String>
     <s:String x:Key="Str_InsertTrack">插入</s:String>
+    <s:String x:Key="Str_ClearTrack">删除</s:String>
 
     <s:String x:Key="Str_Debug">调试</s:String>
     <s:String x:Key="Str_DebugTexture">Texture</s:String>
diff --git a/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs b/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs
index df0a56d..5e39f9a 100644
--- a/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs
+++ b/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs
@@ -384,6 +384,27 @@ namespace SpineViewer.ViewModels.MainWindow
         );
         private RelayCommand<IList?>? _cmd_InsertTrack;
 
+        public RelayCommand<IList?>? Cmd_ClearTrack => _cmd_ClearTrack ??= new(
+            args =>
+            {
+                if (_selectedObjects.Length <= 0) return;
+                if (args is null) return;
+                if (args.Count <= 0) return;
+
+                foreach (var vm in args.OfType<AnimationTrackViewModel>())
+                    foreach (var sp in _selectedObjects)
+                        sp.ClearTrack(vm.TrackIndex);
+            },
+            args =>
+            {
+                if (_selectedObjects.Length <= 0) return false;
+                if (args is null) return false;
+                if (args.Count <= 0) return false;
+                return true;
+            }
+        );
+        private RelayCommand<IList?>? _cmd_ClearTrack;
+
         public bool? DebugTexture
         {
             get
@@ -806,9 +827,6 @@ namespace SpineViewer.ViewModels.MainWindow
                 }
             }
 
-            public RelayCommand Cmd_ClearTrack => _cmd_ClearTrack ??= new(() => { foreach (var sp in _spines) sp.ClearTrack(_trackIndex); });
-            private RelayCommand? _cmd_ClearTrack;
-
             public ReadOnlyCollection<string> AnimationNames => _animationNames.AsReadOnly();
 
             public int TrackIndex => _trackIndex;
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 1a74d63..395b89e 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -568,6 +568,9 @@
                                                         <MenuItem Header="{DynamicResource Str_InsertTrack}" 
                                                                   Command="{Binding Cmd_InsertTrack}"
                                                                   CommandParameter="{Binding PlacementTarget.SelectedItems, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}"/>
+                                                        <MenuItem Header="{DynamicResource Str_ClearTrack}" 
+                                                                  Command="{Binding Cmd_ClearTrack}"
+                                                                  CommandParameter="{Binding PlacementTarget.SelectedItems, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}"/>
                                                     </ContextMenu>
                                                 </ListBox.ContextMenu>
 
@@ -578,16 +581,12 @@
                                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="Col0"/>
                                                                 <ColumnDefinition Width="*"/>
                                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="Col2"/>
-                                                                <ColumnDefinition Width="Auto"/>
                                                             </Grid.ColumnDefinitions>
                                                             <Label Grid.Column="0" Content="{Binding TrackIndex}" HorizontalContentAlignment="Left"/>
                                                             <ComboBox Grid.Column="1" SelectedValue="{Binding AnimationName}" ItemsSource="{Binding AnimationNames}"/>
                                                             <Label Grid.Column="2" 
                                                                    Content="{Binding AnimationDuration}"
                                                                    ContentStringFormat="{}{0:F3} s"/>
-                                                            <Button Grid.Column="3" 
-                                                                    Command="{Binding Cmd_ClearTrack}"
-                                                                    hc:IconElement.Geometry="{StaticResource Geo_TrashXmark}"/>
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ListBox.ItemTemplate>