Skip to content

Commit

Permalink
v0.3.10,
Browse files Browse the repository at this point in the history 
changed tooltip text font,
fixed claw exporting (ger, eng),
fixed silence exporting (eng)
  • Loading branch information
epix37 committed Jul 8, 2014
1 parent 216d2c4 commit 24ac097
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
13 changes: 6 additions & 7 deletions Hearthstone Deck Tracker/Controls/CardToolTip.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Hearthstone_Deck_Tracker"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="200" MaxWidth="200" Background="Transparent">
d:DesignHeight="300" d:DesignWidth="200" Width="200" Background="Transparent">
<Border BorderBrush="{DynamicResource AccentColorBrush}" BorderThickness="1">
<Grid Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}">
<Grid Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
Expand All @@ -20,16 +20,15 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Image Source="../Resources/damage.png" Width="35" Height="35" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<local:HearthstoneTextBlock Text="{Binding Attack}" Grid.Column="0" FontSize="22" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2,0,0,0"></local:HearthstoneTextBlock>
<local:HearthstoneTextBlock Text="{Binding Attack}" Grid.Column="0" FontSize="24" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5,2,0,0"></local:HearthstoneTextBlock>
<local:HearthstoneTextBlock Text="{Binding LocalizedName}" Grid.Column="1" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap"></local:HearthstoneTextBlock>
<Image Source="../Resources/health.png" Width="35" Height="35" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<local:HearthstoneTextBlock Text="{Binding Health}" Grid.Column="2" FontSize="22" VerticalAlignment="Center" HorizontalAlignment="Center"></local:HearthstoneTextBlock>
<local:HearthstoneTextBlock Text="{Binding Health}" Grid.Column="2" FontSize="24" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2,2,0,0"></local:HearthstoneTextBlock>
</Grid>
<local:HearthstoneTextBlock Text="{Binding Text}" Grid.Row="1" FontSize="14" VerticalAlignment="Top" HorizontalAlignment="Center" TextWrapping="Wrap" Margin="10,0,10,0"></local:HearthstoneTextBlock>
<TextBlock Name="CardTextBlock" Text="{Binding Text}" Grid.Row="1" FontSize="14" VerticalAlignment="Top" FontWeight="Medium" HorizontalAlignment="Center" TextWrapping="Wrap" Margin="10,0,10,0"></TextBlock>
<Grid Grid.Row="2" Background="{DynamicResource AccentColorBrush}">
<local:HearthstoneTextBlock Text="{Binding Type}" Grid.Column="1" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap"></local:HearthstoneTextBlock>

</Grid>
</Grid>
</Grid>
</Border>
</UserControl>
5 changes: 5 additions & 0 deletions Hearthstone Deck Tracker/DeckExporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,18 @@ private string FixCardName(string cardName)
//english
case "Fireball":
case "Windfury":
case "Claw":
return cardName + " Spell";
case "Slam":
return cardName + " Draw";
case "Silence":
return cardName + " minion.";


//german
case "Feuerball":
case "Windzorn":
case "Klaue":
return cardName + " Zauber";
default:
return cardName;
Expand Down
7 changes: 3 additions & 4 deletions Hearthstone Deck Tracker/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,14 +290,14 @@
<CheckBox x:Name="CheckboxMinimizeTray" Content="Minimize to tray" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="CheckboxMinimizeTray_Checked" Unchecked="CheckboxMinimizeTray_Unchecked" RenderTransformOrigin="1.518,2.778"/>
<CheckBox x:Name="CheckboxDeckDetection" Content="Automatic deck detection" HorizontalAlignment="Left" Margin="10,56,0,0" VerticalAlignment="Top" Checked="CheckboxDeckDetection_Checked" Unchecked="CheckboxDeckDetection_Unchecked"/>
<CheckBox x:Name="CheckboxAutoSelectDeck" Content="Autoselect if 1 possible deck" HorizontalAlignment="Left" Margin="29,79,-11,0" VerticalAlignment="Top" Checked="CheckboxAutoSelectDeck_Checked" Unchecked="CheckboxAutoSelectDeck_Unchecked"/>
<ComboBox x:Name="ComboboxAccent" HorizontalAlignment="Left" Margin="119,184,0,0" VerticalAlignment="Top" Width="90" SelectionChanged="ComboboxAccent_SelectionChanged">
<ComboBox x:Name="ComboboxAccent" HorizontalAlignment="Left" Margin="89,184,0,0" VerticalAlignment="Top" Width="120" SelectionChanged="ComboboxAccent_SelectionChanged">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding Name}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<ComboBox x:Name="ComboboxTheme" HorizontalAlignment="Left" Margin="119,153,0,0" VerticalAlignment="Top" Width="90" SelectionChanged="ComboboxTheme_SelectionChanged">
<ComboBox x:Name="ComboboxTheme" HorizontalAlignment="Left" Margin="89,153,0,0" VerticalAlignment="Top" Width="120" SelectionChanged="ComboboxTheme_SelectionChanged">
<ComboBox.ItemTemplate>
<DataTemplate>
<Label Content="{Binding Name}"/>
Expand All @@ -306,7 +306,7 @@
</ComboBox>
<Label Content="Theme:" HorizontalAlignment="Left" Margin="5,153,0,0" VerticalAlignment="Top"/>
<Label Content="Accent:" HorizontalAlignment="Left" Margin="5,184,0,0" VerticalAlignment="Top"/>
<ComboBox Name="ComboboxLanguages" HorizontalAlignment="Left" Margin="119,215,0,0" VerticalAlignment="Top" Width="90" SelectionChanged="ComboboxLanguages_SelectionChanged"/>
<ComboBox Name="ComboboxLanguages" HorizontalAlignment="Left" Margin="89,215,0,0" VerticalAlignment="Top" Width="120" SelectionChanged="ComboboxLanguages_SelectionChanged"/>
<Label Content="Language:" HorizontalAlignment="Left" Margin="5,215,0,0" VerticalAlignment="Top"/>
<CheckBox x:Name="CheckboxExportName" Content="Set name when exporting to HS" HorizontalAlignment="Left" Margin="10,102,0,0" VerticalAlignment="Top" Checked="CheckboxExportName_Checked" Unchecked="CheckboxExportName_Unchecked"/>
<CheckBox x:Name="CheckboxPrioGolden" Content="Prioritize golden when exporting" HorizontalAlignment="Left" Margin="10,125,0,0" VerticalAlignment="Top" Checked="CheckboxPrioGolden_Checked" Unchecked="CheckboxPrioGolden_Unchecked"/>
Expand Down Expand Up @@ -467,7 +467,6 @@
</TextBlock>
<TextBlock Margin="10,249,7,0" VerticalAlignment="Top"><Bold><Run Text="Card Marks:"/></Bold></TextBlock>
<TextBlock Margin="20,270,34,0" VerticalAlignment="Top" Width="auto" TextWrapping="Wrap"><Run Text="(C)oin, (R)eturned, (M)ulliganed, (S)tolen"/></TextBlock>

</Grid>
</TabItem>
</TabControl>
Expand Down
2 changes: 1 addition & 1 deletion Hearthstone Deck Tracker/Version.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Version>
<Major>0</Major>
<Minor>3</Minor>
<Revision>9</Revision>
<Revision>10</Revision>
<Build>0</Build>
</Version>

0 comments on commit 24ac097

Please sign in to comment.