Merge vas-working to master (attempt 2) #2

Merged
BobdaFett merged 28 commits from vas-working into master 2023-11-23 00:05:09 +00:00
Showing only changes of commit 37a6d24049 - Show all commits
@@ -1,8 +1,5 @@
using System; using System.Reactive;
using System.Reactive; using PcgsInvUi.Views;
using System.Windows.Input;
using System.Xml;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using ReactiveUI; using ReactiveUI;
namespace PcgsInvUi.ViewModels; namespace PcgsInvUi.ViewModels;
@@ -10,5 +7,10 @@ namespace PcgsInvUi.ViewModels;
public class DeleteWindowViewModel : ViewModelBase public class DeleteWindowViewModel : ViewModelBase
{ {
public ReactiveCommand<Unit, object> OkCommand { get; } = ReactiveCommand.Create(() => (object)true); public ReactiveCommand<Unit, object> OkCommand { get; } = ReactiveCommand.Create(() => (object)true);
public ReactiveCommand<Unit, object> CancelCommand { get; } = ReactiveCommand.Create(() => (object)false); public ReactiveCommand<DeleteWindow, Unit> CancelCommand { get; }
public DeleteWindowViewModel()
{
CancelCommand = ReactiveCommand.Create<DeleteWindow>(window => window.Close());
}
} }