Add individual add/remove buttons for dependent objects list in RegionView

Co-authored-by: LeftofZen <7483209+LeftofZen@users.noreply.github.com>

Author: Copilot

Gui/ViewModels/Loco/Objects/RegionViewModel.cs

@@ -1,11 +1,16 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Definitions.ObjectModels.Objects.Region;
 using Definitions.ObjectModels.Types;
 using Gui.Models;
+using Gui.Views;
 using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive;
+using System.Reactive.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 
@@ -24,7 +29,11 @@ public RegionViewModel(RegionObject model, ObjectEditorContext? editorContext =
 		CargoInfluenceObjects = new BindingList<ObjectModelHeader>(model.CargoInfluenceObjects);
 		CargoInfluenceTownFilter = new BindingList<CargoInfluenceTownFilterType>(model.CargoInfluenceTownFilter);
 
+		var hasSelection = this.WhenAnyValue(x => x.SelectedDependentObject).Select(obj => obj != null);
+
 		PopulateDependentObjectsFromFolderCommand = ReactiveCommand.CreateFromTask(PopulateDependentObjectsFromFolder);
+		AddDependentObjectCommand = ReactiveCommand.CreateFromTask(AddDependentObjectAsync);
+		RemoveSelectedDependentObjectCommand = ReactiveCommand.Create(RemoveSelectedDependentObject, hasSelection);
 		CopyDependentObjectsCommand = ReactiveCommand.CreateFromTask(CopyDependentObjectsAsync);
 		PasteDependentObjectsCommand = ReactiveCommand.CreateFromTask(PasteDependentObjectsAsync);
 		ClearDependentObjectsCommand = ReactiveCommand.Create(ClearDependentObjects);
@@ -45,6 +54,10 @@ public uint8_t pad_07
 	[Browsable(false)]
 	public BindingList<ObjectModelHeader> DependentObjects { get; }
 
+	[Browsable(false)]
+	[Reactive]
+	public ObjectModelHeader? SelectedDependentObject { get; set; }
+
 	[Category("Cargo")]
 	public BindingList<ObjectModelHeader> CargoInfluenceObjects { get; }
 
@@ -54,6 +67,12 @@ public uint8_t pad_07
 	[Browsable(false)]
 	public ReactiveCommand<Unit, Unit> PopulateDependentObjectsFromFolderCommand { get; }
 
+	[Browsable(false)]
+	public ReactiveCommand<Unit, Unit> AddDependentObjectCommand { get; }
+
+	[Browsable(false)]
+	public ReactiveCommand<Unit, Unit> RemoveSelectedDependentObjectCommand { get; }
+
 	[Browsable(false)]
 	public ReactiveCommand<Unit, Unit> CopyDependentObjectsCommand { get; }
 
@@ -80,6 +99,37 @@ Task PopulateDependentObjectsFromFolder()
 		return Task.CompletedTask;
 	}
 
+	async Task AddDependentObjectAsync()
+	{
+		var objectIndex = editorContext?.ObjectIndex;
+		if (objectIndex == null)
+		{
+			return;
+		}
+
+		if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime app || app.MainWindow == null)
+		{
+			return;
+		}
+
+		var vm = new ObjectSelectionWindowViewModel(objectIndex.Objects);
+		var dialog = new ObjectSelectionWindow { DataContext = vm };
+		var result = await dialog.ShowDialog<ObjectSelectionWindowViewModel?>(app.MainWindow);
+
+		if (result?.SelectedObject is { DatChecksum: not null } selected)
+		{
+			DependentObjects.Add(new ObjectModelHeader(selected.DisplayName, selected.ObjectType, selected.ObjectSource, selected.DatChecksum.Value));
+		}
+	}
+
+	void RemoveSelectedDependentObject()
+	{
+		if (SelectedDependentObject != null)
+		{
+			DependentObjects.Remove(SelectedDependentObject);
+		}
+	}
+
 	async Task CopyDependentObjectsAsync()
 	{
 		var json = JsonSerializer.Serialize(DependentObjects.ToList(), JsonSerializerOptions);

Gui/Views/ObjectSelectionWindow.axaml

@@ -17,12 +17,13 @@
 	<DockPanel>
 		<TextBox DockPanel.Dock="Top" Watermark="Search" Text="{Binding SearchTerm}"></TextBox>
 		<UniformGrid Rows="1" Columns="2" DockPanel.Dock="Bottom">
-			<Button Grid.Column="0" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center">Confirm</Button>
-			<Button Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center">Cancel</Button>
+			<Button Grid.Column="0" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding ConfirmCommand}">Confirm</Button>
+			<Button Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding CancelCommand}">Cancel</Button>
 		</UniformGrid>
 		<ListBox SelectedItem="{Binding SelectedObject}" ItemsSource="{Binding ObjectView}" SelectionMode="Single">
 			<ListBox.ItemTemplate>
 				<DataTemplate>
+					<TextBlock Text="{Binding DisplayName}" />
 				</DataTemplate>
 			</ListBox.ItemTemplate>
 		</ListBox>

Gui/Views/ObjectSelectionWindow.axaml.cs

@@ -1,5 +1,8 @@
 using Gui.ViewModels;
+using ReactiveUI;
 using ReactiveUI.Avalonia;
+using System;
+using System.Reactive;
 
 namespace Gui.Views;
 
@@ -8,5 +11,10 @@ public partial class ObjectSelectionWindow : ReactiveWindow<ObjectSelectionWindo
 	public ObjectSelectionWindow()
 	{
 		InitializeComponent();
+		this.WhenActivated(d =>
+		{
+			d(ViewModel!.ConfirmCommand.Subscribe(Observer.Create<Unit>(_ => Close(ViewModel))));
+			d(ViewModel!.CancelCommand.Subscribe(Observer.Create<Unit>(_ => Close(null))));
+		});
 	}
 }

Gui/Views/RegionView.axaml

@@ -18,6 +18,16 @@
 		<TabItem Header="Dependent Objects">
 			<DockPanel>
 				<StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Spacing="4" Margin="4">
+					<Button Command="{Binding AddDependentObjectCommand}"
+							ToolTip.Tip="Select and add an object from the current folder to the list">
+						Add object
+					</Button>
+					<Button Command="{Binding RemoveSelectedDependentObjectCommand}"
+							Classes="danger"
+							ToolTip.Tip="Remove the currently selected object from the list">
+						Remove selected
+					</Button>
+					<Separator Width="8" />
 					<Button Command="{Binding PopulateDependentObjectsFromFolderCommand}"
 							ToolTip.Tip="Clear the list and populate it with all objects from the currently loaded folder">
 						Populate from current folder
@@ -40,6 +50,7 @@
 				</StackPanel>
 				<DataGrid
 					ItemsSource="{Binding DependentObjects}"
+					SelectedItem="{Binding SelectedDependentObject}"
 					AutoGenerateColumns="False"
 					CanUserSortColumns="True"
 					IsReadOnly="True">