From eb4bf050262482d0c09c062824d9e2d943784241 Mon Sep 17 00:00:00 2001
From: epix37 <epikz37@gmail.com>
Date: Sat, 24 Jan 2015 10:37:16 +0100
Subject: [PATCH] reintroduced minors to deck versioning (#599)

---
 .../Controls/DeckVersionChange.xaml           |   8 +-
 .../FlyoutControls/DeckStatsControl.xaml      |   4 +-
 .../FlyoutControls/DeckStatsControl.xaml.cs   |   2 +-
 Hearthstone Deck Tracker/Hearthstone/Deck.cs  |   2 +-
 .../MainWindow/MainWindow.xaml                |  19 +-
 .../MainWindow/MainWindow.xaml.cs             |  18 +-
 .../MainWindow/MainWindow_NewDeck.cs          |  10 +-
 Hearthstone Deck Tracker/Stats/GameStats.cs   |  11 +-
 .../Utility/SerializableVersion.cs            | 250 +++++++++---------
 9 files changed, 174 insertions(+), 150 deletions(-)

diff --git a/Hearthstone Deck Tracker/Controls/DeckVersionChange.xaml b/Hearthstone Deck Tracker/Controls/DeckVersionChange.xaml
index 8e96dc7e80..c0d70cd4c1 100644
--- a/Hearthstone Deck Tracker/Controls/DeckVersionChange.xaml	
+++ b/Hearthstone Deck Tracker/Controls/DeckVersionChange.xaml	
@@ -8,14 +8,14 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <StackPanel Orientation="Vertical">
-        <TextBlock x:Name="Label" Text="Hist change" Height="25" FontSize="14" Background="White"/>
+        <TextBlock x:Name="Label" Text="Hist change" FontSize="12" VerticalAlignment="Center" TextAlignment="Center" FontWeight="Medium"/>
         <ListView x:Name="ListViewDeck" Grid.Row="0"
                                     ItemsSource="{Binding}"
                                     Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-                                    Foreground="White" FontWeight="Bold" BorderThickness="1"
+                                    Foreground="White" FontWeight="Bold" BorderThickness="0"
                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                                    ScrollViewer.CanContentScroll="False" FontFamily="Arial" Margin="0,6,0,6"
+                                    ScrollViewer.CanContentScroll="False" FontFamily="Arial"
                                     HorizontalAlignment="Stretch" 
                                     >
             <ListView.Resources>
@@ -30,7 +30,7 @@
                     <Setter Property="ToolTip">
                         <Setter.Value>
                             <ToolTip Background="Transparent" BorderBrush="Transparent">
-                                <local:CardToolTip></local:CardToolTip>
+                                <local:CardToolTip />
                             </ToolTip>
                         </Setter.Value>
                     </Setter>
diff --git a/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml b/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml
index 2416bd27ee..1b6e644e43 100644
--- a/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml	
+++ b/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml	
@@ -212,7 +212,7 @@
                                       CanUserReorderColumns="False" CanUserSortColumns="False"
                                       CanUserResizeColumns="False">
                                             <DataGrid.Columns>
-                                                <DataGridTextColumn Header="Version" Binding="{Binding Version}">
+                                                <DataGridTextColumn Header="Ver." Binding="{Binding Version}">
                                                     <DataGridTextColumn.ElementStyle>
                                                         <Style TargetType="TextBlock">
                                                             <Setter Property="HorizontalAlignment" Value="Center" />
@@ -361,7 +361,7 @@
                                       MouseDoubleClick="DGrid_MouseDoubleClick"
                                       SelectionChanged="DGrid_SelectionChanged">
                                             <DataGrid.Columns>
-                                                <DataGridTextColumn Header="Version" Binding="{Binding PlayerDeckVersionMajor}">
+                                                <DataGridTextColumn Header="Ver." Binding="{Binding PlayerDeckVersionString}">
                                                     <DataGridTextColumn.ElementStyle>
                                                         <Style TargetType="TextBlock">
                                                             <Setter Property="HorizontalAlignment" Value="Center" />
diff --git a/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml.cs b/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml.cs
index b6a91dc13f..4d4519e56a 100644
--- a/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml.cs	
+++ b/Hearthstone Deck Tracker/FlyoutControls/DeckStatsControl.xaml.cs	
@@ -791,7 +791,7 @@ public WinLoss(List<GameStats> stats, string text, SerializableVersion version)
                 }
                 else
                 {
-                    Version = version.Major.ToString();
+	                Version = version.ToString("v{M}.{m}");
                 }
             }
 
