From 08d54cd13cc8e1dad7ebe6cd170c45ecd9d34630 Mon Sep 17 00:00:00 2001 From: Florian Stinglmayr Date: Thu, 7 Nov 2024 15:06:46 +0100 Subject: [PATCH] more changes towards Avalonia --- Avalonia.EliteBGS/App.axaml.cs | 4 +++- Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs | 4 ++-- .../Properties/Resources.Designer.cs | 20 +++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Avalonia.EliteBGS/App.axaml.cs b/Avalonia.EliteBGS/App.axaml.cs index 97f9628..f768446 100644 --- a/Avalonia.EliteBGS/App.axaml.cs +++ b/Avalonia.EliteBGS/App.axaml.cs @@ -1,4 +1,6 @@ -namespace EliteBGS { +using Avalonia; + +namespace EliteBGS { /// /// Interaction logic for App.xaml /// diff --git a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs index 94a086a..a85b473 100644 --- a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs +++ b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Collections.Generic; using System.IO; -using System.Windows; -using Microsoft.Win32; +using Avalonia; +using Avalonia.Controls; using EDPlayerJournal.Entries; using EliteBGS.Util; using EDPlayerJournal.BGS; diff --git a/Avalonia.EliteBGS/Properties/Resources.Designer.cs b/Avalonia.EliteBGS/Properties/Resources.Designer.cs index 0b1a21e..863ec2d 100644 --- a/Avalonia.EliteBGS/Properties/Resources.Designer.cs +++ b/Avalonia.EliteBGS/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace EliteBGS.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace EliteBGS.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace EliteBGS.Properties { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,14 +59,14 @@ namespace EliteBGS.Properties { resourceCulture = value; } } - + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon EliteBGS { + internal static System.Drawing.Common.Icon EliteBGS { get { object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); - return ((System.Drawing.Icon)(obj)); + return ((System.Drawing.Common.Icon)(obj)); } } }