diff --git a/Avalonia.EliteBGS/EliteBGS.csproj b/Avalonia.EliteBGS/EliteBGS.csproj index b8909e9..026a1b8 100644 --- a/Avalonia.EliteBGS/EliteBGS.csproj +++ b/Avalonia.EliteBGS/EliteBGS.csproj @@ -50,8 +50,11 @@ - + + + + diff --git a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs index a85b473..c7017f8 100644 --- a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs +++ b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using System.IO; using Avalonia; using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Input; using EDPlayerJournal.Entries; using EliteBGS.Util; using EDPlayerJournal.BGS; diff --git a/Avalonia.EliteBGS/MainWindow.axaml.cs b/Avalonia.EliteBGS/MainWindow.axaml.cs index ec83169..5dbad89 100644 --- a/Avalonia.EliteBGS/MainWindow.axaml.cs +++ b/Avalonia.EliteBGS/MainWindow.axaml.cs @@ -11,6 +11,8 @@ using System.Globalization; using System.Diagnostics; using Avalonia; using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Input; namespace EliteBGS; @@ -484,7 +486,7 @@ public partial class MainWindow : Window { RefreshView(); } - private void Profit_KeyUp(object sender, System.Windows.Input.KeyEventArgs e) { + private void Profit_KeyUp(object sender, KeyEventArgs e) { if (e.Key == Key.Enter) { RefreshView(); } @@ -547,13 +549,15 @@ public partial class MainWindow : Window { UpdateTheme(); } - private void URL_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e) { + /* + private void URL_RequestNavigate(object sender, RequestNavigateEventArgs e) { ProcessStartInfo info = new ProcessStartInfo(); info.UseShellExecute = true; info.FileName = e.Uri.AbsoluteUri; Process.Start(info); e.Handled = true; } + */ private void NoInfluenceSupport_Toggled(object sender, RoutedEventArgs e) { Config.Global.IgnoreInfluenceSupport = this.NoInfluenceSupport.IsOn; diff --git a/Avalonia.EliteBGS/MinusFortyFiveConverter.cs b/Avalonia.EliteBGS/MinusFortyFiveConverter.cs index 33be47f..00c4e17 100644 --- a/Avalonia.EliteBGS/MinusFortyFiveConverter.cs +++ b/Avalonia.EliteBGS/MinusFortyFiveConverter.cs @@ -1,5 +1,6 @@ using System.Globalization; using System; +using Avalonia.Data.Converters; namespace EliteBGS; diff --git a/Avalonia.EliteBGS/Properties/Resources.Designer.cs b/Avalonia.EliteBGS/Properties/Resources.Designer.cs index 863ec2d..f3aa714 100644 --- a/Avalonia.EliteBGS/Properties/Resources.Designer.cs +++ b/Avalonia.EliteBGS/Properties/Resources.Designer.cs @@ -63,10 +63,10 @@ namespace EliteBGS.Properties { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Common.Icon EliteBGS { + internal static System.Drawing.Icon EliteBGS { get { object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); - return ((System.Drawing.Common.Icon)(obj)); + return ((System.Drawing.Icon)(obj)); } } } diff --git a/Avalonia.EliteBGS/Resources.Designer.cs b/Avalonia.EliteBGS/Resources.Designer.cs index bb9e8fc..c3ad79c 100644 --- a/Avalonia.EliteBGS/Resources.Designer.cs +++ b/Avalonia.EliteBGS/Resources.Designer.cs @@ -10,8 +10,9 @@ namespace EliteBGS { using System; - - + using System.Drawing; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +24,15 @@ namespace EliteBGS { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public 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 +46,7 @@ namespace EliteBGS { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,24 +60,24 @@ namespace EliteBGS { resourceCulture = value; } } - + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap logo_v5 { + public static Bitmap logo_v5 { get { object obj = ResourceManager.GetObject("logo_v5", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } - + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon Salus { + public static Icon Salus { get { object obj = ResourceManager.GetObject("Salus", resourceCulture); - return ((System.Drawing.Icon)(obj)); + return ((Icon)(obj)); } } }