Skip to content

Commit

Permalink
updated character screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@BitBaboonSteve
BitBaboonSteve committed Oct 25, 2020
1 parent 98372a1 commit a25d0f7
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 30 deletions.
114 changes: 89 additions & 25 deletions CharactersWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,31 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:System="clr-namespace:System;assembly=mscorlib"
xmlns:local="clr-namespace:SMT"
mc:Ignorable="d"
Closed="Window_Closed"
Title="Characters" Height="450" Width="800">
<Grid>
Title="Characters" Height="450" Width="750" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">

<Window.Resources>
<ObjectDataProvider x:Key="navigationEnumData" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="local:RoutingMode" />
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
</Window.Resources>
<Grid Background="{DynamicResource ListBackground}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="270"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="20" />
<RowDefinition Height="30" />

</Grid.RowDefinitions>

<ListView x:Name="characterLV" Grid.Row="0" BorderBrush="Black" SelectionChanged="characterLV_Selected">
<ListView x:Name="characterLV" Grid.Row="0" BorderBrush="Black" SelectionChanged="characterLV_Selected" Margin="4">
<ListView.ItemTemplate>
<DataTemplate>
<WrapPanel>
Expand All @@ -29,16 +38,16 @@
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<Button DockPanel.Dock="Bottom" Content="Add Character" Grid.Row="1" Click="AddCharacter_Click"/>
<Button DockPanel.Dock="Bottom" Content="Add Character" Grid.Row="1" Click="AddCharacter_Click" Margin="4"/>

<Grid x:Name="characterInfoGrid" Grid.Column="1" Grid.RowSpan="2"
<Grid x:Name="characterInfoGrid" Grid.Column="1" Grid.RowSpan="2" Visibility="Hidden"
Background="{DynamicResource ListBackground}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="50*"/>
<ColumnDefinition Width="50*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="128" />
<RowDefinition Height="190" />
<RowDefinition Height="25" />
<RowDefinition Height="25" />
<RowDefinition Height="25" />
Expand All @@ -52,9 +61,9 @@
<RowDefinition Height="30" />
</Grid.RowDefinitions>

<Image Source="{Binding Portrait}" Width="100" Height="100" Grid.Row="0" Grid.Column="0"/>
<StackPanel Orientation="Vertical" Grid.Row="0" Grid.Column="1" Margin="0,30" Grid.RowSpan="2">
<TextBlock Text="{Binding Name}" FontSize="20" Foreground="White" />
<Image Source="{Binding Portrait}" Width="170" Height="170" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" Margin="10"/>
<StackPanel Orientation="Vertical" Grid.Row="0" Grid.Column="1" Margin="-40,30" Grid.RowSpan="2">
<TextBlock Text="{Binding Name}" FontSize="24" Foreground="White" />

<TextBlock FontSize="14" Foreground="LightGray">
<Run Text="{Binding CorporationName, FallbackValue='????'}"/>
Expand All @@ -73,24 +82,79 @@
<Run Text="{Binding Location, FallbackValue='Unknown Location'}"/>
</TextBlock>



<TextBlock Text=" " />

<TextBlock Margin="0">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Style.Triggers>
<DataTrigger Binding="{Binding ESILinked}" Value="True">
<Setter Property="Text" Value="Authenticated" />
<Setter Property="Foreground" Value="Green" />
</DataTrigger>
<DataTrigger Binding="{Binding ESILinked}" Value="False">
<Setter Property="Text" Value="Unauthenticated" />
<Setter Property="Foreground" Value="Red" />
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>



<TextBlock>
<TextBlock.Style>
<Style TargetType="TextBlock">
<Style.Triggers>
<DataTrigger Binding="{Binding IsOnline}" Value="True">
<Setter Property="Text" Value="Online" />
<Setter Property="Foreground" Value="LightGray" />
</DataTrigger>
<DataTrigger Binding="{Binding IsOnline}" Value="False">
<Setter Property="Text" Value="Offline" />
<Setter Property="Foreground" Value="DarkGray" />
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>


</StackPanel>
<Label Content="ESI Authenticated" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<Label Content="{Binding ESILinked}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left"/>

<Label Content="Use Ansiblex" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right"/>
<CheckBox IsChecked="{Binding UseAnsiblexGates}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center"/>

<Label Content="Online" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right"/>
<Label Content="{Binding IsOnline}" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left"/>


<Label Content="DangerZone Enabled" Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right" />
<CheckBox IsChecked="{Binding DangerZoneActive}" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Checked="dangerZoneEnabled_Checked"/>
<GroupBox Header="Navigation Options" Grid.Row="1" Grid.RowSpan="7" BorderBrush="DarkGray" Margin="5">
<StackPanel Margin="4">
<StackPanel Orientation="Horizontal" Margin="4">
<Label Content="Autopilot" />
<ComboBox ItemsSource="{Binding Source={StaticResource navigationEnumData}}" SelectedItem="{Binding NavigationMode, Mode=TwoWay}" Margin="2" Width="140" Background="Black"/>
</StackPanel>
<CheckBox IsChecked="{Binding UseAnsiblexGates}" HorizontalAlignment="Left" Content="Use Ansiblex Gates" Margin="4"/>


