Change Notes:

- Renaming to remove other unnecessary uses of the AudioProject prefix.

Author: Pear-231

Editors/Audio/AudioEditor/AudioFilesExplorer/AudioFilesExplorerView.xaml

@@ -185,7 +185,7 @@
 
             <audiofilesexplorer:MultiSelectTreeView.ItemTemplate>
                 <HierarchicalDataTemplate 
-                    DataType="{x:Type audiofilesexplorer:AudioFilesTreeNode}" 
+                    DataType="{x:Type audiofilesexplorer:TreeNode}" 
                     ItemsSource="{Binding Children}">
                     <Grid>
                         <Grid.ColumnDefinitions>

Editors/Audio/AudioEditor/AudioFilesExplorer/AudioFilesExplorerViewModel.cs

@@ -27,10 +27,10 @@ public partial class AudioFilesExplorerViewModel : ObservableObject, IEditorInte
         [ObservableProperty] private bool _isAddAudioFilesButtonEnabled = false;
         [ObservableProperty] private bool _isPlayAudioButtonEnabled = false;
         [ObservableProperty] private string _searchQuery;
-        [ObservableProperty] private ObservableCollection<AudioFilesTreeNode> _audioFilesTree;
-        private ObservableCollection<AudioFilesTreeNode> _unfilteredTree;
+        [ObservableProperty] private ObservableCollection<TreeNode> _audioFilesTree;
+        private ObservableCollection<TreeNode> _unfilteredTree;
 
