rename project to EliteBGS

This commit is contained in:
Florian Stinglmayr 2021-11-10 21:24:39 +01:00
parent f159b29191
commit df4b5d6914
32 changed files with 62 additions and 69 deletions

View File

@ -1,7 +1,7 @@
<Application x:Class="NonaBGSApplication" <Application x:Class="EliteBGSApplication"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:NonaBGS" xmlns:local="clr-namespace:EliteBGS"
StartupUri="MainWindow.xaml"> StartupUri="MainWindow.xaml">
<Application.Resources> <Application.Resources>

View File

@ -1,11 +1,10 @@
using System.Windows; using System.Windows;
namespace NonaBGS namespace EliteBGS {
{
/// <summary> /// <summary>
/// Interaction logic for App.xaml /// Interaction logic for App.xaml
/// </summary> /// </summary>
public partial class NonaBGSApplication : Application public partial class EliteBGSApplication : Application
{ {
} }
} }

View File

@ -2,12 +2,12 @@
using System.Text; using System.Text;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class Cartographics : LogEntry { public class Cartographics : LogEntry {
public Cartographics(MultiSellExplorationDataEntry e, string current_system, string current_station) { public Cartographics(MultiSellExplorationDataEntry e, string current_system, string current_station) {
this.Entries.Add(e); Entries.Add(e);
this.System = current_system; System = current_system;
this.Station = current_station; Station = current_station;
} }
public int TotalSum { public int TotalSum {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Linq; using System.Linq;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class CombatZone : LogEntry, IComparable { public class CombatZone : LogEntry, IComparable {
public string Type { get; set; } public string Type { get; set; }
public string Grade { get; set; } public string Grade { get; set; }

View File

@ -1,4 +1,4 @@
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public interface IDiscordLogGenerator { public interface IDiscordLogGenerator {
string GenerateDiscordLog(Report report); string GenerateDiscordLog(Report report);
} }

View File

@ -2,7 +2,7 @@
using System.Globalization; using System.Globalization;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class FactionKillBonds : LogEntry { public class FactionKillBonds : LogEntry {
public int TotalSum { public int TotalSum {
get { get {

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class LogEntry : IComparable<LogEntry> { public class LogEntry : IComparable<LogEntry> {
private List<Entry> entries = new List<Entry>(); private List<Entry> entries = new List<Entry>();

View File

@ -1,7 +1,7 @@
using System.Text; using System.Text;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class MissionCompleted : LogEntry { public class MissionCompleted : LogEntry {
public MissionCompleted(MissionCompletedEntry e, string system, string station) { public MissionCompleted(MissionCompletedEntry e, string system, string station) {
this.Entries.Add(e); this.Entries.Add(e);

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class NonaDiscordLog : IDiscordLogGenerator { public class NonaDiscordLog : IDiscordLogGenerator {
private string FormatDate() { private string FormatDate() {
StringBuilder date = new StringBuilder(); StringBuilder date = new StringBuilder();

View File

@ -3,7 +3,7 @@ using System;
using System.Text; using System.Text;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class Objective : IComparable<Objective> { public class Objective : IComparable<Objective> {
private string system; private string system;
private string station; private string station;

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class Report { public class Report {
private List<Objective> objectives = new List<Objective>(); private List<Objective> objectives = new List<Objective>();
@ -126,7 +126,7 @@ namespace NonaBGS.BGS {
.OrderBy(x => x.Matches(entry)) .OrderBy(x => x.Matches(entry))
; ;
if (matches == null || matches.Count() <= 0) { if (matches == null || matches.Count() <= 0) {
continue; continue;
} }
/* Then select the one that matches the most. /* Then select the one that matches the most.
@ -144,12 +144,12 @@ namespace NonaBGS.BGS {
LogEntry existing = null; LogEntry existing = null;
existing = objective.LogEntries.Find(x => { existing = objective.LogEntries.Find(x => {
try { try {
return x.CompareTo(entry) == 0; return x.CompareTo(entry) == 0;
} catch (NotImplementedException) { } catch (NotImplementedException) {
return false; return false;
} }
}); });
if (collate && existing != null) { if (collate && existing != null) {
existing.Entries.Add(e); existing.Entries.Add(e);

View File

@ -2,7 +2,7 @@
using System.Linq; using System.Linq;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class SellCargo : LogEntry { public class SellCargo : LogEntry {
public override string ToString() { public override string ToString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();

View File

@ -1,7 +1,7 @@
using System.Linq; using System.Linq;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class SellMicroResources : LogEntry { public class SellMicroResources : LogEntry {
public int TotalSum { public int TotalSum {
get { get {

View File

@ -2,7 +2,7 @@
using System.Globalization; using System.Globalization;
using EDJournal; using EDJournal;
namespace NonaBGS.BGS { namespace EliteBGS.BGS {
public class Vouchers : LogEntry { public class Vouchers : LogEntry {
private string type = null; private string type = null;

View File

@ -1,9 +1,9 @@
<Window x:Class="NonaBGS.CombatZoneDialog" <Window x:Class="EliteBGS.CombatZoneDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:NonaBGS" xmlns:local="clr-namespace:EliteBGS"
mc:Ignorable="d" mc:Ignorable="d"
Title="Add Combat Zone Wins" Height="150" Width="370" Icon="NONA.ico" WindowStartupLocation="CenterOwner"> Title="Add Combat Zone Wins" Height="150" Width="370" Icon="NONA.ico" WindowStartupLocation="CenterOwner">
<Grid> <Grid>

View File

@ -13,7 +13,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace NonaBGS { namespace EliteBGS {
/// <summary> /// <summary>
/// Interaction logic for CombatZoneDialog.xaml /// Interaction logic for CombatZoneDialog.xaml
/// </summary> /// </summary>

View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace NonaBGS.EDDB { namespace EliteBGS.EDDB {
public class API { public class API {
private static readonly string EDDB_SYSTEMS_ARCHIVE = "https://eddb.io/archive/v6/systems_populated.json"; 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"; private static readonly string EDDB_STATIONS_ARCHIVE = "https://eddb.io/archive/v6/stations.json";

View File

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace NonaBGS.EDDB { namespace EliteBGS.EDDB {
public class PopulatedSystems { public class PopulatedSystems {
private string json_file = null; private string json_file = null;
private JArray root = null; private JArray root = null;

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.IO; using System.IO;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace NonaBGS.EDDB { namespace EliteBGS.EDDB {
public class Stations { public class Stations {
private JObject root = null; private JObject root = null;
private Dictionary<int, List<string>> by_system_id = null; private Dictionary<int, List<string>> by_system_id = null;

View File

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{73BFB315-C808-40E7-8D69-B651F875880C}</ProjectGuid> <ProjectGuid>{73BFB315-C808-40E7-8D69-B651F875880C}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>NonaBGS</RootNamespace> <RootNamespace>EliteBGS</RootNamespace>
<AssemblyName>NonaBGS</AssemblyName> <AssemblyName>EliteBGS</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -35,7 +35,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>NonaBGSApplication</StartupObject> <StartupObject>EliteBGSApplication</StartupObject>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>NONA.ico</ApplicationIcon> <ApplicationIcon>NONA.ico</ApplicationIcon>

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.31205.134 VisualStudioVersion = 16.0.31205.134
MinimumVisualStudioVersion = 10.0.40219.1 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution 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}.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.ActiveCfg = Release|Any CPU
{73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -4,8 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:abc="http://wpfcontrols.com/" xmlns:abc="http://wpfcontrols.com/"
xmlns:local="clr-namespace:NonaBGS" xmlns:local="clr-namespace:EliteBGS"
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: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" mc:Ignorable="d"
Title="Nova Navy BGS Helper" Height="520" Width="890" Icon="NONA.ico"> Title="Nova Navy BGS Helper" Height="520" Width="890" Icon="NONA.ico">
<Grid> <Grid>

View File

@ -4,15 +4,13 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using Ookii.Dialogs.Wpf; using Ookii.Dialogs.Wpf;
using EDJournal; using EDJournal;
using EliteBGS.BGS;
using EliteBGS.Util;
using EliteBGS.UI;
using EliteBGS.EDDB;
using NonaBGS.BGS; namespace EliteBGS {
using NonaBGS.Util;
using NonaBGS.EDDB;
using NonaBGS.UI;
namespace NonaBGS {
/// <summary> /// <summary>
/// Interaction logic for MainWindow.xaml /// Interaction logic for MainWindow.xaml
/// </summary> /// </summary>

View File

@ -1,9 +1,9 @@
<Window x:Class="NonaBGS.ProgressDialog" <Window x:Class="EliteBGS.ProgressDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:NonaBGS" xmlns:local="clr-namespace:EliteBGS"
mc:Ignorable="d" mc:Ignorable="d"
Title="Progress" Height="100" Width="450" Icon="NONA.ico"> Title="Progress" Height="100" Width="450" Icon="NONA.ico">
<Grid> <Grid>

View File

@ -1,7 +1,7 @@
using System.Windows; using System.Windows;
using NonaBGS.EDDB; using EliteBGS.EDDB;
namespace NonaBGS { namespace EliteBGS {
/// <summary> /// <summary>
/// Interaction logic for Window1.xaml /// Interaction logic for Window1.xaml
/// </summary> /// </summary>

View File

@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace NonaBGS.Properties { namespace EliteBGS.Properties {
using System; using System;
@ -39,7 +39,7 @@ namespace NonaBGS.Properties {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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; resourceMan = temp;
} }
return resourceMan; return resourceMan;

View File

@ -8,11 +8,11 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace NonaBGS.Properties { namespace EliteBGS.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [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 { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

4
Resources.Designer.cs generated
View File

@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace NonaBGS { namespace EliteBGS {
using System; using System;
@ -39,7 +39,7 @@ namespace NonaBGS {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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; resourceMan = temp;
} }
return resourceMan; return resourceMan;

View File

@ -1,8 +1,8 @@
using System.Collections; using System.Collections;
using AutoCompleteTextBox.Editors; using AutoCompleteTextBox.Editors;
using NonaBGS.EDDB; using EliteBGS.EDDB;
namespace NonaBGS.UI { namespace EliteBGS.UI {
public class StationSuggestionProvider : ISuggestionProvider { public class StationSuggestionProvider : ISuggestionProvider {
private int system_id = 0; private int system_id = 0;
private Stations stations = null; private Stations stations = null;

View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections; using System.Collections;
using AutoCompleteTextBox.Editors; using AutoCompleteTextBox.Editors;
using NonaBGS.EDDB; using EliteBGS.EDDB;
namespace NonaBGS.UI { namespace EliteBGS.UI {
public class SystemSuggestionProvider : ISuggestionProvider { public class SystemSuggestionProvider : ISuggestionProvider {
private PopulatedSystems systems = null; private PopulatedSystems systems = null;

View File

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace NonaBGS.Util { namespace EliteBGS.Util {
public class AppConfig : INotifyPropertyChanged { public class AppConfig : INotifyPropertyChanged {
private static readonly string default_journal_location = "%UserProfile%\\Saved Games\\Frontier Developments\\Elite Dangerous"; private static readonly string default_journal_location = "%UserProfile%\\Saved Games\\Frontier Developments\\Elite Dangerous";
private string journal_location = default_journal_location; private string journal_location = default_journal_location;

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.IO; using System.IO;
using Newtonsoft.Json; using Newtonsoft.Json;
using NonaBGS.BGS; using EliteBGS.BGS;
namespace NonaBGS.Util { namespace EliteBGS.Util {
public class Config { public class Config {
private string config_folder = null; private string config_folder = null;
private string objectives_file = null; private string objectives_file = null;
@ -31,7 +31,7 @@ namespace NonaBGS.Util {
public AppConfig Global => global_config; public AppConfig Global => global_config;
private void DetermineConfigFolder() { private void DetermineConfigFolder() {
string folder = Environment.ExpandEnvironmentVariables("%appdata%\\NonaBGS"); string folder = Environment.ExpandEnvironmentVariables("%appdata%\\EliteBGS");
if (!Directory.Exists(folder)) { if (!Directory.Exists(folder)) {
Directory.CreateDirectory(folder); Directory.CreateDirectory(folder);