From df4b5d69146e2b389a53ea13dff4b254cdcc6dc7 Mon Sep 17 00:00:00 2001 From: Florian Stinglmayr Date: Wed, 10 Nov 2021 21:24:39 +0100 Subject: [PATCH] rename project to EliteBGS --- App.xaml | 4 ++-- App.xaml.cs | 5 ++--- BGS/Cartographics.cs | 8 ++++---- BGS/CombatZone.cs | 2 +- BGS/DiscordLogGenerator.cs | 2 +- BGS/FactionKillBonds.cs | 2 +- BGS/LogEntry.cs | 2 +- BGS/MissionCompleted.cs | 2 +- BGS/NonaDiscordLog.cs | 2 +- BGS/Objective.cs | 2 +- BGS/Report.cs | 16 ++++++++-------- BGS/SellCargo.cs | 2 +- BGS/SellMicroResources.cs | 2 +- BGS/Vouchers.cs | 2 +- CombatZoneDialog.xaml | 4 ++-- CombatZoneDialog.xaml.cs | 2 +- EDDB/API.cs | 2 +- EDDB/PopulatedSystems.cs | 2 +- EDDB/Stations.cs | 2 +- nonabgs.csproj => EliteBGS.csproj | 6 +++--- nonabgs.sln => EliteBGS.sln | 6 +----- MainWindow.xaml | 4 ++-- MainWindow.xaml.cs | 12 +++++------- ProgressDialog.xaml | 4 ++-- ProgressDialog.xaml.cs | 4 ++-- Properties/Resources.Designer.cs | 4 ++-- Properties/Settings.Designer.cs | 4 ++-- Resources.Designer.cs | 4 ++-- UI/StationSuggestionProvider.cs | 4 ++-- UI/SystemSuggestionProvider.cs | 4 ++-- Util/AppConfig.cs | 4 ++-- Util/Config.cs | 6 +++--- 32 files changed, 62 insertions(+), 69 deletions(-) rename nonabgs.csproj => EliteBGS.csproj (98%) rename nonabgs.sln => EliteBGS.sln (68%) diff --git a/App.xaml b/App.xaml index 041c236..c1f96d0 100644 --- a/App.xaml +++ b/App.xaml @@ -1,7 +1,7 @@ - diff --git a/App.xaml.cs b/App.xaml.cs index 595adb8..34d7049 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -1,11 +1,10 @@ using System.Windows; -namespace NonaBGS -{ +namespace EliteBGS { /// /// Interaction logic for App.xaml /// - public partial class NonaBGSApplication : Application + public partial class EliteBGSApplication : Application { } } diff --git a/BGS/Cartographics.cs b/BGS/Cartographics.cs index 57f4fd6..8f2a5d1 100644 --- a/BGS/Cartographics.cs +++ b/BGS/Cartographics.cs @@ -2,12 +2,12 @@ using System.Text; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class Cartographics : LogEntry { public Cartographics(MultiSellExplorationDataEntry e, string current_system, string current_station) { - this.Entries.Add(e); - this.System = current_system; - this.Station = current_station; + Entries.Add(e); + System = current_system; + Station = current_station; } public int TotalSum { diff --git a/BGS/CombatZone.cs b/BGS/CombatZone.cs index b584931..36a9357 100644 --- a/BGS/CombatZone.cs +++ b/BGS/CombatZone.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class CombatZone : LogEntry, IComparable { public string Type { get; set; } public string Grade { get; set; } diff --git a/BGS/DiscordLogGenerator.cs b/BGS/DiscordLogGenerator.cs index ba620de..283513b 100644 --- a/BGS/DiscordLogGenerator.cs +++ b/BGS/DiscordLogGenerator.cs @@ -1,4 +1,4 @@ -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public interface IDiscordLogGenerator { string GenerateDiscordLog(Report report); } diff --git a/BGS/FactionKillBonds.cs b/BGS/FactionKillBonds.cs index b0a5a8e..d3e0f24 100644 --- a/BGS/FactionKillBonds.cs +++ b/BGS/FactionKillBonds.cs @@ -2,7 +2,7 @@ using System.Globalization; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class FactionKillBonds : LogEntry { public int TotalSum { get { diff --git a/BGS/LogEntry.cs b/BGS/LogEntry.cs index c4d040f..472b8c5 100644 --- a/BGS/LogEntry.cs +++ b/BGS/LogEntry.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class LogEntry : IComparable { private List entries = new List(); diff --git a/BGS/MissionCompleted.cs b/BGS/MissionCompleted.cs index bbbf20f..fb8afa7 100644 --- a/BGS/MissionCompleted.cs +++ b/BGS/MissionCompleted.cs @@ -1,7 +1,7 @@ using System.Text; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class MissionCompleted : LogEntry { public MissionCompleted(MissionCompletedEntry e, string system, string station) { this.Entries.Add(e); diff --git a/BGS/NonaDiscordLog.cs b/BGS/NonaDiscordLog.cs index e3b1688..07c4c31 100644 --- a/BGS/NonaDiscordLog.cs +++ b/BGS/NonaDiscordLog.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class NonaDiscordLog : IDiscordLogGenerator { private string FormatDate() { StringBuilder date = new StringBuilder(); diff --git a/BGS/Objective.cs b/BGS/Objective.cs index 5a35db4..7ffe90f 100644 --- a/BGS/Objective.cs +++ b/BGS/Objective.cs @@ -3,7 +3,7 @@ using System; using System.Text; using Newtonsoft.Json; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class Objective : IComparable { private string system; private string station; diff --git a/BGS/Report.cs b/BGS/Report.cs index 039d206..0025946 100644 --- a/BGS/Report.cs +++ b/BGS/Report.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class Report { private List objectives = new List(); @@ -126,7 +126,7 @@ namespace NonaBGS.BGS { .OrderBy(x => x.Matches(entry)) ; if (matches == null || matches.Count() <= 0) { - continue; + continue; } /* Then select the one that matches the most. @@ -144,12 +144,12 @@ namespace NonaBGS.BGS { LogEntry existing = null; existing = objective.LogEntries.Find(x => { - try { - return x.CompareTo(entry) == 0; - } catch (NotImplementedException) { - return false; - } - }); + try { + return x.CompareTo(entry) == 0; + } catch (NotImplementedException) { + return false; + } + }); if (collate && existing != null) { existing.Entries.Add(e); diff --git a/BGS/SellCargo.cs b/BGS/SellCargo.cs index 940f7cf..63c5615 100644 --- a/BGS/SellCargo.cs +++ b/BGS/SellCargo.cs @@ -2,7 +2,7 @@ using System.Linq; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class SellCargo : LogEntry { public override string ToString() { StringBuilder builder = new StringBuilder(); diff --git a/BGS/SellMicroResources.cs b/BGS/SellMicroResources.cs index e1a4ce1..ad298fe 100644 --- a/BGS/SellMicroResources.cs +++ b/BGS/SellMicroResources.cs @@ -1,7 +1,7 @@ using System.Linq; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class SellMicroResources : LogEntry { public int TotalSum { get { diff --git a/BGS/Vouchers.cs b/BGS/Vouchers.cs index 7926136..7a763bf 100644 --- a/BGS/Vouchers.cs +++ b/BGS/Vouchers.cs @@ -2,7 +2,7 @@ using System.Globalization; using EDJournal; -namespace NonaBGS.BGS { +namespace EliteBGS.BGS { public class Vouchers : LogEntry { private string type = null; diff --git a/CombatZoneDialog.xaml b/CombatZoneDialog.xaml index 8ca9f0e..8bc6c2e 100644 --- a/CombatZoneDialog.xaml +++ b/CombatZoneDialog.xaml @@ -1,9 +1,9 @@ - diff --git a/CombatZoneDialog.xaml.cs b/CombatZoneDialog.xaml.cs index 22c0527..c311dba 100644 --- a/CombatZoneDialog.xaml.cs +++ b/CombatZoneDialog.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace NonaBGS { +namespace EliteBGS { /// /// Interaction logic for CombatZoneDialog.xaml /// diff --git a/EDDB/API.cs b/EDDB/API.cs index 8acfd29..8fd01fd 100644 --- a/EDDB/API.cs +++ b/EDDB/API.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace NonaBGS.EDDB { +namespace EliteBGS.EDDB { public class API { private static readonly string EDDB_SYSTEMS_ARCHIVE = "https://eddb.io/archive/v6/systems_populated.json"; private static readonly string EDDB_STATIONS_ARCHIVE = "https://eddb.io/archive/v6/stations.json"; diff --git a/EDDB/PopulatedSystems.cs b/EDDB/PopulatedSystems.cs index af3aa94..0377306 100644 --- a/EDDB/PopulatedSystems.cs +++ b/EDDB/PopulatedSystems.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json.Linq; -namespace NonaBGS.EDDB { +namespace EliteBGS.EDDB { public class PopulatedSystems { private string json_file = null; private JArray root = null; diff --git a/EDDB/Stations.cs b/EDDB/Stations.cs index c4d5355..18eedc0 100644 --- a/EDDB/Stations.cs +++ b/EDDB/Stations.cs @@ -4,7 +4,7 @@ using System.Linq; using System.IO; using Newtonsoft.Json.Linq; -namespace NonaBGS.EDDB { +namespace EliteBGS.EDDB { public class Stations { private JObject root = null; private Dictionary> by_system_id = null; diff --git a/nonabgs.csproj b/EliteBGS.csproj similarity index 98% rename from nonabgs.csproj rename to EliteBGS.csproj index 50624f4..f052775 100644 --- a/nonabgs.csproj +++ b/EliteBGS.csproj @@ -6,8 +6,8 @@ AnyCPU {73BFB315-C808-40E7-8D69-B651F875880C} WinExe - NonaBGS - NonaBGS + EliteBGS + EliteBGS v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -35,7 +35,7 @@ 4 - NonaBGSApplication + EliteBGSApplication NONA.ico diff --git a/nonabgs.sln b/EliteBGS.sln similarity index 68% rename from nonabgs.sln rename to EliteBGS.sln index 3ebbd9f..e36ee56 100644 --- a/nonabgs.sln +++ b/EliteBGS.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31205.134 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nonabgs", "nonabgs.csproj", "{73BFB315-C808-40E7-8D69-B651F875880C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EliteBGS", "EliteBGS.csproj", "{73BFB315-C808-40E7-8D69-B651F875880C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,10 +15,6 @@ Global {73BFB315-C808-40E7-8D69-B651F875880C}.Debug|Any CPU.Build.0 = Debug|Any CPU {73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.ActiveCfg = Release|Any CPU {73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.Build.0 = Release|Any CPU - {C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C84BD6A6-55AF-48F0-A73E-51D1FAF65BC2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MainWindow.xaml b/MainWindow.xaml index 2498e63..14930f6 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -4,8 +4,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:abc="http://wpfcontrols.com/" - xmlns:local="clr-namespace:NonaBGS" - xmlns:BGS="clr-namespace:NonaBGS.BGS" xmlns:Util="clr-namespace:NonaBGS.Util" d:DataContext="{d:DesignInstance Type=Util:AppConfig}" x:Name="window" x:Class="NonaBGS.MainWindow" + xmlns:local="clr-namespace:EliteBGS" + xmlns:BGS="clr-namespace:EliteBGS.BGS" xmlns:Util="clr-namespace:EliteBGS.Util" d:DataContext="{d:DesignInstance Type=Util:AppConfig}" x:Name="window" x:Class="EliteBGS.MainWindow" mc:Ignorable="d" Title="Nova Navy BGS Helper" Height="520" Width="890" Icon="NONA.ico"> diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 89dcc83..aed7cfc 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -4,15 +4,13 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Input; using Ookii.Dialogs.Wpf; - using EDJournal; +using EliteBGS.BGS; +using EliteBGS.Util; +using EliteBGS.UI; +using EliteBGS.EDDB; -using NonaBGS.BGS; -using NonaBGS.Util; -using NonaBGS.EDDB; -using NonaBGS.UI; - -namespace NonaBGS { +namespace EliteBGS { /// /// Interaction logic for MainWindow.xaml /// diff --git a/ProgressDialog.xaml b/ProgressDialog.xaml index 94a8964..bbbfc3f 100644 --- a/ProgressDialog.xaml +++ b/ProgressDialog.xaml @@ -1,9 +1,9 @@ - diff --git a/ProgressDialog.xaml.cs b/ProgressDialog.xaml.cs index af63f55..868346c 100644 --- a/ProgressDialog.xaml.cs +++ b/ProgressDialog.xaml.cs @@ -1,7 +1,7 @@ using System.Windows; -using NonaBGS.EDDB; +using EliteBGS.EDDB; -namespace NonaBGS { +namespace EliteBGS { /// /// Interaction logic for Window1.xaml /// diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 9cadb94..9391b55 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace NonaBGS.Properties { +namespace EliteBGS.Properties { using System; @@ -39,7 +39,7 @@ namespace NonaBGS.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NonaBGS.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EliteBGS.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 0a4249a..6fc1285 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -8,11 +8,11 @@ // //------------------------------------------------------------------------------ -namespace NonaBGS.Properties { +namespace EliteBGS.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [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()))); diff --git a/Resources.Designer.cs b/Resources.Designer.cs index 5a8db54..f86b9ab 100644 --- a/Resources.Designer.cs +++ b/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace NonaBGS { +namespace EliteBGS { using System; @@ -39,7 +39,7 @@ namespace NonaBGS { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NonaBGS.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EliteBGS.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/UI/StationSuggestionProvider.cs b/UI/StationSuggestionProvider.cs index 857e13e..f58ac00 100644 --- a/UI/StationSuggestionProvider.cs +++ b/UI/StationSuggestionProvider.cs @@ -1,8 +1,8 @@ using System.Collections; using AutoCompleteTextBox.Editors; -using NonaBGS.EDDB; +using EliteBGS.EDDB; -namespace NonaBGS.UI { +namespace EliteBGS.UI { public class StationSuggestionProvider : ISuggestionProvider { private int system_id = 0; private Stations stations = null; diff --git a/UI/SystemSuggestionProvider.cs b/UI/SystemSuggestionProvider.cs index b60b983..2e4e746 100644 --- a/UI/SystemSuggestionProvider.cs +++ b/UI/SystemSuggestionProvider.cs @@ -1,9 +1,9 @@ using System; using System.Collections; using AutoCompleteTextBox.Editors; -using NonaBGS.EDDB; +using EliteBGS.EDDB; -namespace NonaBGS.UI { +namespace EliteBGS.UI { public class SystemSuggestionProvider : ISuggestionProvider { private PopulatedSystems systems = null; diff --git a/Util/AppConfig.cs b/Util/AppConfig.cs index 0d7264e..99a8bf6 100644 --- a/Util/AppConfig.cs +++ b/Util/AppConfig.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace NonaBGS.Util { +namespace EliteBGS.Util { public class AppConfig : INotifyPropertyChanged { private static readonly string default_journal_location = "%UserProfile%\\Saved Games\\Frontier Developments\\Elite Dangerous"; private string journal_location = default_journal_location; @@ -17,7 +17,7 @@ namespace NonaBGS.Util { } public string JournalLocation { - get { + get { if (journal_location == null) { return DefaultJournalLocation; } diff --git a/Util/Config.cs b/Util/Config.cs index 8fdeaa8..575fbeb 100644 --- a/Util/Config.cs +++ b/Util/Config.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Text; using System.IO; using Newtonsoft.Json; -using NonaBGS.BGS; +using EliteBGS.BGS; -namespace NonaBGS.Util { +namespace EliteBGS.Util { public class Config { private string config_folder = null; private string objectives_file = null; @@ -31,7 +31,7 @@ namespace NonaBGS.Util { public AppConfig Global => global_config; private void DetermineConfigFolder() { - string folder = Environment.ExpandEnvironmentVariables("%appdata%\\NonaBGS"); + string folder = Environment.ExpandEnvironmentVariables("%appdata%\\EliteBGS"); if (!Directory.Exists(folder)) { Directory.CreateDirectory(folder);