manual merge of : #105 from https://github.com/EVEJay/SMTAdapt

Slazanger · Feb 1, 2023 · d6db511 · d6db511
1 parent 2eb096b
commit d6db511
Show file tree

Hide file tree

Showing 14 changed files with 897 additions and 15 deletions.
diff --git a/EVEData/EveManager.cs b/EVEData/EveManager.cs
@@ -1314,7 +1314,7 @@ public void CreateFromScratch()
 
                     systemElementMap[s.Name] = sre;
 
-                    SvgNet.Elements.SvgTextElement srtText = new SvgNet.Elements.SvgTextElement(s.Name, (float)s.LayoutX, (float)s.LayoutY);
+                    SvgNet.Elements.SvgTextElement srtText = new(s.Name, (float)s.LayoutX, (float)s.LayoutY);
 
                     svgRootElement.AddChild(sre);
                     svgRootElement.AddChild(srtText);
@@ -2100,7 +2100,7 @@ public void UpdateIDsForMapRegion(string name)
                 }
             }
 
-            ResolveAllianceIDs(IDToResolve);
+            _ = ResolveAllianceIDs ( IDToResolve );
         }
 
         /// <summary>

diff --git a/SMT/App.config b/SMT/App.config
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <section name="SMT.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
@@ -63,4 +68,20 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <userSettings>
+    <SMT.Properties.Settings>
+      <setting name="overlay_window_top" serializeAs="String">
+        <value>100</value>
+      </setting>
+      <setting name="overlay_window_left" serializeAs="String">
+        <value>100</value>
+      </setting>
+      <setting name="overlay_window_width" serializeAs="String">
+        <value>600</value>
+      </setting>
+      <setting name="overlay_window_height" serializeAs="String">
+        <value>600</value>
+      </setting>
+    </SMT.Properties.Settings>
+  </userSettings>
 </configuration>
diff --git a/SMT/App.xaml b/SMT/App.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Application  StartupUri="MainWindow.xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<Application  StartupUri="MainWindow.xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" ShutdownMode="OnMainWindowClose">
     <Application.Resources>
 
         <ResourceDictionary>

diff --git a/SMT/Images/overlay_close.png b/SMT/Images/overlay_close.png
diff --git a/SMT/Images/overlay_move.png b/SMT/Images/overlay_move.png
diff --git a/SMT/MainWindow.xaml b/SMT/MainWindow.xaml
@@ -54,6 +54,7 @@
                 <MenuItem Header="File">
                     <MenuItem Header="Characters" Click="Characters_MenuItem_Click" />
                     <MenuItem Header="Preferences" Click="Preferences_MenuItem_Click" />
+                    <MenuItem Header="Overlay" Click="OverlayWindow_MenuItem_Click" />
                     <MenuItem Header="Exit" Click="Exit_MenuItem_Click" />
                 </MenuItem>
 

diff --git a/SMT/MainWindow.xaml.cs b/SMT/MainWindow.xaml.cs
@@ -26,9 +26,10 @@ namespace SMT
     /// </summary>
     public partial class MainWindow : Window
     {
-        public const string SMT_VERSION = "SMT_115";
+        public const string SMT_VERSION = "SMT_116";
         public static MainWindow AppWindow;
         private LogonWindow logonBrowserWindow;
+        private Overlay overlayWindow;
 
         private MediaPlayer mediaPlayer;
         private PreferencesWindow preferencesWindow;
@@ -43,6 +44,8 @@ public partial class MainWindow : Window
 
         public JumpRoute CapitalRoute { get; set; }
 
+        public EventHandler OnSelectedCharChangedEventHandler;
+
         /// <summary>
         /// Main Window
         /// </summary>
@@ -738,7 +741,9 @@ private async void CheckGitHubVersion()
 
         #region Characters
 
-        public EVEData.LocalCharacter ActiveCharacter { get; set; }
+        // Property now automatically fires an event when the active character changes.
+        private EVEData.LocalCharacter activeCharacter;
+        public EVEData.LocalCharacter ActiveCharacter { get => activeCharacter; set { activeCharacter = value; OnSelectedCharChangedEventHandler?.Invoke ( this, EventArgs.Empty ); } }
 
         /// <summary>
         ///  Add Character Button Clicked
@@ -1941,6 +1946,24 @@ private void btnUnseenFits_Click(object sender, RoutedEventArgs e)
             string KillURL = "https://zkillboard.com/character/93280351/losses/";
             System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(KillURL) { UseShellExecute = true });
         }
+
+        private void OverlayWindow_MenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            if ( overlayWindow != null )
+            {
+                return;
+            }
+
+            overlayWindow = new Overlay(this);
+            overlayWindow.Closing += OnOverlayWindowClosing; 
+            overlayWindow.Show();            
+        }
+
+        public void OnOverlayWindowClosing (object sender, CancelEventArgs e)
+        {
+            overlayWindow = null;
+        }
+
     }
 
     /// <summary>

diff --git a/SMT/MapConfig.cs b/SMT/MapConfig.cs
@@ -84,6 +84,12 @@ public class MapConfig : INotifyPropertyChanged
 
         private int m_MaxESIOverlayValue;
 
