From c9e87958ae595917840f86adbb91482da7020832 Mon Sep 17 00:00:00 2001 From: Florian Stinglmayr Date: Mon, 15 May 2023 18:38:03 +0200 Subject: [PATCH] implement ignore fleet carrier faction into UI --- EliteBGS/MainWindow.xaml | 6 +++--- EliteBGS/MainWindow.xaml.cs | 6 ++++++ EliteBGS/Util/AppConfig.cs | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml index ca2623c..a3116ed 100644 --- a/EliteBGS/MainWindow.xaml +++ b/EliteBGS/MainWindow.xaml @@ -213,9 +213,9 @@ - - - + + + diff --git a/EliteBGS/MainWindow.xaml.cs b/EliteBGS/MainWindow.xaml.cs index 52af2db..40c8e68 100644 --- a/EliteBGS/MainWindow.xaml.cs +++ b/EliteBGS/MainWindow.xaml.cs @@ -60,6 +60,7 @@ public partial class MainWindow : MetroWindow { this.NoInfluenceSupport.IsOn = Config.Global.IgnoreInfluenceSupport; this.NoMarketBuy.IsOn = Config.Global.IgnoreMarketBuy; + this.NoFleetCarrier.IsOn = Config.Global.IgnoreFleetCarrier; // Apply theme try { @@ -173,6 +174,7 @@ public partial class MainWindow : MetroWindow { options.IgnoreInfluenceSupport = Config.Global.IgnoreInfluenceSupport; options.IgnoreMarketBuy = Config.Global.IgnoreMarketBuy; + options.IgnoreFleetCarrierFaction = Config.Global.IgnoreFleetCarrier; List transactions = parser.Parse(entries, options); @@ -536,4 +538,8 @@ public partial class MainWindow : MetroWindow { private void NoMarketBuy_Toggled(object sender, RoutedEventArgs e) { Config.Global.IgnoreMarketBuy = this.NoMarketBuy.IsOn; } + + private void NoFleetCarrier_Toggled(object sender, RoutedEventArgs e) { + Config.Global.IgnoreFleetCarrier = this.NoFleetCarrier.IsOn; + } } diff --git a/EliteBGS/Util/AppConfig.cs b/EliteBGS/Util/AppConfig.cs index 80dd9a7..ca52db3 100644 --- a/EliteBGS/Util/AppConfig.cs +++ b/EliteBGS/Util/AppConfig.cs @@ -58,6 +58,11 @@ namespace EliteBGS.Util { /// public bool IgnoreMarketBuy { get; set; } = false; + /// + /// Whether to ignore fleet carrier stuff when parsing. + /// + public bool IgnoreFleetCarrier { get; set; } = true; + [JsonIgnore] public string FullTheme { get { return Theme + "." + Colour; }