v0.3.14,

fixed manacostbar tooltip font color, fixed importing from arenavalue always showing an error message
HearthSim · Jul 13, 2014 · 30b6021 · 30b6021
1 parent 0f4d1ea
commit 30b6021
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Hearthstone Deck Tracker/Controls/ManaCostBarToolTip.xaml b/Hearthstone Deck Tracker/Controls/ManaCostBarToolTip.xaml
@@ -19,9 +19,9 @@
             <Ellipse Fill="#FFAA1E28" Stroke="#FFD7AABE" Grid.Row="0" Grid.Column="0" Width="10" Height="10"></Ellipse>
             <Ellipse Fill="#FF1E6EAA" Stroke="#FFA0C8D7" Grid.Row="1" Grid.Column="0" Width="10" Height="10"></Ellipse>
             <Ellipse Fill="#FF6EAA1E" Stroke="#FFC8D7A0" Grid.Row="2" Grid.Column="0" Width="10" Height="10"></Ellipse>
-            <TextBlock Name="TextblockWeapons" Text="Weapons: 0" Grid.Row="0" FontSize="14" Grid.Column="1" VerticalAlignment="Center" FontWeight="Medium" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0"></TextBlock>
-            <TextBlock Name="TextblockSpells" Text="Spells: 0" Grid.Row="1" FontSize="14" Grid.Column="1" VerticalAlignment="Center" FontWeight="Medium" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0"></TextBlock>
-            <TextBlock Name="TextblockMinions" Text="Minions: 0" Grid.Row="2" FontSize="14" Grid.Column="1" VerticalAlignment="Center" FontWeight="Medium" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0"></TextBlock>
+            <TextBlock Name="TextblockWeapons" Text="Weapons: 0" Grid.Row="0" FontSize="14" Grid.Column="1" VerticalAlignment="Center" FontWeight="Medium" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"></TextBlock>
+            <TextBlock Name="TextblockSpells" Text="Spells: 0" Grid.Row="1" FontSize="14" Grid.Column="1" VerticalAlignment="Center" FontWeight="Medium" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"></TextBlock>
+            <TextBlock Name="TextblockMinions" Text="Minions: 0" Grid.Row="2" FontSize="14" Grid.Column="1" VerticalAlignment="Center" FontWeight="Medium" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"></TextBlock>
         </Grid>
     </Border>
 </UserControl>
diff --git a/Hearthstone Deck Tracker/MainWindow.xaml.cs b/Hearthstone Deck Tracker/MainWindow.xaml.cs
@@ -1880,7 +1880,8 @@ private void DeckImportFlyoutBtnArenavalue_Click(object sender, RoutedEventArgs
                     }
 
                     SetNewDeck(deck);
-                    ShowMessage("Error loading deck", "");
+                    if(deck == null)
+                        ShowMessage("Error loading deck", "");
                 }
                 catch (Exception ex)
                 {

diff --git a/Hearthstone Deck Tracker/Version.xml b/Hearthstone Deck Tracker/Version.xml
@@ -2,6 +2,6 @@
 <Version>
   <Major>0</Major>
   <Minor>3</Minor>
-  <Revision>13</Revision>
+  <Revision>14</Revision>
   <Build>0</Build>
 </Version>