diff --git a/Hearthstone Deck Tracker/Hearthstone/Deck.cs b/Hearthstone Deck Tracker/Hearthstone/Deck.cs
index 64b1f69567..80675eaffb 100644
--- a/Hearthstone Deck Tracker/Hearthstone/Deck.cs	
+++ b/Hearthstone Deck Tracker/Hearthstone/Deck.cs	
@@ -45,7 +45,7 @@ public string NameAndVersion
         {
             get
             {
-                return string.Format("{0} (v{1})", Name, Version.Major);
+                return string.Format("{0} (v{1}.{2})", Name, Version.Major, Version.Minor);
             }
         }
         public SerializableVersion Version = new SerializableVersion(1, 0);
diff --git a/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml b/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml
index 250dd495af..95ac8aa462 100644
--- a/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml	
+++ b/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml	
@@ -321,7 +321,6 @@
                         </Rectangle>
                     </MenuItem.Icon>
                 </MenuItem>
-                <CheckBox x:Name="IncraseVersion" Content="Increase version" IsChecked="True"/>
                 <MenuItem Header="CANCEL" Click="BtnCancelEdit_Click">
                     <MenuItem.Icon>
                         <Rectangle Width="16" Height="16">
@@ -440,18 +439,20 @@
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
-                <StackPanel Orientation="Vertical" Grid.Column="1">
-                    <TextBlock x:Name="DeckCurrentVersionHeader" Text="Deck History" HorizontalAlignment="Center" FontSize="16"/>
-                    <TextBlock x:Name="DeckCurrentVersion" FontSize="12"/>
-                </StackPanel>
-                <ScrollViewer Grid.Column="1" Grid.Row="1">
+                <DockPanel Grid.Column="1" Margin="0,6,0,0">
+                    <TextBlock x:Name="DeckCurrentVersionHeader" Text="DECK HISTORY:" VerticalAlignment="Center" FontSize="12" DockPanel.Dock="Left"/>
+                    <TextBlock x:Name="DeckCurrentVersion" Margin="6,0,0,0" FontSize="12" Text="v1.0" VerticalAlignment="Center" DockPanel.Dock="Left"/>
+                    <Label Content="->" VerticalAlignment="Center" DockPanel.Dock="Left"/>
+                    <ComboBox Name="ComboBoxVersionIncrement" Margin="0,0,6,0" />
+                </DockPanel>
+                <ScrollViewer Grid.Column="1" Grid.Row="1" Margin="0,6,6,6" Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}">
                     <StackPanel x:Name="DeckHistoryPanel" 
                                     Orientation="Vertical"
-                                    Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
+                                    
                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                     ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                    ScrollViewer.CanContentScroll="True" Margin="0,6,0,6"
-                                    HorizontalAlignment="Center" Width="220" Height="auto"
+                                    ScrollViewer.CanContentScroll="True"
+                                    HorizontalAlignment="Center" Height="auto" Width="220"  Margin="0,0,0,0"
                 />
                 </ScrollViewer>
             </Grid>
diff --git a/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml.cs b/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml.cs
index f79a0874f5..def8d1e36e 100644
--- a/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml.cs	
+++ b/Hearthstone Deck Tracker/MainWindow/MainWindow.xaml.cs	
@@ -815,19 +815,25 @@ public void UpdateDeckList(Deck selected)
 			}
 		}
 