</StackPanel>
</GroupBox>


<GroupBox Header="DangerZone" Grid.Column="1" Grid.Row="1" Grid.RowSpan="7" BorderBrush="DarkGray" Margin="5">
<StackPanel Margin="4" >
<CheckBox IsChecked="{Binding DangerZoneActive}" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Checked="dangerZoneEnabled_Checked" Content="DangerZone Enabled" Margin="4"/>
<StackPanel Orientation="Horizontal" Margin="4">
<xctk:IntegerUpDown Value="{Binding DangerZoneRange}" Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0" Width="45" Minimum="1" Maximum="6" Background="Transparent" Foreground="White" ValueChanged="dangerzone_ValueChanged" />
<Label Content="DangerZone Size" Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right" />
</StackPanel>
</StackPanel>
</GroupBox>


<Button Content="Delete" Grid.Column="1" Grid.Row="8" Width="100" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="20,0" x:Name="deleteBtn" Click="deleteBtn_Click"/>




<Label Content="DangerZone Size" Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right" />
<xctk:IntegerUpDown Value="{Binding DangerZoneRange}" Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0" Width="45" Minimum="1" Maximum="6" Background="Transparent" Foreground="White" ValueChanged="dangerzone_ValueChanged" />



Expand Down
35 changes: 34 additions & 1 deletion CharactersWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public CharactersWindow()

private void characterLV_Selected(object sender, RoutedEventArgs e)
{
characterInfoGrid.DataContext = characterLV.SelectedItem;
characterInfoGrid.DataContext = characterLV.SelectedItem;
characterInfoGrid.Visibility = Visibility.Visible;
}

private void Window_Closed(object sender, EventArgs e)
Expand Down Expand Up @@ -60,5 +61,37 @@ private void dangerZoneEnabled_Checked(object sender, RoutedEventArgs e)
lc.warningSystemsNeedsUpdate = true;
}
}

private void deleteBtn_Click(object sender, RoutedEventArgs e)
{

EVEData.LocalCharacter lc = characterInfoGrid.DataContext as EVEData.LocalCharacter;
if(lc != null)
{
MessageBoxResult result = MessageBox.Show("Would you like to Delete \"" + lc.Name + " ?", "Delete Character?", MessageBoxButton.YesNo, MessageBoxImage.Warning);

if(result == MessageBoxResult.Yes)
{
MainWindow mw = Owner as MainWindow;


mw.ActiveCharacter = null;
mw.FleetMembersList.ItemsSource = null;

mw.CurrentActiveCharacterCombo.SelectedIndex = -1;
mw.RegionsViewUC.ActiveCharacter = null;
mw.RegionUC.ActiveCharacter = null;
mw.RegionUC.UpdateActiveCharacter();
mw.UniverseUC.ActiveCharacter = null;
mw.OnCharacterSelectionChanged();

mw.EVEManager.LocalCharacters.Remove(lc);


characterInfoGrid.Visibility = Visibility.Hidden;
}

}
}
}
}
1 change: 1 addition & 0 deletions EVEData/EveManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1342,6 +1342,7 @@ public async void HandleEveAuthSMTUri(Uri uri, string challengeCode)
esiChar.ESIAccessTokenExpiry = acd.ExpiresOn;
esiChar.ID = acd.CharacterID;
esiChar.ESIAuthData = acd;
esiChar.UpdateInfoFromESI();

// now to find if a matching character
}
Expand Down
2 changes: 1 addition & 1 deletion EVEData/LocalCharacter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ private async Task UpdateFleetInfo()
/// <summary>
/// Update the character info from the ESI data if linked
/// </summary>
private async Task UpdateInfoFromESI()
public async Task UpdateInfoFromESI()
{
if (ID == 0 || !ESILinked || ESIAuthData == null)
{
Expand Down
6 changes: 3 additions & 3 deletions MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace SMT
/// </summary>
public partial class MainWindow : Window
{
public const string SMT_VERSION = "SMT_094";
public const string SMT_VERSION = "SMT_095";
public static MainWindow AppWindow;
private LogonWindow logonBrowserWindow;

Expand All @@ -50,7 +50,7 @@ public MainWindow()

InitializeComponent();

Title = "SMT (Blue Falcon Patrol : " + SMT_VERSION + ")";
Title = "SMT (Dr dont touch it : " + SMT_VERSION + ")";

CheckGitHubVersion();

Expand Down Expand Up @@ -456,7 +456,7 @@ private void MapConf_PropertyChanged(object sender, PropertyChangedEventArgs e)
}
}

private void OnCharacterSelectionChanged()
public void OnCharacterSelectionChanged()
{
CollectionViewSource.GetDefaultView(ZKBFeed.ItemsSource).Refresh();
}
Expand Down

0 comments on commit a25d0f7

Please sign in to comment.