Added Spnsh CSV refuel system notification to galaxy plotter

Adjusted columns in Exobiology Overlay
WarmedxMints · Jan 7, 2025 · 4ae5cf7 · 4ae5cf7
1 parent 117719b
commit 4ae5cf7
Show file tree

Hide file tree

Showing 29 changed files with 464 additions and 120 deletions.
diff --git a/ODExplorer/App.xaml.cs b/ODExplorer/App.xaml.cs
@@ -21,7 +21,7 @@ public partial class App : Application
     {
         public static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public static readonly Version AppVersion = new(2, 0, 6);
+        public static readonly Version AppVersion = new(2, 0, 7);
 #if INSTALL
         public readonly static string BaseDirectory = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "OD Explorer");
 #else

diff --git a/ODExplorer/Controls/CartoDetailsControls/CartodataSystemList.xaml b/ODExplorer/Controls/CartoDetailsControls/CartodataSystemList.xaml
@@ -181,6 +181,13 @@
                           HeadersVisibility="Column"
                           BorderThickness="0"
                           Style="{DynamicResource BaseDataGridStyle}">
+                    <DataGrid.RowStyle>
+                        <Style TargetType="{x:Type DataGridRow}"
+                               BasedOn="{StaticResource CommanderRowStyle}">
+                            <Setter Property="ToolTip"
+                                    Value="{Binding ToolTip}" />
+                        </Style>
+                    </DataGrid.RowStyle>
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding BodyID}"
                                             SortMemberPath="BodyID"

diff --git a/ODExplorer/Controls/DisplaySettingsControl/MiscNotificationSettings.xaml b/ODExplorer/Controls/DisplaySettingsControl/MiscNotificationSettings.xaml
@@ -17,7 +17,8 @@
               BorderThickness="0.5">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition />
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
             <CheckBox Style="{DynamicResource CheckBoxStyle}"
                       IsThreeState="False"
@@ -26,7 +27,16 @@
                       Margin="10,0"
                       VerticalAlignment="Center"
                       IsChecked="{Binding NotifyOptions, Converter={StaticResource EnumFlagConverter}, ConverterParameter={x:Static models:NotificationOptions.CopyToClipboard}}"
-                      Content="String copied to clipboard" />           
+                      Content="String copied to clipboard" />
+
+            <CheckBox Style="{DynamicResource CheckBoxStyle}"
+                      IsThreeState="False"
+                      Grid.Column="1"
+                      HorizontalAlignment="Left"
+                      Margin="10,0"
+                      VerticalAlignment="Center"
+                      IsChecked="{Binding NotifyOptions, Converter={StaticResource EnumFlagConverter}, ConverterParameter={x:Static models:NotificationOptions.SpanshCSV}}"
+                      Content="Spansh CSV Parser" />
         </Grid>
     </GroupBox>
 </UserControl>
diff --git a/ODExplorer/Controls/PopOutControls/ExobiologyOverlay.xaml b/ODExplorer/Controls/PopOutControls/ExobiologyOverlay.xaml
@@ -43,7 +43,10 @@
                       BorderThickness="0"
                       IsHitTestVisible="True"
                       IsReadOnly="True"
+                      CanUserResizeColumns="True"
                       VerticalAlignment="Top"
+                      Loaded="DataGrid_Loaded"
+                      Unloaded="DataGrid_Unloaded"
                       EnableRowVirtualization="False"
                       VerticalScrollBarVisibility="Auto"
                       HorizontalScrollBarVisibility="Disabled"
@@ -54,11 +57,9 @@
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding GenusEnglish, Mode=OneWay}"
                                         Header="Genus"
-                                        Width="1*"
-                                        MinWidth="120" />
+                                        Width="SizeToCells" />
                     <DataGridTemplateColumn Header="Species"
-                                            MinWidth="120"
-                                            Width="1*">
+                                            Width="SizeToCells">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
@@ -84,8 +85,7 @@
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
 
-                    <DataGridTemplateColumn MinWidth="120"
-                                            Width="2*"
+                    <DataGridTemplateColumn Width="*"
                                             Header="Variant">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
