Compare commits

..

No commits in common. "af16659f97f802251ed77ee7c527342a1ad92465" and "08d54cd13cc8e1dad7ebe6cd170c45ecd9d34630" have entirely different histories.

6 changed files with 8 additions and 18 deletions

View File

@ -51,10 +51,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.0" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>
<ItemGroup>

View File

@ -4,8 +4,6 @@ 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;

View File

@ -11,8 +11,6 @@ using System.Globalization;
using System.Diagnostics;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Input;
namespace EliteBGS;
@ -486,7 +484,7 @@ public partial class MainWindow : Window {
RefreshView();
}
private void Profit_KeyUp(object sender, KeyEventArgs e) {
private void Profit_KeyUp(object sender, System.Windows.Input.KeyEventArgs e) {
if (e.Key == Key.Enter) {
RefreshView();
}
@ -549,15 +547,13 @@ public partial class MainWindow : Window {
UpdateTheme();
}
/*
private void URL_RequestNavigate(object sender, RequestNavigateEventArgs e) {
private void URL_RequestNavigate(object sender, System.Windows.Navigation.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;

View File

@ -1,6 +1,5 @@
using System.Globalization;
using System;
using Avalonia.Data.Converters;
namespace EliteBGS;

View File

@ -63,10 +63,10 @@ namespace EliteBGS.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary>
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));
}
}
}

View File

@ -9,14 +9,14 @@
//------------------------------------------------------------------------------
namespace EliteBGS.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;