diff --git a/PcgsInvUi/PcgsInvUi.csproj b/PcgsInvUi/PcgsInvUi.csproj
index 0975dd1..d44ea27 100644
--- a/PcgsInvUi/PcgsInvUi.csproj
+++ b/PcgsInvUi/PcgsInvUi.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/PcgsInvUi/ViewModels/ErrorWindowViewModel.cs b/PcgsInvUi/ViewModels/ErrorWindowViewModel.cs
index 116b3d2..6d93ac2 100644
--- a/PcgsInvUi/ViewModels/ErrorWindowViewModel.cs
+++ b/PcgsInvUi/ViewModels/ErrorWindowViewModel.cs
@@ -1,22 +1,26 @@
-using System;
using System.Reactive;
-using ReactiveUI;
+using System.Security.Principal;
using PcgsInvUi.Views;
+using ReactiveUI;
namespace PcgsInvUi.ViewModels;
public class ErrorWindowViewModel : ViewModelBase {
- public Exception DisplayedException {
+ public string DisplayedMessage {
get => _message;
set => this.RaiseAndSetIfChanged(ref _message, value);
}
- private Exception _message;
+ private string _message;
public ReactiveCommand CloseCommand { get; }
- public ErrorWindowViewModel(string message) {
- CloseCommand = ReactiveCommand.Create(window => { window.Close(); });
+ public ErrorWindowViewModel(string message)
+ {
+ DisplayedMessage = message;
+
+ CloseCommand = ReactiveCommand.Create(window => window.Close());
}
+
}
\ No newline at end of file
diff --git a/PcgsInvUi/Views/DeleteWindow.axaml b/PcgsInvUi/Views/DeleteWindow.axaml
index f4c756c..a967024 100644
--- a/PcgsInvUi/Views/DeleteWindow.axaml
+++ b/PcgsInvUi/Views/DeleteWindow.axaml
@@ -18,7 +18,7 @@
+ HorizontalContentAlignment="Center" IsEnabled="False"
+ Content="Use X button" Command="{Binding CancelCommand}" />
\ No newline at end of file
diff --git a/PcgsInvUi/Views/ErrorWindow.axaml b/PcgsInvUi/Views/ErrorWindow.axaml
index 3aa990f..5067840 100644
--- a/PcgsInvUi/Views/ErrorWindow.axaml
+++ b/PcgsInvUi/Views/ErrorWindow.axaml
@@ -3,11 +3,17 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="clr-namespace:PcgsInvUi.ViewModels"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="150"
x:Class="PcgsInvUi.Views.ErrorWindow" x:DataType="viewModels:ErrorWindowViewModel"
- Title="ErrorWindow">
-
-
-
+ Title="Error!" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterOwner"
+ x:Name="NameErrorWindow" CanResize="False" >
+
+
+
diff --git a/PcgsInvUi/Views/ErrorWindow.axaml.cs b/PcgsInvUi/Views/ErrorWindow.axaml.cs
index 68da6e4..43c0ae3 100644
--- a/PcgsInvUi/Views/ErrorWindow.axaml.cs
+++ b/PcgsInvUi/Views/ErrorWindow.axaml.cs
@@ -1,11 +1,11 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using PcgsInvUi.ViewModels;
namespace PcgsInvUi.Views;
-public partial class ErrorWindow : Window {
- public ErrorWindow() {
+public partial class ErrorWindow : ReactiveWindow {
+ public ErrorWindow()
+ {
InitializeComponent();
}
}
\ No newline at end of file
diff --git a/PcgsInvUi/Views/MainWindow.axaml b/PcgsInvUi/Views/MainWindow.axaml
index a351c12..1d0a320 100644
--- a/PcgsInvUi/Views/MainWindow.axaml
+++ b/PcgsInvUi/Views/MainWindow.axaml
@@ -50,7 +50,7 @@
IsReadOnly="True" />
+ IsReadOnly="True" />
diff --git a/PcgsInvUi/Views/MainWindow.axaml.cs b/PcgsInvUi/Views/MainWindow.axaml.cs
index b9d1c2c..e1a2383 100644
--- a/PcgsInvUi/Views/MainWindow.axaml.cs
+++ b/PcgsInvUi/Views/MainWindow.axaml.cs
@@ -18,7 +18,7 @@ public partial class MainWindow : ReactiveWindow {
// this.WhenActivated(d => d(ViewModel!.ShowFindWindow.RegisterHandler(ShowFindWindowAsync)));
}
- public async Task ShowDeleteWindowAsync(InteractionContext interaction) {
+ private async Task ShowDeleteWindowAsync(InteractionContext interaction) {
var window = new DeleteWindow();
window.DataContext = interaction.Input;
@@ -26,7 +26,7 @@ public partial class MainWindow : ReactiveWindow {
interaction.SetOutput(result);
}
- public async Task ShowFindWindowAsync(InteractionContext interaction) {
+ private async Task ShowFindWindowAsync(InteractionContext interaction) {
var window = new FindWindow();
window.DataContext = interaction.Input;
@@ -34,7 +34,7 @@ public partial class MainWindow : ReactiveWindow {
interaction.SetOutput(result);
}
- public async Task ShowFilePickerAsync(InteractionContext interationContext) {
+ private async Task ShowFilePickerAsync(InteractionContext interationContext) {
var topLevel = GetTopLevel(this);
var file = await topLevel.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions {
Title = "Save CSV...",
@@ -44,8 +44,6 @@ public partial class MainWindow : ReactiveWindow {
SuggestedStartLocation = await StorageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Documents)
});
- Stream stream;
-
if (file is not null) {
interationContext.SetOutput(file.Path);
}
@@ -55,10 +53,11 @@ public partial class MainWindow : ReactiveWindow {
}
}
- public async Task ShowErrorWindowAsync(InteractionContext interaction) {
+ private async Task ShowErrorWindowAsync(InteractionContext interaction) {
var window = new ErrorWindow();
window.DataContext = interaction.Input;
await window.ShowDialog(this);
+ interaction.SetOutput(Unit.Default);
}
}
\ No newline at end of file