@@ -95,10 +95,10 @@
                     </DataGridTemplateColumn>
                     <DataGridTextColumn Binding="{Binding ColonyRange, Mode=OneWay}"
                                         Header="Range"
-                                        Width="80"
+                                        MinWidth="60"
                                         ElementStyle="{DynamicResource DataGridElementRightMargin}"
                                         HeaderStyle="{DynamicResource DataGridHeaderCenter}" />
-                    <DataGridTemplateColumn>
+                    <DataGridTemplateColumn MinWidth="60">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <controls:OrganicScanStageControl Size="14"
@@ -112,7 +112,7 @@
                                         Header="Value"
                                         HeaderStyle="{DynamicResource DataGridHeaderCenter}"
                                         ElementStyle="{DynamicResource DataGridElementRightMargin}"
-                                        Width="100" />
+                                        MinWidth="60" />
                 </DataGrid.Columns>
             </DataGrid>
         </Grid>
@@ -128,6 +128,9 @@
                   IsReadOnly="True"
                   IsHitTestVisible="True"
                   VerticalAlignment="Bottom"
+                  CanUserResizeColumns="True"
+                  Loaded="DataGrid_Loaded"
+                  Unloaded="DataGrid_Unloaded"
                   RowStyle="{DynamicResource ExoBioBodyOverlayRowStyle}"
                   HorizontalScrollBarVisibility="Disabled"
                   CellStyle="{DynamicResource ExoBodyGrid}"
@@ -137,9 +140,9 @@
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Body"
                                     Binding="{Binding Name, Mode=OneWay}"
-                                    MinWidth="80"
-                                    Width="*" />
-                <DataGridTemplateColumn  MinWidth="65">
+                                    MinWidth="40"
+                                    Width="SizeToCells" />
+                <DataGridTemplateColumn  MinWidth="40">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal"
@@ -161,16 +164,15 @@
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Binding="{Binding PlanetClassDescription, Mode=OneWay}"
                                     ElementStyle="{DynamicResource DataGridElementCenter}"
-                                    MinWidth="200"
-                                    Width="250" />
+                                    Width="*" />
                 <DataGridTextColumn Binding="{Binding OrganicValues, Mode=OneWay}"
                                     MinWidth="150"
                                     Header="Body Value"
                                     HeaderStyle="{DynamicResource DataGridHeaderCenter}"
                                     ElementStyle="{DynamicResource DataGridElementCenter}" />
                 <DataGridTextColumn Binding="{Binding BiologicalSignals, Mode=OneWay}"
                                     ElementStyle="{DynamicResource DataGridElementCenter}"
-                                    Width="30">
+                                    MinWidth="30">
                     <DataGridTextColumn.Header>
                         <Button Style="{StaticResource ColourImageBtn}"
                                 ToolTip="Signal Count"
@@ -194,7 +196,8 @@
                                     HeaderStyle="{DynamicResource DataGridHeaderCenter}"
                                     Binding="{Binding DistanceFromArrivalLs, Mode=OneWay}"
                                     ElementStyle="{DynamicResource DataGridElementRightMargin}"
-                                    Width="120" />
+                                    MinWidth="120"
+                                    Width="SizeToCells"/>
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

diff --git a/ODExplorer/Controls/PopOutControls/ExobiologyOverlay.xaml.cs b/ODExplorer/Controls/PopOutControls/ExobiologyOverlay.xaml.cs
@@ -92,5 +92,31 @@ private void BodiesView_CurrentChanged(object? sender, EventArgs e)
                 OrganicGrid.ItemsSource = body.OrganicScanItems;
             }
         }
+
+        private void DataGrid_Loaded(object sender, RoutedEventArgs e)
+        {
+
+            if (sender is DataGrid dataGrid)
+                dataGrid.ItemContainerGenerator.StatusChanged += (container, e) => ItemContainerGenerator_StatusChanged(container, dataGrid);
+        }
+
+        private void DataGrid_Unloaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is DataGrid dataGrid)
+                dataGrid.ItemContainerGenerator.StatusChanged -= (container, e) => ItemContainerGenerator_StatusChanged(container, dataGrid);
+        }
+
+        private void ItemContainerGenerator_StatusChanged(object? sender, DataGrid dataGrid)
+        {
+            if (sender is ItemContainerGenerator icg && icg.Status == System.Windows.Controls.Primitives.GeneratorStatus.ContainersGenerated)
+            {
+                foreach (DataGridColumn col in dataGrid.Columns)
+                {
+                    DataGridLength width = col.Width;
+                    col.Width = 0;
+                    col.Width = width;
+                }
+            }
+        }
     }
 }
