diff --git a/APRA.ico b/APRA.ico deleted file mode 100644 index 0b53931..0000000 Binary files a/APRA.ico and /dev/null differ diff --git a/CombatZoneDialog.xaml b/CombatZoneDialog.xaml index b14a2a0..c96769c 100644 --- a/CombatZoneDialog.xaml +++ b/CombatZoneDialog.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Add Combat Zone Wins" Height="150" Width="370" Icon="apra.png" WindowStartupLocation="CenterOwner"> + Title="Add Combat Zone Wins" Height="150" Width="370" Icon="EliteBGS.ico" WindowStartupLocation="CenterOwner"> diff --git a/EliteBGS.csproj b/EliteBGS.csproj index a0fb405..2eb4d3d 100644 --- a/EliteBGS.csproj +++ b/EliteBGS.csproj @@ -14,21 +14,6 @@ 4 true true - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true AnyCPU @@ -53,7 +38,7 @@ EliteBGSApplication - APRA.ico + EliteBGS.ico @@ -127,11 +112,6 @@ LoadEntriesWindow.xaml - - True - True - Resources.resx - True True @@ -188,6 +168,11 @@ Code + + True + True + Resources.resx + True Settings.settings @@ -196,11 +181,9 @@ ResXFileCodeGenerator Resources.Designer.cs - Designer ResXFileCodeGenerator - Designer Resources.Designer.cs @@ -216,9 +199,6 @@ - - - Always @@ -253,16 +233,10 @@ - - False - Microsoft .NET Framework 4.7.2 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - + + + + \ No newline at end of file diff --git a/EliteBGS.ico b/EliteBGS.ico new file mode 100644 index 0000000..f2b0958 Binary files /dev/null and b/EliteBGS.ico differ diff --git a/LoadEntriesWindow.xaml b/LoadEntriesWindow.xaml index f029c6e..545c6f5 100644 --- a/LoadEntriesWindow.xaml +++ b/LoadEntriesWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Load Entries" Height="450" Width="600" Icon="apra.png"> + Title="Load Entries" Height="450" Width="600"> diff --git a/MainWindow.xaml b/MainWindow.xaml index acfaf95..e31461f 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -7,7 +7,7 @@ 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="Elite: Dangerous BGS Helper" Height="520" Width="890" Icon="apra.png" Closing="window_Closing"> + Title="Elite: Dangerous BGS Helper" Height="520" Width="890" Icon="EliteBGS.ico" Closing="window_Closing"> diff --git a/ProgressDialog.xaml b/ProgressDialog.xaml index d56fc7d..c7cc8a2 100644 --- a/ProgressDialog.xaml +++ b/ProgressDialog.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Progress" Height="100" Width="450" Icon="apra.png"> + Title="Progress" Height="100" Width="450" Icon="EliteBGS.ico"> diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 9391b55..0b1a21e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ namespace EliteBGS.Properties { resourceCulture = value; } } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon EliteBGS { + get { + object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 1af7de1..7119902 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -117,4 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Resources.Designer.cs b/Resources.Designer.cs index f866406..a0a6d9d 100644 --- a/Resources.Designer.cs +++ b/Resources.Designer.cs @@ -59,5 +59,15 @@ namespace EliteBGS { resourceCulture = value; } } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon EliteBGS { + get { + object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/Resources.resx b/Resources.resx index 1af7de1..ac522fb 100644 --- a/Resources.resx +++ b/Resources.resx @@ -117,4 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Resources/APRA.ico b/Resources/APRA.ico deleted file mode 100644 index 0b53931..0000000 Binary files a/Resources/APRA.ico and /dev/null differ diff --git a/Resources/EliteBGS.ico b/Resources/EliteBGS.ico new file mode 100644 index 0000000..5d06b9f Binary files /dev/null and b/Resources/EliteBGS.ico differ diff --git a/apra.png b/apra.png deleted file mode 100644 index 290ebbb..0000000 Binary files a/apra.png and /dev/null differ