Skip to content

Commit

Permalink
merged map colour/config
Browse files Browse the repository at this point in the history 
patched up jump range
  • Loading branch information
@BitBaboonSteve
BitBaboonSteve committed Feb 24, 2018
1 parent e6dad10 commit 540a319
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 289 deletions.
21 changes: 9 additions & 12 deletions MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,17 @@
</StackPanel>
</Grid>
</xcad:LayoutAnchorable>
<xcad:LayoutAnchorable Title="Map Controls" CanClose="False" CanAutoHide="True" CanHide="True" ContentId="MapControlsContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">

<xcad:LayoutAnchorable Title="Map Config" CanClose="False" CanAutoHide="True" CanHide="True" ContentId="MapColoursContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
<ScrollViewer Background="#FFE5E5E5">
<StackPanel>
<ComboBox x:Name="ColourListDropdown" SelectionChanged="ColourListDropdown_SelectionChanged" />
<Separator />
<xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False" ShowTitle="False" ShowSummary="False" />
<Separator />
<Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
<Separator />

<xctk:PropertyGrid x:Name="MapControlsPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False" ShowTitle="False" ShowSummary="False">
<xctk:PropertyGrid.EditorDefinitions>
<xctk:EditorTemplateDefinition TargetProperties="ESIOverlayScale">
Expand All @@ -115,18 +123,7 @@
<Separator />
<Button x:Name="refreshData" Click="refreshData_Click" Content="Refresh ESI System Kills" Margin="0,2" />
</StackPanel>
</StackPanel>
</ScrollViewer>
</xcad:LayoutAnchorable>

<xcad:LayoutAnchorable Title="Map Colours" CanClose="False" CanAutoHide="True" CanHide="True" ContentId="MapColoursContentID" AutoHideMinHeight="200" AutoHideMinWidth="280">
<ScrollViewer Background="#FFE5E5E5">
<StackPanel>
<ComboBox x:Name="ColourListDropdown" SelectionChanged="ColourListDropdown_SelectionChanged" />
<Separator />
<xctk:PropertyGrid x:Name="ColoursPropertyGrid" AutoGenerateProperties="True" ShowSearchBox="False" ShowSortOptions="False" ShowTitle="False" ShowSummary="False" />
<Separator />
<Button x:Name="ResetColourData" Click="ResetColourData_Click" Content="Reset Colours" Margin="0,2" />
</StackPanel>
</ScrollViewer>
</xcad:LayoutAnchorable>
Expand Down
2 changes: 0 additions & 2 deletions MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public partial class MainWindow : Window

private MapConfig MapConf;

private System.Windows.Threading.DispatcherTimer uiRefreshTimer;

public MainWindow()
{
OutputLog.Info("Starting App..");
Expand Down
275 changes: 0 additions & 275 deletions MapConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,8 @@ protected void OnPropertyChanged(string name)
}
}

private bool m_ColourBySov;

private bool m_ShowJumpBridges;
private bool m_ShowHostileJumpBridges;

private bool m_ShowSystemSovTicker;
private bool m_ShowSystemSovName;

private bool m_ShowSystemSecurity;
private bool m_ShowSystemSovStanding;

private bool m_ShowNPCKills;
private bool m_ShowPodKills;
private bool m_ShowShipKills;
private bool m_ShowShipJumps;
private int m_MaxIntelSeconds;
private string m_DefaultRegion;
private double m_ESIOverlayScale;



[Browsable(false)]
public string DefaultRegion
Expand All @@ -74,118 +56,11 @@ public string DefaultRegion
[Browsable(false)]
public MapColours ActiveColourScheme;

[Category("Jump Bridges")]
[DisplayName("Friendly Bridges")]
public bool ShowJumpBridges
{
get
{
return m_ShowJumpBridges;
}
set
{
m_ShowJumpBridges = value;

OnPropertyChanged("ShowJumpBridges");
}
}

[Category("Jump Bridges")]
[DisplayName("Hostile Bridges")]
public bool ShowHostileJumpBridges
{
get
{
return m_ShowHostileJumpBridges;
}
set
{
m_ShowHostileJumpBridges = value;

OnPropertyChanged("ShowHostileJumpBridges");
}
}

[Category("General")]
[DisplayName("System Popup")]
public bool ShowSystemPopup { get; set; }

[Category("General")]
[DisplayName("Show Security")]
public bool ShowSystemSecurity
{
get
{
return m_ShowSystemSecurity;
}
set
{
m_ShowSystemSecurity = value;

if (m_ShowSystemSecurity)
{
ShowSystemSovStanding = false;
}

OnPropertyChanged("ShowSystemSecurity");
}
}