+        // Overlay settings
+        private int m_overlayRange = 5;
+        private float m_intelFreshTime = 30;
+        private float m_intelStaleTime = 120;
+        private float m_intelHistoricTime = 600;
+
         public MapConfig()
         {
             SetDefaults();
@@ -850,6 +856,66 @@ public int UpcomingSovMinutes
             }
         }
 
+        [Category("Overlay")]
+        [DisplayName("Overlay System Jump Range")]
+        public int OverlayRange
+        {
+            get {
+                return m_overlayRange;
+            }
+            set {
+
+                m_overlayRange = value > 0 ? value : 1;
+
+                OnPropertyChanged("OverlayRange");
+            }
+        }
+
+        [Category("Overlay")]
+        [DisplayName("Overlay Intel Fresh Time")]
+        public float IntelFreshTime
+        {
+            get {
+                return m_intelFreshTime;
+            }
+            set {
+
+                m_intelFreshTime = value > 0 ? value : 1;
+
+                OnPropertyChanged("IntelFreshTime");
+            }
+        }
+
+        [Category("Overlay")]
+        [DisplayName("Overlay Intel Stale Time")]
+        public float IntelStaleTime
+        {
+            get {
+                return m_intelStaleTime;
+            }
+            set {
+
+                m_intelStaleTime = value > 0 ? value : 1;
+
+                OnPropertyChanged("IntelStaleTime");
+            }
+        }
+
+        [Category("Overlay")]
+        [DisplayName("Overlay Intel Fresh Time")]
+        public float IntelHistoricTime
+        {
+            get {
+                return m_intelHistoricTime;
+            }
+            set {
+
+                m_intelHistoricTime = value > 0 ? value : 1;
+
+                OnPropertyChanged("IntelHistoricTime");
+            }
+        }
+
         public int ZkillExpireTimeMinutes
         {
             get
@@ -898,13 +964,15 @@ public void SetDefaultColours()
                 MapBackgroundColour = Color.FromRgb(43, 43, 48),
                 RegionMarkerTextColour = Color.FromRgb(49, 49, 53),
                 RegionMarkerTextColourFull = Color.FromRgb(0, 0, 0),
-                ESIOverlayColour = Color.FromRgb(33, 62, 86),
+                ESIOverlayColour = (Color)ColorConverter.ConvertFromString("#FF74B071"),
+
+
                 IntelOverlayColour = Color.FromRgb(178, 34, 34),
                 IntelClearOverlayColour = Colors.Orange,
 
-                NormalGateColour = (Color)ColorConverter.ConvertFromString("#B0C0C0C0"),
-                ConstellationGateColour = Colors.MediumSpringGreen,
-                RegionGateColour = Colors.LimeGreen,
+                NormalGateColour = Colors.DarkSlateBlue,
+                ConstellationGateColour = Colors.SlateGray,
+                RegionGateColour = Color.FromRgb(128, 64, 64),
                 SelectedSystemColour = Color.FromRgb(255, 255, 255),
                 CharacterHighlightColour = Color.FromRgb(170, 130, 180),
                 CharacterOfflineTextColour = Colors.DarkGray,
@@ -965,6 +1033,12 @@ public void SetDefaults()
             UniverseMaxZoomDisplaySystemsText = 2.0f;
 
             IntelSoundVolume = 0.5f;
+
+            OverlayRange = 5;
+
+            IntelFreshTime = 30;
+            IntelStaleTime = 120;
+            IntelHistoricTime = 600;
         }
 
         protected void OnPropertyChanged(string name)

diff --git a/SMT/Overlay.xaml b/SMT/Overlay.xaml
@@ -0,0 +1,38 @@
+<Window x:Class="SMT.Overlay"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SMT"
+        mc:Ignorable="d"
+        WindowStyle="None"
+        ResizeMode="CanResizeWithGrip"
+        Topmost="True"
+        Visibility="Visible"        
+        Title="Overlay" Height="600" Width="600" AllowsTransparency="True">
+    <Window.Background>
+        <SolidColorBrush Opacity="0.2" Color="Black"></SolidColorBrush>
+    </Window.Background>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="30px"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="30px"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Column="1" Grid.Row="0"  Background="Transparent" Name="overlay_CharNameTextblock" HorizontalAlignment="Center" TextAlignment="Center" FontSize="12" Opacity="0.5" Margin="1" Foreground="White"/>
+        <Button Grid.Column="0" Grid.Row="0" PreviewMouseDown="Overlay_Window_Move" Opacity="0.5" ToolTip="Drag to move the overlay window." BorderThickness="0">
+            <Image Source="/Images/overlay_move.png" Stretch="Fill"/>
+        </Button>
+        <Button Grid.Column="2" Grid.Row="0" PreviewMouseDown="Overlay_Window_Close" Width="30" HorizontalAlignment="Right" Background="Transparent" Opacity="0.5" ToolTip="Click to close the overlay window." BorderThickness="0">
+            <Image Source="/Images/overlay_close.png" Stretch="Fill"/>
+        </Button>
+        <StackPanel Grid.Row="1" Grid.ColumnSpan="3" x:Name="overlay_CanvasContainer" >
+            <Canvas x:Name="overlay_Canvas" SnapsToDevicePixels="False" TextOptions.TextFormattingMode="Ideal" Height="570"/>
+        </StackPanel>
+    </Grid>
+
+</Window>