-        private void UpdateDeckHistoryPanel(Deck selected)
+        private void UpdateDeckHistoryPanel(Deck selected, bool isNewDeck)
         {
             DeckHistoryPanel.Children.Clear();
-            DeckCurrentVersion.Text = "Current version is " + _newDeck.Version.Major.ToString();
-            IncraseVersion.IsChecked = true;  //increase by default
+            DeckCurrentVersion.Text = string.Format("v{0}.{1}",_newDeck.Version.Major, _newDeck.Version.Minor);
+	        ComboBoxVersionIncrement.ItemsSource = new List<string>
+			{
+				_newDeck.Version.ToString("v{M}.{m}"),
+                string.Format("v{0}.{1}", _newDeck.Version.Major, _newDeck.Version.Minor + 1),
+		        string.Format("v{0}.{1}", _newDeck.Version.Major + 1, 0)
+	        };
+	        ComboBoxVersionIncrement.SelectedIndex = isNewDeck ? 0 : 1;
+
             if (selected.Versions.Count > 0)
             {
                 Deck current = selected;
-                List<Card> history = new List<Card>();
                 foreach (Deck prevVersion in selected.Versions.OrderByDescending(d => d.Version))
                 {
-                    Controls.DeckVersionChange versionChange = new Controls.DeckVersionChange();
-                    versionChange.Label.Text = string.Format("{0} to {1}", prevVersion.Version.Major, current.Version.Major);
+                    var versionChange = new Controls.DeckVersionChange();
+                    versionChange.Label.Text = string.Format("{0} -> {1}", prevVersion.Version.ToString("v{M}.{m}"), current.Version.ToString("v{M}.{m}"));
                     versionChange.ListViewDeck.ItemsSource = current - prevVersion;
                     DeckHistoryPanel.Children.Add(versionChange);
                     current = prevVersion;
diff --git a/Hearthstone Deck Tracker/MainWindow/MainWindow_NewDeck.cs b/Hearthstone Deck Tracker/MainWindow/MainWindow_NewDeck.cs
index 97d6048bda..e17532ae61 100644
--- a/Hearthstone Deck Tracker/MainWindow/MainWindow_NewDeck.cs	
+++ b/Hearthstone Deck Tracker/MainWindow/MainWindow_NewDeck.cs	
@@ -146,11 +146,11 @@ private async void SaveDeck(bool overwrite)
 					return;
 			}
 
-            if (overwrite && IncraseVersion.IsChecked.HasValue && IncraseVersion.IsChecked.Value)
+            if (overwrite)
             {
-                _newDeck.Version = SerializableVersion.IncreaseMajor(_newDeck.Version);
+                _newDeck.Version = SerializableVersion.Parse(ComboBoxVersionIncrement.SelectedValue.ToString());
                 AddDeckHistory();
-                UpdateDeckHistoryPanel(_newDeck);
+                UpdateDeckHistoryPanel(_newDeck, false);
             }
 
 			if(EditingDeck && overwrite)
@@ -286,7 +286,7 @@ public void SetNewDeck(Deck deck, bool editing = false)
 				ListViewDeck.ItemsSource = _newDeck.Cards;
 				Helper.SortCardCollection(ListViewDeck.ItemsSource, false);
 				TextBoxDeckName.Text = _newDeck.Name;
-                UpdateDeckHistoryPanel(deck);
+                UpdateDeckHistoryPanel(deck, false);
                 UpdateDbListView();
 				ExpandNewDeck();
                 UpdateTitle();
@@ -388,7 +388,7 @@ private void CreateNewDeck(string hero)
 			ExpandNewDeck();
 			_newDeck = new Deck {Class = hero};
 			ListViewDeck.ItemsSource = _newDeck.Cards;
-            UpdateDeckHistoryPanel(_newDeck);
+            UpdateDeckHistoryPanel(_newDeck, true);
             ManaCurveMyDecks.SetDeck(_newDeck);
 			UpdateDbListView();
 		}
diff --git a/Hearthstone Deck Tracker/Stats/GameStats.cs b/Hearthstone Deck Tracker/Stats/GameStats.cs
index 402b4014e9..e96508627f 100644
--- a/Hearthstone Deck Tracker/Stats/GameStats.cs	
+++ b/Hearthstone Deck Tracker/Stats/GameStats.cs	
@@ -72,14 +72,17 @@ public string ResultString
 
 		[XmlIgnore]
         public SerializableVersion PlayerDeckVersion { get; set; }
-        public string PlayerDeckVersionMajor
+
+		[XmlIgnore]
+		public string PlayerDeckVersionString
         {
             get
             {
-                //can't fnd a way to bind PlayerDeckVersion.Major in datagrid
-                return PlayerDeckVersion != null ? PlayerDeckVersion.Major.ToString() : SerializableVersion.Default.Major.ToString();
+                return PlayerDeckVersion != null ? PlayerDeckVersion.ToString("v{M}.{m}") : SerializableVersion.Default.ToString("v{M}.{m}");
             }
-        }
+		}
+
+		[XmlIgnore]
 		public ToolTip ResultToolTip
 		{
 			get { return new ToolTip {Content = "conceded", Visibility = (WasConceded ? Visibility.Visible : Visibility.Hidden)}; }
diff --git a/Hearthstone Deck Tracker/Utility/SerializableVersion.cs b/Hearthstone Deck Tracker/Utility/SerializableVersion.cs
index effba2c5ae..e26332ec26 100644
--- a/Hearthstone Deck Tracker/Utility/SerializableVersion.cs	
+++ b/Hearthstone Deck Tracker/Utility/SerializableVersion.cs	
@@ -1,127 +1,141 @@
 #region
 
+using System;
 using System.Xml.Serialization;
 
 #endregion
 
 namespace Hearthstone_Deck_Tracker
 {
-    [XmlRoot("Version")]
-    public class SerializableVersion : System.IComparable
-    {
-        public int Build;
-        public int Major;
-        public int Minor;
-        public int Revision;
-
-        public SerializableVersion()
-        {
-        }
-
-        public SerializableVersion(int major, int minor)
-        {
-            Major = major;
-            Minor = minor;
-            Revision = 0;
-            Build = 0;
-        }
-
-        public SerializableVersion(System.Version v)
-        {
-            Major = v.Major;
-            Minor = v.Minor;
-            Revision = v.Revision;
-            Build = v.Build;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("{0}.{1}.{2}.{3}", Major, Minor, Revision, Build);
-        }
-
-        public override bool Equals(System.Object obj)
-        {
-            // If parameter is null return false.
-            if (obj == null)
-            {
-                return false;
-            }
-
-            // If parameter cannot be cast to Point return false.
-            SerializableVersion p = obj as SerializableVersion;
-            if ((System.Object)p == null)
-            {
-                return false;
-            }
-            // Return true if the fields match:
-            return this.Equals(p);
-        }
-
-        public bool Equals(SerializableVersion sv)
-        {
-            // If parameter is null return false:
-            if ((object)sv == null)
-            {
-                return false;
-            }
-
-            // Return true if the fields match:
-            return this.Major == sv.Major
-                && this.Minor == sv.Minor
-                && this.Revision == sv.Revision
-                && this.Build == sv.Build;
-        }
-
-        public static SerializableVersion IncreaseMajor(SerializableVersion sv)
-        {
-            return new SerializableVersion(sv.Major + 1, 0);
-        }
-
-        public static SerializableVersion IncreaseMinor(SerializableVersion sv)
-        {
-            return new SerializableVersion(sv.Major, sv.Minor + 1);
-        }
-
-        public static SerializableVersion Default { get { return new SerializableVersion(1, 0); } }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-
-        public int CompareTo(object obj)
-        {
-            SerializableVersion other = obj as SerializableVersion;
-            if (other == null)
-            {
-                return -1;
-            }
-
-            return new System.Version(Major, Minor, Build, Revision).CompareTo(
-                new System.Version(other.Major, other.Minor, other.Revision, other.Build));
-        }
-
-        public static bool operator ==(SerializableVersion a, SerializableVersion b)
-        {
-            // If both are null, or both are same instance, return true.
-            if (System.Object.ReferenceEquals(a, b))
-            {
-                return true;
-            }
-
-            // If one is null, but not both, return false.
-            if (((object)a == null) || ((object)b == null))
-            {
-                return false;
-            }
-
-            // Return true if the fields match:
-            return a.Equals(b);
-        }
-
-        public static bool operator !=(SerializableVersion a, SerializableVersion b)
-        {
-            return !(a == b);
-        }
-    }
+	[XmlRoot("Version")]
+	public class SerializableVersion : IComparable
+	{
+		public int Build;
+		public int Major;
+		public int Minor;
+		public int Revision;
+
+		public SerializableVersion()
+		{
+		}
+
+		public SerializableVersion(int major, int minor)
+		{
+			Major = major;
+			Minor = minor;
+			Revision = 0;
+			Build = 0;
+		}
+
+		public SerializableVersion(Version v)
+		{
+			Major = v.Major;
+			Minor = v.Minor;
+			Revision = v.Revision;
+			Build = v.Build;
+		}
+
+		public static SerializableVersion Default
+		{
+			get { return new SerializableVersion(1, 0); }
+		}
+
+		public int CompareTo(object obj)
+		{
+			var other = obj as SerializableVersion;
+			if(other == null)
+				return -1;
+
+			return new Version(Major, Minor, Build, Revision).CompareTo(new Version(other.Major, other.Minor, other.Revision, other.Build));
+		}
+
+		public override string ToString()
+		{
+			return string.Format("{0}.{1}.{2}.{3}", Major, Minor, Revision, Build);
+		}
+
+
+		/// <summary>
+		/// {M}: Major, {m}: Minor, {r}: Revision, {b}: Build
+		/// </summary>
+		/// <param name="format"></param>
+		/// <returns></returns>
+		public string ToString(string format)
+		{
+			return format.Replace("{M}", Major.ToString())
+			             .Replace("{m}", Minor.ToString())
+			             .Replace("{r}", Revision.ToString())
+			             .Replace("{b}", Build.ToString());
+		}
+
+		public override bool Equals(Object obj)
+		{
+			// If parameter is null return false.
+			if(obj == null)
+				return false;
+
+			// If parameter cannot be cast to Point return false.
+			var p = obj as SerializableVersion;
+			if((Object)p == null)
+				return false;
+			// Return true if the fields match:
+			return this.Equals(p);
+		}
+
+		public bool Equals(SerializableVersion sv)
+		{
+			// If parameter is null return false:
+			if((object)sv == null)
+				return false;
+
+			// Return true if the fields match:
+			return this.Major == sv.Major && this.Minor == sv.Minor && this.Revision == sv.Revision && this.Build == sv.Build;
+		}
+
+		public static SerializableVersion IncreaseMajor(SerializableVersion sv)
+		{
+			return new SerializableVersion(sv.Major + 1, 0);
+		}
+
+		public static SerializableVersion IncreaseMinor(SerializableVersion sv)
+		{
+			return new SerializableVersion(sv.Major, sv.Minor + 1);
+		}
+
+		public override int GetHashCode()
+		{
+			return base.GetHashCode();
+		}
+
+		public static bool operator ==(SerializableVersion a, SerializableVersion b)
+		{
+			// If both are null, or both are same instance, return true.
+			if(ReferenceEquals(a, b))
+				return true;
+
+			// If one is null, but not both, return false.
+			if(((object)a == null) || ((object)b == null))
+				return false;
+
+			// Return true if the fields match:
+			return a.Equals(b);
+		}
+
+		public static bool operator !=(SerializableVersion a, SerializableVersion b)
+		{
+			return !(a == b);
+		}
+
+		public static SerializableVersion Parse(string verionString)
+		{
+			try
+			{
+				return new SerializableVersion(Version.Parse(verionString.Replace("v", "")));
+			}
+			catch(Exception ex)
+			{
+				throw new Exception("Invalid version string", ex);
+			}
+		}
+	}
 }
\ No newline at end of file