diff --git a/ODExplorer/Controls/RouteControls/AdditionalControls/OrganicScanStagoControl.xaml b/ODExplorer/Controls/RouteControls/AdditionalControls/OrganicScanStagoControl.xaml
@@ -37,8 +37,7 @@
         <StackPanel Orientation="Horizontal"
                     Visibility="{Binding ScanStageEnum, Converter={StaticResource converter}, ConverterParameter={x:Static ejr:OrganicScanStage.Log}}"
                     VerticalAlignment="Center">
-            <Border Margin="5,0"
-                    VerticalAlignment="Center"
+            <Border VerticalAlignment="Center"
                     Width="{Binding ElementName=Root, Path=Size}"
                     Height="{Binding ElementName=Root, Path=Size}"
                     Background="Transparent"
@@ -63,8 +62,7 @@
                         Height="{Binding ElementName=Root, Path=Size, Converter={StaticResource MaxHeightConverter}, ConverterParameter={StaticResource adjMaxHeightRatio}}"
                         Background="{Binding ElementName=Root, Path=Foreground}" />
             </Border>
-            <Border Margin="5,0"
-                    VerticalAlignment="Center"
+            <Border VerticalAlignment="Center"
                     Width="{Binding ElementName=Root, Path=Size}"
                     Height="{Binding ElementName=Root, Path=Size}"
                     Background="Transparent"

diff --git a/ODExplorer/Controls/RouteControls/AdditionalControls/PlanetExtendedDetailsView.xaml b/ODExplorer/Controls/RouteControls/AdditionalControls/PlanetExtendedDetailsView.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:ODExplorer.Controls"
              xmlns:viewModel="clr-namespace:ODExplorer.ViewModels.ModelVMs"
              mc:Ignorable="d"
+             FontFamily="{StaticResource Eurostile}"
              Foreground="{DynamicResource PrimaryForeground}"
              d:DataContext="{d:DesignInstance Type=viewModel:SystemBodyViewModel}"
              d:DesignHeight="450"

diff --git a/ODExplorer/Controls/RouteControls/AdditionalControls/PlanetToolTipControl.xaml b/ODExplorer/Controls/RouteControls/AdditionalControls/PlanetToolTipControl.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:ODExplorer.Controls"
              xmlns:viewModel="clr-namespace:ODExplorer.ViewModels.ModelVMs"
              mc:Ignorable="d"
+             FontFamily="{StaticResource Eurostile}"
              Foreground="{DynamicResource PrimaryForeground}"
              d:DataContext="{d:DesignInstance Type=viewModel:SystemBodyViewModel}"
              d:DesignHeight="450"

diff --git a/ODExplorer/Controls/RouteControls/AdditionalControls/StarExtendedDetails.xaml b/ODExplorer/Controls/RouteControls/AdditionalControls/StarExtendedDetails.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:ODExplorer.Controls"
              xmlns:viewModel="clr-namespace:ODExplorer.ViewModels.ModelVMs"
              mc:Ignorable="d"
+             FontFamily="{StaticResource Eurostile}"
              Foreground="{DynamicResource PrimaryForeground}"
              d:DataContext="{d:DesignInstance Type=viewModel:SystemBodyViewModel}"
              d:DesignHeight="450"

diff --git a/ODExplorer/Controls/RouteControls/AdditionalControls/StarToolTipControl.xaml b/ODExplorer/Controls/RouteControls/AdditionalControls/StarToolTipControl.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:ODExplorer.Controls"
              xmlns:viewModel="clr-namespace:ODExplorer.ViewModels.ModelVMs"
              mc:Ignorable="d"
+             FontFamily="{StaticResource Eurostile}"
              Foreground="{DynamicResource PrimaryForeground}"
              d:DataContext="{d:DesignInstance Type=viewModel:SystemBodyViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">

