Skip to content

Commit

Permalink
Added new art to Player and Opponent windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zachwlewis
zachwlewis committed Aug 21, 2015
1 parent 771cd28 commit 215c3ba
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 47 deletions.
Binary file modified Hearthstone Deck Tracker/Images/frame_card_counter.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Hearthstone Deck Tracker/Images/opponent-chance-frame.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Hearthstone Deck Tracker/Images/player-chance-frame.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 16 additions & 9 deletions Hearthstone Deck Tracker/Windows/OpponentWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:local="clr-namespace:Hearthstone_Deck_Tracker"
xmlns:deckPicker="clr-namespace:Hearthstone_Deck_Tracker.Controls.DeckPicker"
xmlns:controls1="clr-namespace:Hearthstone_Deck_Tracker.Controls"
Title="Opponent" Height="440" Width="226" MinWidth="226" MaxWidth="226"
Title="Opponent" Height="440" Width="230" MinWidth="230" MaxWidth="230"
Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
SizeChanged="Window_SizeChanged_1" Activated="Window_Activated_1"
Icon="/HearthstoneDeckTracker;component/Images/HearthstoneDeckTracker.ico"
Expand Down Expand Up @@ -58,15 +58,22 @@
</Style>
</ListView.Resources>
</controls1:DeckListView>
<local:HearthstoneTextBlock x:Name="LblOpponentDrawChance2" FontSize="16" Text="0%" />
<local:HearthstoneTextBlock x:Name="LblOpponentDrawChance1" FontSize="16" Text="0%" />
<StackPanel Name="StackPanelCount" Orientation="Horizontal" HorizontalAlignment="Stretch" Height="35" Width="218" Margin="0,5">
<StackPanel.Background>
<Canvas Name="CanvasOpponentCount" HorizontalAlignment="Stretch" Height="40" Width="218" Margin="0,2">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/frame_card_counter.png"/>
</StackPanel.Background>
<local:HearthstoneTextBlock x:Name="LblOpponentCardCount" FontSize="18" Text="3" VerticalAlignment="Center" TextAlignment="Center" Width="48" HorizontalAlignment="Left" Margin="50,0,0,0" />
<local:HearthstoneTextBlock x:Name="LblOpponentDeckCount" FontSize="18" Text="27" TextAlignment="Center" Width="48" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="20,0,0,0" />
</StackPanel>
</Canvas.Background>
<local:HearthstoneTextBlock x:Name="LblOpponentCardCount" FontSize="18" Text="0" Canvas.Left="57" Canvas.Top="8" TextAlignment="Center" Width="56" />
<local:HearthstoneTextBlock x:Name="LblOpponentDeckCount" FontSize="18" Text="30" Canvas.Left="152" Canvas.Top="8" TextAlignment="Center" Width="56" />
</Canvas>
<Canvas Name="CanvasOpponentChance" HorizontalAlignment="Stretch" Height="71" Width="218" Margin="0,2">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/opponent-chance-frame.png"/>
</Canvas.Background>
<local:HearthstoneTextBlock x:Name="LblOpponentDrawChance1" FontSize="18" Text="0%" Canvas.Left="71" Canvas.Top="8" TextAlignment="Right" Width="55" />
<local:HearthstoneTextBlock x:Name="LblOpponentDrawChance2" FontSize="18" Text="0%" Canvas.Left="149" Canvas.Top="8" TextAlignment="Right" Width="55" />
<local:HearthstoneTextBlock x:Name="LblOpponentHandChance1" FontSize="18" Text="0%" Canvas.Left="71" Canvas.Top="39" TextAlignment="Right" Width="55" />
<local:HearthstoneTextBlock x:Name="LblOpponentHandChance2" FontSize="18" Text="0%" Canvas.Left="149" Canvas.Top="39" TextAlignment="Right" Width="55" />
</Canvas>
<StackPanel Name="StackPanelOpponentFatigue" Orientation="Horizontal" HorizontalAlignment="Center">
<local:HearthstoneTextBlock x:Name="LblOpponentFatigue" FontSize="14" Text="" Margin="4,0,0,0" />
</StackPanel>
Expand Down
22 changes: 9 additions & 13 deletions Hearthstone Deck Tracker/Windows/OpponentWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ public bool ShowToolTip
public void Update()
{
LblWinRateAgainst.Visibility = Config.Instance.ShowWinRateAgainst && Game.IsUsingPremade ? Visibility.Visible : Visibility.Collapsed;
LblOpponentDrawChance1.Visibility = _config.HideOpponentDrawChances ? Visibility.Collapsed : Visibility.Visible;
LblOpponentDrawChance2.Visibility = _config.HideOpponentDrawChances ? Visibility.Collapsed : Visibility.Visible;
StackPanelCount.Visibility = _config.HideOpponentCardCount ? Visibility.Collapsed : Visibility.Visible;
CanvasOpponentChance.Visibility = _config.HideOpponentDrawChances ? Visibility.Collapsed : Visibility.Visible;
CanvasOpponentCount.Visibility = _config.HideOpponentCardCount ? Visibility.Collapsed : Visibility.Visible;
ListViewOpponent.Visibility = _config.HideOpponentCards ? Visibility.Collapsed : Visibility.Visible;

var selectedDeck = DeckList.Instance.ActiveDeck;
Expand All @@ -88,11 +87,10 @@ public void UpdateOpponentLayout()
StackPanelMain.Children.Add(ListViewOpponent);
break;
case "Draw Chances":
StackPanelMain.Children.Add(LblOpponentDrawChance1);
StackPanelMain.Children.Add(LblOpponentDrawChance2);
StackPanelMain.Children.Add(CanvasOpponentChance);
break;
case "Card Counter":
StackPanelMain.Children.Add(StackPanelCount);
StackPanelMain.Children.Add(CanvasOpponentCount);
break;
case "Fatigue Counter":
StackPanelMain.Children.Add(StackPanelOpponentFatigue);
Expand Down Expand Up @@ -190,18 +188,16 @@ public void SetTextLocation(bool top)
StackPanelMain.Children.Clear();
if(top)
{
StackPanelMain.Children.Add(LblOpponentDrawChance2);
StackPanelMain.Children.Add(LblOpponentDrawChance1);
StackPanelMain.Children.Add(StackPanelCount);
StackPanelMain.Children.Add(CanvasOpponentChance);
StackPanelMain.Children.Add(CanvasOpponentCount);
StackPanelMain.Children.Add(ListViewOpponent);
}
else
{
StackPanelMain.Children.Add(ListViewOpponent);
StackPanelMain.Children.Add(LblOpponentDrawChance2);
StackPanelMain.Children.Add(LblOpponentDrawChance1);
StackPanelMain.Children.Add(StackPanelCount);
}
StackPanelMain.Children.Add(CanvasOpponentChance);
StackPanelMain.Children.Add(CanvasOpponentCount);
}
}
}
}
2 changes: 0 additions & 2 deletions Hearthstone Deck Tracker/Windows/OverlayWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
<local:HearthstoneTextBlock x:Name="LblDrawChance1" FontSize="18" Text="0%" Canvas.Left="71" Canvas.Top="8" TextAlignment="Right" Width="55" />
<local:HearthstoneTextBlock x:Name="LblDrawChance2" FontSize="18" Text="0%" Canvas.Left="149" Canvas.Top="8" TextAlignment="Right" Width="55" />
</Canvas>
<StackPanel Name="StackPanelPlayerDraw" Orientation="Horizontal" HorizontalAlignment="Center">
</StackPanel>
<StackPanel Name="StackPanelPlayerFatigue" Orientation="Horizontal" HorizontalAlignment="Center">
<local:HearthstoneTextBlock x:Name="LblPlayerFatigue" FontSize="14" Text="" Margin="4,0,0,0" />
</StackPanel>
Expand Down
26 changes: 14 additions & 12 deletions Hearthstone Deck Tracker/Windows/PlayerWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:local="clr-namespace:Hearthstone_Deck_Tracker"
xmlns:deckPicker="clr-namespace:Hearthstone_Deck_Tracker.Controls.DeckPicker"
xmlns:controls1="clr-namespace:Hearthstone_Deck_Tracker.Controls"
Title="Player" Height="440" Width="226" MinWidth="226" MaxWidth="226"
Title="Player" Height="440" Width="230" MinWidth="230" MaxWidth="230"
Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
SizeChanged="Window_SizeChanged_1" Activated="Window_Activated_1"
Icon="/HearthstoneDeckTracker;component/Images/HearthstoneDeckTracker.ico"
Expand Down Expand Up @@ -57,18 +57,20 @@
</Style>
</ListView.Resources>
</controls1:DeckListView>
<StackPanel Name="StackPanelDraw" Orientation="Horizontal" HorizontalAlignment="Center">
<local:HearthstoneTextBlock x:Name="LblDrawChance2" Text="0%" FontSize="16" VerticalAlignment="Center" />
<local:HearthstoneTextBlock Margin="4,0,0,0" x:Name="LblDrawChance1" Text="0%" FontSize="16"
VerticalAlignment="Center" />
</StackPanel>
<StackPanel Name="StackPanelCount" Orientation="Horizontal" HorizontalAlignment="Stretch" Height="35" Width="218" Margin="0,5">
<StackPanel.Background>
<Canvas Name="CanvasPlayerCount" HorizontalAlignment="Stretch" Height="40" Width="218" Margin="0,2">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/frame_card_counter.png"/>
</StackPanel.Background>
<local:HearthstoneTextBlock x:Name="LblCardCount" FontSize="18" Text="3" VerticalAlignment="Center" TextAlignment="Center" Width="48" HorizontalAlignment="Left" Margin="50,0,0,0" />
<local:HearthstoneTextBlock x:Name="LblDeckCount" FontSize="18" Text="27" TextAlignment="Center" Width="48" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="20,0,0,0" />
</StackPanel>
</Canvas.Background>
<local:HearthstoneTextBlock x:Name="LblCardCount" FontSize="18" Text="0" Canvas.Left="57" Canvas.Top="8" TextAlignment="Center" Width="56" />
<local:HearthstoneTextBlock x:Name="LblDeckCount" FontSize="18" Text="30" Canvas.Left="152" Canvas.Top="8" TextAlignment="Center" Width="56" />
</Canvas>
<Canvas Name="CanvasPlayerChance" HorizontalAlignment="Stretch" Height="40" Width="218" Margin="0,2">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/player-chance-frame.png"/>
</Canvas.Background>
<local:HearthstoneTextBlock x:Name="LblDrawChance1" FontSize="18" Text="0%" Canvas.Left="71" Canvas.Top="8" TextAlignment="Right" Width="55" />
<local:HearthstoneTextBlock x:Name="LblDrawChance2" FontSize="18" Text="0%" Canvas.Left="149" Canvas.Top="8" TextAlignment="Right" Width="55" />
</Canvas>
<StackPanel Name="StackPanelPlayerFatigue" Orientation="Horizontal" HorizontalAlignment="Center">
<local:HearthstoneTextBlock x:Name="LblPlayerFatigue" FontSize="14" Text="" Margin="4,0,0,0" />
</StackPanel>
Expand Down
21 changes: 10 additions & 11 deletions Hearthstone Deck Tracker/Windows/PlayerWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public PlayerWindow(Config config, ObservableCollection<Card> playerDeck, bool f

if(forScreenshot)
{
StackPanelDraw.Visibility = Visibility.Collapsed;
StackPanelCount.Visibility = Visibility.Collapsed;
CanvasPlayerChance.Visibility = Visibility.Collapsed;
CanvasPlayerCount.Visibility = Visibility.Collapsed;
LblWins.Visibility = Visibility.Collapsed;
LblDeckTitle.Visibility = Visibility.Collapsed;

Expand All @@ -73,9 +73,8 @@ public bool ShowToolTip

public void Update()
{
LblDrawChance1.Visibility = _config.HideDrawChances ? Visibility.Collapsed : Visibility.Visible;
LblDrawChance2.Visibility = _config.HideDrawChances ? Visibility.Collapsed : Visibility.Visible;
StackPanelCount.Visibility = _config.HidePlayerCardCount ? Visibility.Collapsed : Visibility.Visible;
CanvasPlayerChance.Visibility = _config.HideDrawChances ? Visibility.Collapsed : Visibility.Visible;
CanvasPlayerCount.Visibility = _config.HidePlayerCardCount ? Visibility.Collapsed : Visibility.Visible;
ListViewPlayer.Visibility = _config.HidePlayerCards ? Visibility.Collapsed : Visibility.Visible;
LblWins.Visibility = Config.Instance.ShowDeckWins && Game.IsUsingPremade ? Visibility.Visible : Visibility.Collapsed;
LblDeckTitle.Visibility = Config.Instance.ShowDeckTitle && Game.IsUsingPremade ? Visibility.Visible : Visibility.Collapsed;
Expand Down Expand Up @@ -110,10 +109,10 @@ public void UpdatePlayerLayout()
StackPanelMain.Children.Add(ListViewPlayer);
break;
case "Draw Chances":
StackPanelMain.Children.Add(StackPanelDraw);
StackPanelMain.Children.Add(CanvasPlayerChance);
break;
case "Card Counter":
StackPanelMain.Children.Add(StackPanelCount);
StackPanelMain.Children.Add(CanvasPlayerCount);
break;
case "Fatigue Counter":
StackPanelMain.Children.Add(StackPanelPlayerFatigue);
Expand Down Expand Up @@ -208,15 +207,15 @@ public void SetTextLocation(bool top)
StackPanelMain.Children.Clear();
if(top)
{
StackPanelMain.Children.Add(StackPanelDraw);
StackPanelMain.Children.Add(StackPanelCount);
StackPanelMain.Children.Add(CanvasPlayerChance);
StackPanelMain.Children.Add(CanvasPlayerCount);
StackPanelMain.Children.Add(ListViewPlayer);
}
else
{
StackPanelMain.Children.Add(ListViewPlayer);
StackPanelMain.Children.Add(StackPanelDraw);
StackPanelMain.Children.Add(StackPanelCount);
StackPanelMain.Children.Add(CanvasPlayerChance);
StackPanelMain.Children.Add(CanvasPlayerCount);
}
}
}
Expand Down
Binary file modified raw-assets/card-counter-frame.psd
View file
Binary file not shown.
Binary file modified raw-assets/opponent-chance-frame.psd
View file
Binary file not shown.
Binary file modified raw-assets/player-chance-frame.psd
View file
Binary file not shown.

0 comments on commit 215c3ba

Please sign in to comment.