From c0fd36c8dec4e9a7a1c52e5954580c22b1f53259 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Fri, 8 Nov 2024 10:24:57 +0100
Subject: [PATCH] fix LoadEntries window

---
 Avalonia.EliteBGS/LoadEntriesWindow.axaml    |  2 +-
 Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs | 31 ++++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Avalonia.EliteBGS/LoadEntriesWindow.axaml b/Avalonia.EliteBGS/LoadEntriesWindow.axaml
index 1f91911..57792e7 100644
--- a/Avalonia.EliteBGS/LoadEntriesWindow.axaml
+++ b/Avalonia.EliteBGS/LoadEntriesWindow.axaml
@@ -1,5 +1,5 @@
 <Window x:Class="EliteBGS.LoadEntriesWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs
index c7017f8..9631d39 100644
--- a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs
+++ b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.IO;
 using Avalonia;
+using Avalonia.Platform.Storage;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Input;
@@ -47,8 +48,12 @@ public partial class LoadEntriesWindow : Window {
                 EntriesLoaded?.Invoke(entries);
             }
         } catch (Exception exception) {
-            MessageBox.Show(string.Format("There was an error while parsing the JSON: {0}",
-                exception.ToString()));
+            Helper.MessageBox(
+                this, "Error",
+                string.Format(
+                    "There was an error while parsing the JSON: {0}",
+                    exception.ToString())
+                );
         }
     }
 
@@ -57,23 +62,14 @@ public partial class LoadEntriesWindow : Window {
     }
 
     private void LoadFile_Click(object sender, RoutedEventArgs e) {
-        OpenFileDialog dialog = new OpenFileDialog();
+        string? filename = Helper.OpenFileDialog(this);
 
-        dialog.DefaultExt = ".log";
-        dialog.Filter = "Log files (*.log)|*.log|All files (*.*)|*";
-
-        var location = AppConfig.DefaultJournalLocation;
-        if (Directory.Exists(location)) {
-            dialog.InitialDirectory = location;
-        }
-
-        bool result = dialog.ShowDialog(this) ?? false;
-        if (!result) {
+        if (string.IsNullOrEmpty(filename)) {
             return;
         }
 
         try {
-            using (FileStream stream = File.OpenRead(dialog.FileName)) {
+            using (FileStream stream = File.OpenRead(filename)) {
                 using (StreamReader reader = new StreamReader(stream)) {
                     Lines.Text = reader.ReadToEnd();
                 }
@@ -113,8 +109,11 @@ public partial class LoadEntriesWindow : Window {
                 ;
             Lines.Text = string.Join("\n", text).Trim();
         } catch (Exception exception) {
-            MessageBox.Show(string.Format("There was an error while parsing the JSON: {0}",
-                exception.ToString()));
+            Helper.MessageBox(
+                "Error",
+                string.Format("There was an error while parsing the JSON: {0}",
+                              exception.ToString())
+                );
         }
     }
 }