Merge pull request #814 from VladiStep/copyItemNameOption

Added "Copy name to clipboard" option.
UnderminersTeam · Apr 6, 2022 · d7f70cd · d7f70cd
2 parents bfe0fe6 + 0f07a43
commit d7f70cd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/UndertaleModTool/MainWindow.xaml b/UndertaleModTool/MainWindow.xaml
@@ -171,7 +171,8 @@
                         <ContextMenu x:Key="AddMenu">
                             <MenuItem Header="Add" Click="MenuItem_Add_Click"/>
                         </ContextMenu>
-                        <ContextMenu x:Key="DeleteMenu">
+                        <ContextMenu x:Key="UndertaleResourceMenu">
+                            <MenuItem Header="Copy name to clipboard" Click="MenuItem_CopyName_Click"/>
                             <MenuItem Header="Delete" Click="MenuItem_Delete_Click"/>
                         </ContextMenu>
 
@@ -182,7 +183,7 @@
                             <EventSetter Event="TreeViewItem.MouseMove" Handler="TreeView_MouseMove"/>
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding ., Converter={StaticResource ImplementsInterfaceConverter}, ConverterParameter={x:Type undertalelib:UndertaleResource}}" Value="True">
-                                    <Setter Property="ContextMenu" Value="{StaticResource DeleteMenu}"/>
+                                    <Setter Property="ContextMenu" Value="{StaticResource UndertaleResourceMenu}"/>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding ItemsSource, RelativeSource={RelativeSource Self}, Converter={StaticResource ImplementsInterfaceConverter}, ConverterParameter={x:Type scol:IList}}" Value="True">
                                     <Setter Property="ContextMenu" Value="{StaticResource AddMenu}"/>
@@ -291,7 +292,7 @@
                         <TreeViewItem Name="CodeItemsList" Header="Code" ItemsSource="{Binding Code, Converter={StaticResource FilteredViewConverter}}" Visibility="{Binding Code, Converter={StaticResource VisibleIfNotNull}}">
                             <TreeViewItem.ItemContainerStyle>
                                 <Style TargetType="{x:Type TreeViewItem}">
-                                    <Setter Property="ContextMenu" Value="{StaticResource DeleteMenu}"/>
+                                    <Setter Property="ContextMenu" Value="{StaticResource UndertaleResourceMenu}"/>
                                     <Setter Property="Foreground" Value="Gray"/>
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding Path=ParentEntry}" Value="{x:Null}">

diff --git a/UndertaleModTool/MainWindow.xaml.cs b/UndertaleModTool/MainWindow.xaml.cs
@@ -1271,27 +1271,24 @@ private void TreeView_MouseMove(object sender, MouseEventArgs e)
                 }
             }
         }
-
         private void TreeView_DragOver(object sender, DragEventArgs e)
         {
             UndertaleObject sourceItem = e.Data.GetData(e.Data.GetFormats()[e.Data.GetFormats().Length - 1]) as UndertaleObject; // TODO: make this more reliable
 
-#if DEBUG
-            foreach (var s in e.Data.GetFormats())
-                Debug.WriteLine(s);
-#endif
-
             TreeViewItem targetTreeItem = VisualUpwardSearch<TreeViewItem>(e.OriginalSource as UIElement);
             UndertaleObject targetItem = targetTreeItem.DataContext as UndertaleObject;
 
             e.Effects = e.AllowedEffects.HasFlag(DragDropEffects.Move) && sourceItem != null && targetItem != null && sourceItem != targetItem && sourceItem.GetType() == targetItem.GetType() ? DragDropEffects.Move : DragDropEffects.None;
             e.Handled = true;
         }
-
         private void TreeView_Drop(object sender, DragEventArgs e)
         {
             UndertaleObject sourceItem = e.Data.GetData(e.Data.GetFormats()[e.Data.GetFormats().Length - 1]) as UndertaleObject;
 
+#if DEBUG
+            Debug.WriteLine("Format(s) of dropped TreeViewItem - " + String.Join(", ", e.Data.GetFormats()));
+#endif
+
             TreeViewItem targetTreeItem = VisualUpwardSearch<TreeViewItem>(e.OriginalSource as UIElement);
             UndertaleObject targetItem = targetTreeItem.DataContext as UndertaleObject;
 
@@ -1401,6 +1398,13 @@ private void DeleteItem(UndertaleObject obj)
                 UpdateTree();
             }
         }
+        private void CopyItemName(UndertaleNamedResource namedRes)
+        {
+            if (namedRes.Name?.Content is not null)
+                Clipboard.SetText(namedRes.Name.Content);
+            else
+                ShowWarning("Item name is null.");
+        }
 
         private void MainTree_KeyDown(object sender, KeyEventArgs e)
         {
@@ -1481,8 +1485,13 @@ private void MainTree_PreviewMouseRightButtonDown(object sender, MouseButtonEven
 
         private void MenuItem_Delete_Click(object sender, RoutedEventArgs e)
         {
-            if (Highlighted != null && Highlighted is UndertaleObject)
-                DeleteItem(Highlighted as UndertaleObject);
+            if (Highlighted is UndertaleObject obj)
+                DeleteItem(obj);
+        }
+        private void MenuItem_CopyName_Click(object sender, RoutedEventArgs e)
+        {
+            if (Highlighted is UndertaleNamedResource namedRes)
+                CopyItemName(namedRes);
         }
 
         private void MenuItem_Add_Click(object sender, RoutedEventArgs e)