diff --git a/ODExplorer/Controls/SettingsControls/LinksControl.xaml b/ODExplorer/Controls/SettingsControls/LinksControl.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:ODExplorer.Controls"
              mc:Ignorable="d"
+             UseLayoutRounding="True"
              d:DesignHeight="450"
              d:DesignWidth="800">
     <GroupBox Header="Links &amp; Credits"
@@ -117,7 +118,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/eucalyp"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            Eucalyp on wwww.flaticon.com
+                            Eucalyp on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -136,7 +137,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/ayub-irawan"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            Ayub Irawan on wwww.flaticon.com
+                            Ayub Irawan on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -155,7 +156,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/kiranshastry"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            Kiranshastry on wwww.flaticon.com
+                            Kiranshastry on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -174,7 +175,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/turkkub"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            turkkub on wwww.flaticon.com
+                            turkkub on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -193,7 +194,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/nikita-golubev"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            nikita-golubev on wwww.flaticon.com
+                            nikita-golubev on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -212,7 +213,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/srip"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            srip on wwww.flaticon.com
+                            srip on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -231,7 +232,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/kornkun"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            kornkun on wwww.flaticon.com
+                            kornkun on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -250,7 +251,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/good-ware"
                                        RequestNavigate="Hyperlink_RequestNavigate"
                                        Foreground="{DynamicResource PrimaryForeground}">
-                            Good Ware on wwww.flaticon.com
+                            Good Ware on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -269,7 +270,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/khoirul-huda"
                                             RequestNavigate="Hyperlink_RequestNavigate"
                                             Foreground="{DynamicResource PrimaryForeground}">
-                            Khoirul Huda on wwww.flaticon.com
+                            Khoirul Huda on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -294,7 +295,7 @@
                         <Hyperlink NavigateUri="https://www.flaticon.com/authors/justicon"
                                    RequestNavigate="Hyperlink_RequestNavigate"
                                    Foreground="{DynamicResource PrimaryForeground}">
-                            justicon on wwww.flaticon.com
+                            justicon on www.flaticon.com
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
@@ -537,6 +538,21 @@
                      </Hyperlink>
                     </TextBlock>
                 </StackPanel>
+
+                <StackPanel Orientation="Horizontal">
+                    <Image Source="/Resources/NotificationIcons/refuel.png"
+                           Height="18"
+                           Width="18"
+                           RenderOptions.BitmapScalingMode="Fant"
+                           Margin="10,5,20,0" />
+                    <TextBlock VerticalAlignment="Center">
+                        <Hyperlink NavigateUri="https://www.flaticon.com/authors/handicon"
+                            RequestNavigate="Hyperlink_RequestNavigate"
+                            Foreground="{DynamicResource PrimaryForeground}">
+                            Hanicon on www.flaticon.com
+                        </Hyperlink>
+                    </TextBlock>
+                </StackPanel>
 
                 <TextBlock VerticalAlignment="Center">
                     <Hyperlink NavigateUri="https://github.com/klightspeed/EliteDangerousRegionMap"
@@ -545,6 +561,7 @@
                         klightspeed Region Map
                     </Hyperlink>
                 </TextBlock>
+
             </StackPanel>
         </Grid>
     </GroupBox>

diff --git a/ODExplorer/Database/OdExplorerDatabaseProvider.cs b/ODExplorer/Database/OdExplorerDatabaseProvider.cs
@@ -512,7 +512,7 @@ internal async Task DeleteCommander(int commanderID)
 
             foreach (var system in ignoredSystems)
             {
-                if(system is null)
+                if (system is null)
                     continue;
 
                 system.Commanders.Remove(cmdr);

diff --git a/ODExplorer/Models/NotificationSettings.cs b/ODExplorer/Models/NotificationSettings.cs
@@ -22,7 +22,8 @@ public enum NotificationOptions
         CopyToClipboard = 1 << 5,
         EDSMValuableBody = 1 << 6,
         NewBioSpecies = 1 << 7,       
-        All = ~(-1 << 8)
+        SpanshCSV = 1 << 8,       
+        All = ~(-1 << 9)
     }
 
     public sealed class NotificationSettings