[Category("General")]
[DisplayName("Show SOV Standing")]
public bool ShowSystemSovStanding
{
get
{
return m_ShowSystemSovStanding;
}
set
{
m_ShowSystemSovStanding = value;

if (m_ShowSystemSovStanding)
{
ShowSystemSecurity = false;
}

OnPropertyChanged("ShowSystemSovStanding");
}
}



[Category("General")]
[DisplayName("Show SOV Ticker")]
public bool ShowSystemSovTicker
{
get
{
return m_ShowSystemSovTicker;
}
set
{
m_ShowSystemSovTicker = value;
OnPropertyChanged("ShowSystemSovTicker");
}
}

[Category("General")]
[DisplayName("Show SOV Name")]
public bool ShowSystemSovName
{
get
{
return m_ShowSystemSovName;
}
set
{
m_ShowSystemSovName = value;
OnPropertyChanged("ShowSystemSovName");
}
}




[Category("Navigation")]
[DisplayName("Show Jump Distance")]
Expand All @@ -195,30 +70,10 @@ public bool ShowSystemSovName
[DisplayName("Ship Type")]
public JumpShip JumpShipType { get; set; }

[Category("ESI Data")]
[DisplayName("ESI Scale")]
public double ESIOverlayScale
{
get
{
return m_ESIOverlayScale;
}
set
{
m_ESIOverlayScale = value;
OnPropertyChanged("ESIOverlayScale");
}
}

[Category("Intel")]
[DisplayName("Show Intel")]
public bool ShowIntel { get; set; }

[Category("Intel")]
[DisplayName("Warning Sound")]
public bool PlayIntelSound { get; set; }


[Category("Intel")]
[DisplayName("Max Intel Time (s)")]
public int MaxIntelSeconds
Expand All @@ -244,142 +99,12 @@ public int MaxIntelSeconds



[Category("General")]
[DisplayName("Colour By Sov")]
public bool ColourBySov
{
get
{
return m_ColourBySov;
}

set
{
m_ColourBySov = value;

if (m_ColourBySov)
{
ShowPodKills = false;
ShowShipKills = false;
ShowShipJumps = false;
ShowNPCKills = false;
}

OnPropertyChanged("ColourBySov");
}
}


[Category("ESI Data")]
[DisplayName("Rat Kills")]
public bool ShowNPCKills
{
get
{
return m_ShowNPCKills;
}

set
{
m_ShowNPCKills = value;

if (m_ShowNPCKills)
{
ShowPodKills = false;
ShowShipKills = false;
ShowShipJumps = false;
ColourBySov = false;
}

OnPropertyChanged("ShowNPCKills");
}
}

[Category("ESI Data")]
[DisplayName("Pod Kills")]
public bool ShowPodKills
{
get
{
return m_ShowPodKills;
}

set
{
m_ShowPodKills = value;
if (m_ShowPodKills)
{
ShowNPCKills = false;
ShowShipKills = false;
ShowShipJumps = false;
ColourBySov = false;
}

OnPropertyChanged("ShowPodKills");
}
}

[Category("ESI Data")]
[DisplayName("Ship Kills")]
public bool ShowShipKills
{
get
{
return m_ShowShipKills;
}

set
{
m_ShowShipKills = value;
if (m_ShowShipKills)
{
ShowNPCKills = false;
ShowPodKills = false;
ShowShipJumps = false;
ColourBySov = false;
}

OnPropertyChanged("ShowShipKills");
}
}

[Category("ESI Data")]
[DisplayName("Jumps")]
public bool ShowShipJumps
{
get
{
return m_ShowShipJumps;
}

set
{
m_ShowShipJumps = value;
if (m_ShowShipJumps)
{
ShowNPCKills = false;
ShowPodKills = false;
ShowShipKills = false;
ColourBySov = false;
}

OnPropertyChanged("ShowShipJumps");
}
}

public void SetDefaults()
{
ShowJumpBridges = true;
ShowHostileJumpBridges = true;
ESIOverlayScale = 1.0f;
ShowPodKills = true;
ShowIntel = true;
DefaultRegion = "Molden Heath";
ShowSystemPopup = true;
ShowSystemSecurity = true;

MaxIntelSeconds = 120;

MapColours = new List<MapColours>();
}

Expand Down
Loading

0 comments on commit 540a319

Please sign in to comment.