-        public ObservableCollection<AudioFilesTreeNode> SelectedTreeNodes { get; set; } = new ObservableCollection<AudioFilesTreeNode>();
+        public ObservableCollection<TreeNode> SelectedTreeNodes { get; set; } = new ObservableCollection<TreeNode>();
 
         public AudioFilesExplorerViewModel(IPackFileService packFileService, SoundPlayer soundPlayer)
         {
@@ -58,7 +58,7 @@ private void OnSelectedTreeNodesChanged(object sender, NotifyCollectionChangedEv
         {
             if (e.Action == NotifyCollectionChangedAction.Add)
             {
-                foreach (AudioFilesTreeNode addedNode in e.NewItems)
+                foreach (TreeNode addedNode in e.NewItems)
                 {
                     if (addedNode.NodeType != NodeType.WavFile)
                         SelectedTreeNodes.Remove(addedNode);
@@ -88,8 +88,8 @@ private void CreateAudioFilesTree(PackFileContainer editablePack)
                 .Where(path => !string.IsNullOrWhiteSpace(path)) // remove the empty (pack) directory
                 .ToHashSet();
 
-            var nodeDictionary = new Dictionary<string, AudioFilesTreeNode>();
-            var rootNodes = new ObservableCollection<AudioFilesTreeNode>();
+            var nodeDictionary = new Dictionary<string, TreeNode>();
+            var rootNodes = new ObservableCollection<TreeNode>();
 
             foreach (var directoryPath in uniqueDirectoryPaths)
                 AddDirectoryToTree(rootNodes, directoryPath, nodeDictionary);
@@ -98,13 +98,13 @@ private void CreateAudioFilesTree(PackFileContainer editablePack)
                 AddFileToTree(filePathParts, nodeDictionary, rootNodes);
 
             AudioFilesTree = rootNodes;
-            _unfilteredTree = new ObservableCollection<AudioFilesTreeNode>(AudioFilesTree);
+            _unfilteredTree = new ObservableCollection<TreeNode>(AudioFilesTree);
         }
 
-        private static void AddDirectoryToTree(ObservableCollection<AudioFilesTreeNode> rootNodes, string directoryPath, Dictionary<string, AudioFilesTreeNode> nodeDictionary)
+        private static void AddDirectoryToTree(ObservableCollection<TreeNode> rootNodes, string directoryPath, Dictionary<string, TreeNode> nodeDictionary)
         {
             var currentPath = string.Empty;
-            AudioFilesTreeNode currentNode = null;
+            TreeNode currentNode = null;
 
             foreach (var directory in directoryPath.Split('\\'))
             {
@@ -115,12 +115,12 @@ private static void AddDirectoryToTree(ObservableCollection<AudioFilesTreeNode>
 
                 if (!nodeDictionary.TryGetValue(currentPath, out var directoryNode))
                 {
-                    directoryNode = new AudioFilesTreeNode
+                    directoryNode = new TreeNode
                     {
                         Name = directory,
                         NodeType = NodeType.Directory,
                         FilePath = currentPath,
-                        Children = new ObservableCollection<AudioFilesTreeNode>()
+                        Children = new ObservableCollection<TreeNode>()
                     };
 
                     if (currentNode == null)
@@ -135,11 +135,11 @@ private static void AddDirectoryToTree(ObservableCollection<AudioFilesTreeNode>
             }
         }
 
-        private static void AddFileToTree(string[] filePathParts, Dictionary<string, AudioFilesTreeNode> nodeDictionary, ObservableCollection<AudioFilesTreeNode> rootNodes)
+        private static void AddFileToTree(string[] filePathParts, Dictionary<string, TreeNode> nodeDictionary, ObservableCollection<TreeNode> rootNodes)
         {
             if (filePathParts.Length == 1)
             {
-                var fileNode = new AudioFilesTreeNode
+                var fileNode = new TreeNode
                 {
                     Name = filePathParts[0],
                     NodeType = NodeType.WavFile,
@@ -153,7 +153,7 @@ private static void AddFileToTree(string[] filePathParts, Dictionary<string, Aud
             var directoryPath = string.Join("\\", filePathParts.Take(filePathParts.Length - 1));
             if (nodeDictionary.TryGetValue(directoryPath, out var directoryNode))
             {
-                var fileNode = new AudioFilesTreeNode
+                var fileNode = new TreeNode
                 {
                     Name = filePathParts[^1],
                     NodeType = NodeType.WavFile,
@@ -166,12 +166,12 @@ private static void AddFileToTree(string[] filePathParts, Dictionary<string, Aud
 
         private void ResetTree()
         {
-            AudioFilesTree = new ObservableCollection<AudioFilesTreeNode>(_unfilteredTree);
+            AudioFilesTree = new ObservableCollection<TreeNode>(_unfilteredTree);
         }
 
-        private ObservableCollection<AudioFilesTreeNode> FilterFileTree(string query)
+        private ObservableCollection<TreeNode> FilterFileTree(string query)
         {
-            var filteredTree = new ObservableCollection<AudioFilesTreeNode>();
+            var filteredTree = new ObservableCollection<TreeNode>();
 
             foreach (var treeNode in _unfilteredTree)
             {
@@ -183,7 +183,7 @@ private ObservableCollection<AudioFilesTreeNode> FilterFileTree(string query)
             return filteredTree;
         }
 
-        private static AudioFilesTreeNode FilterTreeNode(AudioFilesTreeNode node, string query)
+        private static TreeNode FilterTreeNode(TreeNode node, string query)
         {
             var matchesQuery = node.Name.Contains(query, StringComparison.OrdinalIgnoreCase);
             var filteredChildren = node.Children
@@ -193,12 +193,12 @@ private static AudioFilesTreeNode FilterTreeNode(AudioFilesTreeNode node, string
 
             if (matchesQuery || filteredChildren.Count != 0)
             {
-                var filteredNode = new AudioFilesTreeNode
+                var filteredNode = new TreeNode
                 {
                     Name = node.Name,
                     NodeType = node.NodeType,
                     Parent = node.Parent,
-                    Children = new ObservableCollection<AudioFilesTreeNode>(filteredChildren),
+                    Children = new ObservableCollection<TreeNode>(filteredChildren),
                     IsNodeExpanded = true
                 };
                 return filteredNode;
@@ -218,7 +218,7 @@ [RelayCommand] public void CollapseOrExpandAudioFilesTree()
                 ToggleNodeExpansion(rootNode, !isExpanded);
         }
 
-        private static void ToggleNodeExpansion(AudioFilesTreeNode node, bool shouldExpand)
+        private static void ToggleNodeExpansion(TreeNode node, bool shouldExpand)
         {
             node.IsNodeExpanded = shouldExpand;
 

Editors/Audio/AudioEditor/AudioFilesExplorer/MultiSelectTreeView.cs

@@ -15,7 +15,7 @@ public class MultiSelectTreeView : TreeView
         public static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register("SelectedItems", typeof(IList), typeof(MultiSelectTreeView), new PropertyMetadata(new ArrayList(), OnSelectedItemsChanged));
         public static readonly DependencyProperty IsMultiSelectedProperty = DependencyProperty.RegisterAttached("IsMultiSelected", typeof(bool), typeof(MultiSelectTreeView), new PropertyMetadata(false));
 
-        private AudioFilesTreeNode _anchorItem;
+        private TreeNode _anchorItem;
 
         public IList SelectedItems
         {
@@ -57,7 +57,7 @@ private void MultiSelectTreeView_PreviewMouseDown(object sender, MouseButtonEven
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
             {
                 var clickedItem = GetTreeViewItemUnderMouse(e);
-                if (clickedItem?.DataContext is AudioFilesTreeNode clickedNode)
+                if (clickedItem?.DataContext is TreeNode clickedNode)
                 {
                     if (SelectedItems.Contains(clickedNode))
                     {
@@ -85,7 +85,7 @@ protected override void OnSelectedItemChanged(RoutedPropertyChangedEventArgs<obj
         {
             base.OnSelectedItemChanged(e);
 
-            if (e.NewValue is AudioFilesTreeNode currentSelectedItem)
+            if (e.NewValue is TreeNode currentSelectedItem)
             {
                 SelectedItems ??= new ArrayList();
 
@@ -111,9 +111,9 @@ protected override void OnSelectedItemChanged(RoutedPropertyChangedEventArgs<obj
             }
         }
 
-        private void SelectRangeFromAnchor(AudioFilesTreeNode anchor, AudioFilesTreeNode target)
+        private void SelectRangeFromAnchor(TreeNode anchor, TreeNode target)
         {
-            var items = GetTreeViewItems(this).Where(item => item.DataContext is AudioFilesTreeNode).ToList();
+            var items = GetTreeViewItems(this).Where(item => item.DataContext is TreeNode).ToList();
             var anchorIndex = items.FindIndex(item => item.DataContext == anchor);
             var targetIndex = items.FindIndex(item => item.DataContext == target);
 
@@ -125,7 +125,7 @@ private void SelectRangeFromAnchor(AudioFilesTreeNode anchor, AudioFilesTreeNode
 
             for (var i = 0; i < items.Count; i++)
             {
-                var node = (AudioFilesTreeNode)items[i].DataContext;
+                var node = (TreeNode)items[i].DataContext;
 
                 if (i < startIndex || i > endIndex)
                     SelectedItems.Remove(node);
@@ -138,7 +138,7 @@ private void UpdateSelectionStates()
         {
             foreach (var item in GetTreeViewItems(this))
             {
-                if (item.DataContext is AudioFilesTreeNode node)
+                if (item.DataContext is TreeNode node)
                 {
                     var isSelected = SelectedItems.Contains(node);
                     SetIsMultiSelected(item, isSelected);

Editors/Audio/AudioEditor/AudioFilesExplorer/AudioFilesTreeNode.cs renamed to Editors/Audio/AudioEditor/AudioFilesExplorer/TreeNode.cs

@@ -9,14 +9,14 @@ public enum NodeType
         WavFile
     }
 
-    public partial class AudioFilesTreeNode : ObservableObject
+    public partial class TreeNode : ObservableObject
     {
         public string Name { get; set; }
         public NodeType NodeType { get; set; }
-        public AudioFilesTreeNode Parent { get; set; }
+        public TreeNode Parent { get; set; }
         public string FilePath { get; set; }
 
         [ObservableProperty] bool _isNodeExpanded = false;
-        [ObservableProperty] ObservableCollection<AudioFilesTreeNode> _children = [];
+        [ObservableProperty] ObservableCollection<TreeNode> _children = [];
     }
 }

Editors/Audio/AudioEditor/AudioProjectExplorer/AudioProjectExplorerView.xaml

@@ -180,7 +180,7 @@
 
                 <TreeView.Resources>
                     <HierarchicalDataTemplate 
-                        DataType="{x:Type audioprojectexplorer:AudioProjectTreeNode}" 
+                        DataType="{x:Type audioprojectexplorer:TreeNode}" 
                         ItemsSource="{Binding Children}">
                         <TextBlock>
                             <TextBlock.Inlines>

Editors/Audio/AudioEditor/AudioProjectExplorer/AudioProjectExplorerView.xaml.cs

@@ -15,7 +15,7 @@ public AudioProjectExplorerView()
 
         private void TreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
-            if (e.NewValue is AudioProjectTreeNode selectedNode)
+            if (e.NewValue is TreeNode selectedNode)
                 ViewModel.OnSelectedAudioProjectTreeNodeChanged(selectedNode);
         }
 

Editors/Audio/AudioEditor/AudioProjectExplorer/AudioProjectExplorerViewModel.cs

@@ -26,17 +26,17 @@ public partial class AudioProjectExplorerViewModel : ObservableObject, IEditorIn
         [ObservableProperty] private DialogueEventPreset? _selectedDialogueEventPreset;
         [ObservableProperty] private ObservableCollection<DialogueEventPreset> _dialogueEventPresets;
         [ObservableProperty] private string _searchQuery;
-        [ObservableProperty] public ObservableCollection<AudioProjectTreeNode> _audioProjectTree = [];
-        private ObservableCollection<AudioProjectTreeNode> _unfilteredTree;
-        public AudioProjectTreeNode _selectedAudioProjectTreeNode;
+        [ObservableProperty] public ObservableCollection<TreeNode> _audioProjectTree = [];
+        private ObservableCollection<TreeNode> _unfilteredTree;
+        public TreeNode _selectedAudioProjectTreeNode;
 
         public AudioProjectExplorerViewModel(IAudioRepository audioRepository, IAudioProjectService audioProjectService)
         {
             _audioRepository = audioRepository;
             _audioProjectService = audioProjectService;
         }
 
-        public void OnSelectedAudioProjectTreeNodeChanged(AudioProjectTreeNode value)
+        public void OnSelectedAudioProjectTreeNodeChanged(TreeNode value)
         {
             _selectedAudioProjectTreeNode = value;
 
@@ -61,12 +61,12 @@ partial void OnSearchQueryChanged(string value)
 
         private void ResetTree()
         {
-            AudioProjectTree = new ObservableCollection<AudioProjectTreeNode>(_unfilteredTree);
+            AudioProjectTree = new ObservableCollection<TreeNode>(_unfilteredTree);
         }
 
-        private ObservableCollection<AudioProjectTreeNode> FilterFileTree(string query)
+        private ObservableCollection<TreeNode> FilterFileTree(string query)
         {
-            var filteredTree = new ObservableCollection<AudioProjectTreeNode>();
+            var filteredTree = new ObservableCollection<TreeNode>();
 
             foreach (var treeNode in _unfilteredTree)
             {
@@ -78,7 +78,7 @@ private ObservableCollection<AudioProjectTreeNode> FilterFileTree(string query)
             return filteredTree;
         }
 
-        private static AudioProjectTreeNode FilterTreeNode(AudioProjectTreeNode node, string query)
+        private static TreeNode FilterTreeNode(TreeNode node, string query)
         {
             var matchesQuery = node.Name.Contains(query, StringComparison.OrdinalIgnoreCase);
             var filteredChildren = node.Children
@@ -88,12 +88,12 @@ private static AudioProjectTreeNode FilterTreeNode(AudioProjectTreeNode node, st
 
             if (matchesQuery || filteredChildren.Count != 0)
             {
-                var filteredNode = new AudioProjectTreeNode
+                var filteredNode = new TreeNode
                 {
                     Name = node.Name,
                     NodeType = node.NodeType,
                     Parent = node.Parent,
-                    Children = new ObservableCollection<AudioProjectTreeNode>(filteredChildren),
+                    Children = new ObservableCollection<TreeNode>(filteredChildren),
                     IsNodeExpanded = true
                 };
                 return filteredNode;
@@ -104,13 +104,13 @@ private static AudioProjectTreeNode FilterTreeNode(AudioProjectTreeNode node, st
 
         partial void OnShowEditedAudioProjectItemsOnlyChanged(bool value)
         {
-            AudioProjectTreeBuilder.FilterEditedAudioProjectItems(_audioProjectService, this, AudioProjectTree, ShowEditedAudioProjectItemsOnly);
+            TreeBuilder.FilterEditedAudioProjectItems(_audioProjectService, this, AudioProjectTree, ShowEditedAudioProjectItemsOnly);
         }
 
         public void CreateAudioProjectTree()
         {
-            AudioProjectTreeBuilder.CreateAudioProjectTree(_audioProjectService, AudioProjectTree, ShowEditedAudioProjectItemsOnly);
-            _unfilteredTree = new ObservableCollection<AudioProjectTreeNode>(AudioProjectTree);
+            TreeBuilder.CreateAudioProjectTree(_audioProjectService, AudioProjectTree, ShowEditedAudioProjectItemsOnly);
+            _unfilteredTree = new ObservableCollection<TreeNode>(AudioProjectTree);
 
         }
 
@@ -128,7 +128,7 @@ public void CollapseAndExpandNodes()
             }
         }
 
-        public static void CollapseAndExpandNodesInner(AudioProjectTreeNode parentNode)
+        public static void CollapseAndExpandNodesInner(TreeNode parentNode)
         {
             foreach (var node in parentNode.Children)
             {

Editors/Audio/AudioEditor/AudioProjectExplorer/DialogueEventFilter.cs

@@ -27,7 +27,7 @@ public static void ApplyDialogueEventPresetFiltering(AudioEditorViewModel audioE
                         audioProjectTreeNode.PresetFilterDisplayText = null;
                 }
 
-                AudioProjectTreeBuilder.AddFilteredDialogueEventsToSoundBankTreeViewItems(audioProjectService, audioEditorViewModel.AudioProjectExplorerViewModel, soundBank.Name, presetFilter);
+                TreeBuilder.AddFilteredDialogueEventsToSoundBankTreeViewItems(audioProjectService, audioEditorViewModel.AudioProjectExplorerViewModel, soundBank.Name, presetFilter);
             }
         }