From fdacbd9b8f2e49d96f361fd875593700de3fdf36 Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Fri, 2 Aug 2019 10:58:18 +0200
Subject: [PATCH 1/8] Add listview

---
 .../StatisticsAnalysisTool/App.xaml           |   9 +-
 .../StatisticsAnalysisTool/ItemWindow.xaml    |  39 ++++---
 .../StatisticsAnalysisTool/ItemWindow.xaml.cs | 105 ++++++++++++------
 3 files changed, 107 insertions(+), 46 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index cde73635f..67f73f3ae 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -73,6 +73,10 @@
         
         <!-- City Styles -->
         <Style TargetType="Label" x:Key="CaerleonStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -82,7 +86,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        
+
         <Style TargetType="Label" x:Key="ThetfordStyle" >
             <Setter Property="Background">
                 <Setter.Value>
@@ -324,6 +328,9 @@
         </Style>
         <Style TargetType="{x:Type ListViewItem}">
             <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="Padding" Value="0"/>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
                     <Setter Property="Background" Value="{StaticResource Item.MouseOver.Background}" />
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
index c0e45d139..94f8878da 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
@@ -24,17 +24,31 @@
             <CheckBox x:Name="ChbAutoUpdateData" Content="Auto Daten Update" IsChecked="True" Margin="625,43,0,0" VerticalContentAlignment="Center" HorizontalAlignment="Left" Width="150" Height="26" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}" />
             <Label x:Name="LblLastUpdate" Content="LAST__UPDATE" Margin="0,43,10,0" VerticalAlignment="Top" ToolTip="Letzte Aktualisierung" Foreground="{StaticResource SolidColorBrush.Foreground.First}" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Width="230"/>
         </Grid>
-        <Grid Margin="0,85,0,0" Height="35" VerticalAlignment="Top">
-            <Label x:Name="LblCityTitel" Content="Stadt" Style="{StaticResource Price.List.Column.Style}" Margin="10,5,0,0" Width="150"/>
-            <Label x:Name="LblSellPriceMin" Content="Min Verkaufspreis" Style="{StaticResource Price.List.Column.Style}" Margin="168,5,0,0" Width="120"/>
-            <Label x:Name="LblSellPriceMinDate" Content="Min Vkp Datum" Style="{StaticResource Price.List.Column.Style}" Margin="293,5,0,0" Width="120"/>
-            <Label x:Name="LblSellPriceMax" Content="Max Verkaufspreis" Style="{StaticResource Price.List.Column.Style}" Margin="418,5,0,0" Width="120"/>
-            <Label x:Name="LblSellPriceMaxDate" Content="Max Vkp Datum" Style="{StaticResource Price.List.Column.Style}" Margin="543,5,0,0" Width="120"/>
-            <Label x:Name="LblBuyPriceMin" Content="Min Kaufpreis" Style="{StaticResource Price.List.Column.Style}" Margin="668,5,0,0" Width="120"/>
-            <Label x:Name="LblBuyPriceMinDate" Content="Min Kp Datum" Style="{StaticResource Price.List.Column.Style}" Margin="793,5,0,0" Width="120"/>
-            <Label x:Name="LblBuyPriceMax" Content="Max Kaufpreis" Style="{StaticResource Price.List.Column.Style}" Margin="918,5,0,0" Width="120"/>
-            <Label x:Name="LblBuyPriceMaxDate" Content="Max Kp Datum" Style="{StaticResource Price.List.Column.Style}" Margin="1043,5,0,0" Width="120"/>
-        </Grid>
+
+        <Button Content="Button" HorizontalAlignment="Left" Height="28" Margin="765,10,0,0" VerticalAlignment="Top" Width="91" Click="Button_Click_1"/>
+        <ListView x:Name="ListViewPrices" HorizontalAlignment="Left" Height="207" Margin="1,85,1,0" VerticalAlignment="Top" Width="1177" BorderThickness="0" SelectionMode="Single">
+            <ListView.View>
+                <GridView>
+                    <GridViewColumn x:Name="GvcCityTitel" Header="CITY" Width="160">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Label Height="28" Width="150" Margin="0" Content="{Binding Name}" Style="{Binding CityStyle}"/>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcSellPriceMin" Header="SELL_PRICE_MIN" Width="120" DisplayMemberBinding="{Binding SellPriceMin}" />
+                    <GridViewColumn x:Name="GvcSellPriceMinDate" Header="SELL_PRICE_MIN_DATE" Width="120" DisplayMemberBinding="{Binding SellPriceMinDate}" />
+                    <GridViewColumn x:Name="GvcSellPriceMax" Header="SELL_PRICE_MAX" Width="120" DisplayMemberBinding="{Binding SellPriceMax}" />
+                    <GridViewColumn x:Name="GvcSellPriceMaxDate" Header="SELL_PRICE_MAX_DATE" Width="120" DisplayMemberBinding="{Binding SellPriceMaxDate}" />
+                    <GridViewColumn x:Name="GvcBuyPriceMin" Header="BUY_PRICE_MIN" Width="120" DisplayMemberBinding="{Binding BuyPriceMin}" />
+                    <GridViewColumn x:Name="GvcBuyPriceMinDate" Header="BUY_PRICE_MIN_DATE" Width="120" DisplayMemberBinding="{Binding BuyPriceMinDate}" />
+                    <GridViewColumn x:Name="GvcBuyPriceMax" Header="BUY_PRICE_MAX" Width="120" DisplayMemberBinding="{Binding BuyPriceMax}" />
+                    <GridViewColumn x:Name="GvcBuyPriceMaxDate" Header="BUY_PRICE_MMAX_DATE" Width="120" DisplayMemberBinding="{Binding BuyPriceMaxDate}" />
+                </GridView>
+            </ListView.View>
+        </ListView>
+
+        <StackPanel Visibility="Hidden" x:Name="SpStats" Margin="0,120,0,0"/>
 
         <Grid ZIndex="1" Height="35" VerticalAlignment="Bottom" Margin="1,0,1,1">
             <Grid.Background>
@@ -50,9 +64,6 @@
                 <Hyperlink NavigateUri="https://www.albion-online-data.com/" Foreground="{StaticResource SolidColorBrush.Hyperlink.First}" FontWeight="Bold" BaselineAlignment="Center" RequestNavigate="Hyperlink_RequestNavigate">Albion Online Data Project</Hyperlink>
             </TextBlock>
         </Grid>
-
-        <Separator Height="16" Margin="10,109,10,0" VerticalAlignment="Top"/>
-        <StackPanel x:Name="SpStats" Margin="0,120,0,0"/>
     </Grid>
 
 </Window>
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
index 00b3b2c50..5a8326f07 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
@@ -9,6 +9,9 @@
 using System.Windows.Media;
 using StatisticsAnalysisTool.Models;
 using StatisticsAnalysisTool.Utilities;
+using Color = System.Windows.Media.Color;
+using ColorConverter = System.Windows.Media.ColorConverter;
+using Image = System.Windows.Controls.Image;
 
 namespace StatisticsAnalysisTool
 {
@@ -40,15 +43,15 @@ private void Translation()
             ChbShowVillages.Content = LanguageController.Translation("SHOW_VILLAGES");
             ChbAutoUpdateData.Content = LanguageController.Translation("AUTO_UPDATE_DATA");
             LblLastUpdate.ToolTip = LanguageController.Translation("LAST_UPDATE");
-            LblCityTitel.Content = LanguageController.Translation("CITY");
-            LblSellPriceMin.Content = LanguageController.Translation("SELL_PRICE_MIN");
-            LblSellPriceMinDate.Content = LanguageController.Translation("SELL_PRICE_MIN_DATE");
-            LblSellPriceMax.Content = LanguageController.Translation("SELL_PRICE_MAX");
-            LblSellPriceMaxDate.Content = LanguageController.Translation("SELL_PRICE_MAX_DATE");
-            LblBuyPriceMin.Content = LanguageController.Translation("BUY_PRICE_MIN");
-            LblBuyPriceMinDate.Content = LanguageController.Translation("BUY_PRICE_MIN_DATE");
-            LblBuyPriceMax.Content = LanguageController.Translation("BUY_PRICE_MAX");
-            LblBuyPriceMaxDate.Content = LanguageController.Translation("BUY_PRICE_MAX_DATE");
+            GvcCityTitel.Header = LanguageController.Translation("CITY");
+            GvcSellPriceMin.Header = LanguageController.Translation("SELL_PRICE_MIN");
+            GvcSellPriceMinDate.Header = LanguageController.Translation("SELL_PRICE_MIN_DATE");
+            GvcSellPriceMax.Header = LanguageController.Translation("SELL_PRICE_MAX");
+            GvcSellPriceMaxDate.Header = LanguageController.Translation("SELL_PRICE_MAX_DATE");
+            GvcBuyPriceMin.Header = LanguageController.Translation("BUY_PRICE_MIN");
+            GvcBuyPriceMinDate.Header = LanguageController.Translation("BUY_PRICE_MIN_DATE");
+            GvcBuyPriceMax.Header = LanguageController.Translation("BUY_PRICE_MAX");
+            GvcBuyPriceMaxDate.Header = LanguageController.Translation("BUY_PRICE_MAX_DATE");
             LblDifCalcName.Content = $"{LanguageController.Translation("DIFFERENT_CALCULATION")}:";
         }
 
@@ -59,38 +62,41 @@ private async void InitializeItemData(Item item)
 
             _uniqueName = item.UniqueName;
 
-            await Dispatcher.InvokeAsync(() =>
-            {
-                FaLoadIcon.Visibility = Visibility.Visible;
+            if (Dispatcher == null)
+                return;
 
-                Icon = item.Icon;
-            });
+            await Dispatcher.InvokeAsync(() =>
+                {
+                    FaLoadIcon.Visibility = Visibility.Visible;
+                    Icon = item.Icon;
+                });
 
             StartAutoUpdater();
 
             var itemDataTaskResult = await StatisticsAnalysisManager.GetItemDataFromJsonAsync(item);
-            
+
             if (itemDataTaskResult == null)
             {
                 LblItemName.Content = LanguageController.Translation("ERROR_PRICES_CAN_NOT_BE_LOADED");
-                Dispatcher.Invoke(() =>
-                {
-                    FaLoadIcon.Visibility = Visibility.Hidden;
-                });
+                Dispatcher?.Invoke(() => { FaLoadIcon.Visibility = Visibility.Hidden; });
                 return;
             }
 
             _itemData = itemDataTaskResult;
-            
+
+            if (Dispatcher == null)
+                return;
+
             await Dispatcher.InvokeAsync(() =>
-            {
-                Title = $"{_itemData.LocalizedName} (T{_itemData.Tier})";
-                LblItemName.Content = $"{_itemData.LocalizedName} (T{_itemData.Tier})";
-                LblItemId.Content = _itemData.UniqueName;
-                ImgItemImage.Source = item.Icon;
+                {
+                    Title = $"{_itemData.LocalizedName} (T{_itemData.Tier})";
+                    LblItemName.Content = $"{_itemData.LocalizedName} (T{_itemData.Tier})";
+                    LblItemId.Content = _itemData.UniqueName;
+                    ImgItemImage.Source = item.Icon;
 
-                FaLoadIcon.Visibility = Visibility.Hidden;
-            });
+                    FaLoadIcon.Visibility = Visibility.Hidden;
+                });
+        
         }
 
         private void StartAutoUpdater()
@@ -103,9 +109,9 @@ private void StartAutoUpdater()
                 while (_runUpdate)
                 {
                     await Task.Delay(500);
-                    if (Dispatcher.Invoke(() => !ChbAutoUpdateData.IsChecked ?? false))
+                    if (Dispatcher != null && Dispatcher.Invoke(() => !ChbAutoUpdateData.IsChecked ?? false))
                         continue;
-                    GetPriceStats(_uniqueName, Dispatcher.Invoke(() => ChbShowVillages.IsChecked ?? false));
+                    GetPriceStats(_uniqueName, Dispatcher != null && Dispatcher.Invoke(() => ChbShowVillages.IsChecked ?? false));
                     await Task.Delay(StatisticsAnalysisManager.RefreshRate - 500);
                 }
                 _isAutoUpdateActive = false;
@@ -125,7 +131,7 @@ await Task.Run(async () =>
                 if (statPricesList == null)
                     return;
 
-                Dispatcher.Invoke(() =>
+                Dispatcher?.Invoke(() =>
                 {
                     foreach (var stats in statPricesList)
                     {
@@ -175,7 +181,6 @@ await Task.Run(async () =>
 
                     LblLastUpdate.Content = Utility.DateFormat(DateTime.Now, 0);
                 });
-
             });
         }
 
@@ -227,6 +232,14 @@ private void FindBestPrice(ref List<MarketResponseTotal> list)
 
         private void CreateGridElement(MarketResponseTotal stats)
         {
+
+
+
+
+
+             // ----------------------
+
+
             var textColor = new SolidColorBrush(Colors.Gainsboro);
             
             var bestPriceLabelStyle = FindResource("BestPriceLabel") as Style;
@@ -490,5 +503,35 @@ private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.
             Process.Start(e.Uri.AbsoluteUri);
         }
 
+
+        // TEST ------------------------
+
+        private List<ListViewItem> _items = new List<ListViewItem>();
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            for (var i = 1; i < 5; i++)
+            {
+                var oneItem = new ListViewItem();
+                oneItem.Content = new PriceItem()
+                {
+                    Name = "John",
+                    Alter = 32,
+                    CityStyle = FindResource("CaerleonStyle") as Style
+                };
+                _items.Add(oneItem);
+                ListViewPrices.ItemsSource = _items;
+            }
+            ListViewPrices.Items.Refresh();
+        }
+        public class PriceItem
+        {
+            public string Name { get; set; }
+            public int Alter { get; set; }
+
+            public Style CityStyle { get; set; }
+
+        public SolidColorBrush Color => new SolidColorBrush(Colors.Gold);
+        }
+
     }
 }
\ No newline at end of file

From 4b67bd176748b7624648d92ff8d15311bbcaf494 Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Fri, 2 Aug 2019 12:27:29 +0200
Subject: [PATCH 2/8] Add new coulmn styles

---
 .../StatisticsAnalysisTool/App.xaml           |  89 +++++++++++++--
 .../StatisticsAnalysisTool/ItemWindow.xaml    | 103 ++++++++++++++++--
 .../StatisticsAnalysisTool/ItemWindow.xaml.cs |  36 ++++--
 3 files changed, 196 insertions(+), 32 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index 67f73f3ae..9c7baad19 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -86,8 +86,11 @@
                 </Setter.Value>
             </Setter>
         </Style>
-
         <Style TargetType="Label" x:Key="ThetfordStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -97,8 +100,11 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        
         <Style TargetType="Label" x:Key="BridgewatchStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -108,8 +114,11 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        
         <Style TargetType="Label" x:Key="MartlockStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -119,8 +128,11 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        
         <Style TargetType="Label" x:Key="LymhurstStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -130,8 +142,11 @@
                 </Setter.Value>
             </Setter>
         </Style>
-
         <Style TargetType="Label" x:Key="FortSterlingStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -141,19 +156,69 @@
                 </Setter.Value>
             </Setter>
         </Style>
-
         <Style TargetType="Label" x:Key="DefaultCityStyle" >
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Width" Value="150" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
         </Style>
 
-        <!-- Image price silver -->
-        <Style TargetType="Image" x:Key="Image.Price.Silver" >
-            <Setter Property="HorizontalAlignment" Value="Left"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="Height" Value="26"/>
-            <Setter Property="Width" Value="26"/>
+        <!-- Grid stackPanel item price -->
+        <Style x:Key="ListView.Grid.Item.Price" TargetType="Grid">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="Height" Value="24"/>
+            <Setter Property="Width" Value="110"/>
+        </Style>
+
+        <!-- Grid stackPanel item date -->
+        <Style x:Key="ListView.Grid.Item.Date" TargetType="Grid">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="Height" Value="24"/>
+            <Setter Property="Width" Value="120"/>
+        </Style>
+
+        <!-- ListView grid stackPanel item price -->
+        <Style TargetType="StackPanel" x:Key="ListView.Grid.StackPanel.Item.Price">
+            <Setter Property="Width" Value="92"></Setter>
+            <Setter Property="Orientation" Value="Horizontal"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+            <Setter Property="Margin" Value="0"></Setter>
+        </Style>
+
+        <!-- ListView grid stackPanel image price silver -->
+        <Style TargetType="Image" x:Key="ListView.Grid.StackPanel.Image.Price.Silver" >
+            <Setter Property="Height" Value="20"/>
+            <Setter Property="Width" Value="20"/>
             <Setter Property="Source" Value="Resources/silver.png"/>
         </Style>
 
+        <!-- ListView grid stackPanel item icon -->
+        <Style TargetType="StackPanel" x:Key="ListView.Grid.StackPanel.Item.Icon">
+            <Setter Property="Orientation" Value="Horizontal"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Right"></Setter>
+            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+            <Setter Property="Margin" Value="0"></Setter>
+        </Style>
+
+        <!-- ListView grid label date -->
+        <Style TargetType="Label" x:Key="ListView.Grid.Label.Date">
+            <Setter Property="Width" Value="120"></Setter>
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="VerticalAlignment" Value="Center"></Setter>
+            <Setter Property="Margin" Value="0"></Setter>
+        </Style>
+
+        <!-- ListView grid stackPanel label price -->
+        <Style TargetType="Label" x:Key="ListView.Grid.StackPanel.Label.Price">
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}"></Setter>
+            <Setter Property="Margin" Value="0"></Setter>
+        </Style>
+
+
         <!-- Primary Window -->
         <Style x:Key="PrimaryWindow" TargetType="Window">
             <Setter Property="BorderThickness" Value="1,1,1,1" />
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
index 94f8878da..8ad4c4365 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
@@ -26,7 +26,7 @@
         </Grid>
 
         <Button Content="Button" HorizontalAlignment="Left" Height="28" Margin="765,10,0,0" VerticalAlignment="Top" Width="91" Click="Button_Click_1"/>
-        <ListView x:Name="ListViewPrices" HorizontalAlignment="Left" Height="207" Margin="1,85,1,0" VerticalAlignment="Top" Width="1177" BorderThickness="0" SelectionMode="Single">
+        <ListView x:Name="ListViewPrices" Margin="1,80,1,41" BorderThickness="0" SelectionMode="Single" Foreground="{StaticResource SolidColorBrush.Foreground.First}">
             <ListView.View>
                 <GridView>
                     <GridViewColumn x:Name="GvcCityTitel" Header="CITY" Width="160">
@@ -36,14 +36,99 @@
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn x:Name="GvcSellPriceMin" Header="SELL_PRICE_MIN" Width="120" DisplayMemberBinding="{Binding SellPriceMin}" />
-                    <GridViewColumn x:Name="GvcSellPriceMinDate" Header="SELL_PRICE_MIN_DATE" Width="120" DisplayMemberBinding="{Binding SellPriceMinDate}" />
-                    <GridViewColumn x:Name="GvcSellPriceMax" Header="SELL_PRICE_MAX" Width="120" DisplayMemberBinding="{Binding SellPriceMax}" />
-                    <GridViewColumn x:Name="GvcSellPriceMaxDate" Header="SELL_PRICE_MAX_DATE" Width="120" DisplayMemberBinding="{Binding SellPriceMaxDate}" />
-                    <GridViewColumn x:Name="GvcBuyPriceMin" Header="BUY_PRICE_MIN" Width="120" DisplayMemberBinding="{Binding BuyPriceMin}" />
-                    <GridViewColumn x:Name="GvcBuyPriceMinDate" Header="BUY_PRICE_MIN_DATE" Width="120" DisplayMemberBinding="{Binding BuyPriceMinDate}" />
-                    <GridViewColumn x:Name="GvcBuyPriceMax" Header="BUY_PRICE_MAX" Width="120" DisplayMemberBinding="{Binding BuyPriceMax}" />
-                    <GridViewColumn x:Name="GvcBuyPriceMaxDate" Header="BUY_PRICE_MMAX_DATE" Width="120" DisplayMemberBinding="{Binding BuyPriceMaxDate}" />
+                    <GridViewColumn x:Name="GvcSellPriceMin" Header="SELL_PRICE_MIN" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Price}">
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
+                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding SellPriceMin}"/>
+                                    </StackPanel>
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
+                                        <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcSellPriceMinDate" Header="SELL_PRICE_MIN_DATE" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Date}">
+                                    <Label Style="{StaticResource ListView.Grid.Label.Date}" Content="{Binding SellPriceMinDate}"/>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcSellPriceMax" Header="SELL_PRICE_MAX" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Price}">
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
+                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding SellPriceMax}"/>
+                                    </StackPanel>
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
+                                        <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcSellPriceMaxDate" Header="SELL_PRICE_MAX_DATE" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Date}">
+                                    <Label Style="{StaticResource ListView.Grid.Label.Date}" Content="{Binding SellPriceMaxDate}"/>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcBuyPriceMin" Header="BUY_PRICE_MIN" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Price}">
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
+                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding BuyPriceMin}"/>
+                                    </StackPanel>
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
+                                        <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcBuyPriceMinDate" Header="BUY_PRICE_MIN_DATE" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Date}">
+                                    <Label Style="{StaticResource ListView.Grid.Label.Date}" Content="{Binding BuyPriceMinDate}"/>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+
+                    <GridViewColumn x:Name="GvcBuyPriceMax" Header="BUY_PRICE_MAX" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Price}">
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Price}">
+                                        <Label Style="{StaticResource ListView.Grid.StackPanel.Label.Price}" Content="{Binding BuyPriceMax}"/>
+                                    </StackPanel>
+                                    <StackPanel Style="{StaticResource ListView.Grid.StackPanel.Item.Icon}">
+                                        <Image Style="{StaticResource ListView.Grid.StackPanel.Image.Price.Silver}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn x:Name="GvcBuyPriceMaxDate" Header="BUY_PRICE_MMAX_DATE" Width="120">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <Grid Style="{StaticResource ListView.Grid.Item.Date}">
+                                    <Label Style="{StaticResource ListView.Grid.Label.Date}" Content="{Binding BuyPriceMaxDate}"/>
+                                </Grid>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
                 </GridView>
             </ListView.View>
         </ListView>
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
index 5a8326f07..26b17350c 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
@@ -171,11 +171,13 @@ await Task.Run(async () =>
 
                     FindBestPrice(ref _statsPricesTotalList);
 
-                    SpStats.Children.Clear();
-                    foreach (var spt in _statsPricesTotalList)
-                    {
-                        CreateGridElement(spt);
-                    }
+
+
+                    //SpStats.Children.Clear();
+                    //foreach (var spt in _statsPricesTotalList)
+                    //{
+                    //    CreateGridElement(spt);
+                    //}
 
                     SetDifferenceCalculationText(_statsPricesTotalList);
 
@@ -234,10 +236,22 @@ private void CreateGridElement(MarketResponseTotal stats)
         {
 
 
+            for (var i = 1; i < 5; i++)
+            {
+                var oneItem = new ListViewItem();
+                oneItem.Content = new PriceItem()
+                {
+                    Name = "John",
+                    Alter = 32,
+                    CityStyle = FindResource("CaerleonStyle") as Style
+                };
+                _items.Add(oneItem);
+                ListViewPrices.ItemsSource = _items;
+            }
+            ListViewPrices.Items.Refresh();
 
 
-
-             // ----------------------
+            // ----------------------
 
 
             var textColor = new SolidColorBrush(Colors.Gainsboro);
@@ -302,7 +316,7 @@ private void CreateGridElement(MarketResponseTotal stats)
             silverImages.Add(new Image
             {
                 Margin = new Thickness(168, 0, 0, 0),
-                Style = FindResource("Image.Price.Silver") as Style
+                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
             });
 
             var lblSellPriceMax = new Label
@@ -319,7 +333,7 @@ private void CreateGridElement(MarketResponseTotal stats)
             silverImages.Add(new Image
             {
                 Margin = new Thickness(418, 0, 0, 0),
-                Style = FindResource("Image.Price.Silver") as Style
+                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
             });
 
             var lblBuyPriceMin = new Label
@@ -336,7 +350,7 @@ private void CreateGridElement(MarketResponseTotal stats)
             silverImages.Add(new Image
             {
                 Margin = new Thickness(668, 0, 0, 0),
-                Style = FindResource("Image.Price.Silver") as Style
+                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
             });
 
             var lblBuyPriceMax = new Label
@@ -354,7 +368,7 @@ private void CreateGridElement(MarketResponseTotal stats)
             silverImages.Add(new Image
             {
                 Margin = new Thickness(918, 0, 0, 0),
-                Style = FindResource("Image.Price.Silver") as Style
+                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
             });
 
             var lblSellPriceMinDate = new Label

From d7a5fc93d5f0df7ff17aa66d534ca27ea15f7948 Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Fri, 2 Aug 2019 12:34:28 +0200
Subject: [PATCH 3/8] Add new Model

---
 .../StatisticsAnalysisTool/ItemWindow.xaml.cs | 10 ++++
 .../Models/MarketOrder.cs                     | 53 +++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
index 26b17350c..91f9ff4d9 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
@@ -171,6 +171,16 @@ await Task.Run(async () =>
 
                     FindBestPrice(ref _statsPricesTotalList);
 
+                    // --- NEW ---
+
+                    
+
+                    ListViewPrices.ItemsSource = null;
+
+                    // --- --- ---
+
+
+
 
 
                     //SpStats.Children.Clear();
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
index 2a1ad45ab..e41e155ea 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Windows;
 using Newtonsoft.Json;
 
 namespace StatisticsAnalysisTool.Models
@@ -100,4 +101,56 @@ public class MarketResponseTotal
         public bool BestBuyMinPrice { get; set; }
         public bool BestBuyMaxPrice { get; set; }
     }
+
+    public class MarketCurrentPricesItem
+    {
+        public string ItemTypeId { get; set; }
+        public Location City { get; set; }
+        public byte QualityLevel { get; set; }
+        public ulong SellPriceMin { get; set; }
+        public DateTime SellPriceMinDate { get; set; }
+        public ulong SellPriceMax { get; set; }
+        public DateTime SellPriceMaxDate { get; set; }
+        public ulong BuyPriceMin { get; set; }
+        public DateTime BuyPriceMinDate { get; set; }
+        public ulong BuyPriceMax { get; set; }
+        public DateTime BuyPriceMaxDate { get; set; }
+
+        public bool BestSellMinPrice { get; set; }
+        public bool BestSellMaxPrice { get; set; }
+        public bool BestBuyMinPrice { get; set; }
+        public bool BestBuyMaxPrice { get; set; }
+
+        public Style CityStyle
+        {
+            get
+            {
+                switch (City)
+                {
+                    case Location.Caerleon:
+                        Style style aa;
+                        style = FindResource("CaerleonStyle") as Style;
+                        break;
+                    case Location.Thetford:
+                        lblCity.Style = FindResource("ThetfordStyle") as Style;
+                        break;
+                    case Location.Bridgewatch:
+                        lblCity.Style = FindResource("BridgewatchStyle") as Style;
+                        break;
+                    case Location.Martlock:
+                        lblCity.Style = FindResource("MartlockStyle") as Style;
+                        break;
+                    case Location.Lymhurst:
+                        lblCity.Style = FindResource("LymhurstStyle") as Style;
+                        break;
+                    case Location.FortSterling:
+                        lblCity.Style = FindResource("FortSterlingStyle") as Style;
+                        break;
+                    default:
+                        lblCity.Style = FindResource("DefaultCityStyle") as Style;
+                        break;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

From b7d0e184d74a550b81b6098d43532fdb17829d11 Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Wed, 7 Aug 2019 11:10:41 +0200
Subject: [PATCH 4/8] Add new marketResponse data calculation + cleanup code

---
 .../StatisticsAnalysisTool/App.xaml           |   7 +
 .../StatisticsAnalysisTool/ItemWindow.xaml    |   6 +-
 .../StatisticsAnalysisTool/ItemWindow.xaml.cs | 346 +++---------------
 .../Models/MarketOrder.cs                     |  49 ++-
 4 files changed, 94 insertions(+), 314 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index 9c7baad19..db405e932 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -77,6 +77,7 @@
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -91,6 +92,7 @@
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -105,6 +107,7 @@
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -119,6 +122,7 @@
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -133,6 +137,7 @@
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -147,6 +152,7 @@
             <Setter Property="Width" Value="150" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush EndPoint="1,0" MappingMode="RelativeToBoundingBox" StartPoint="0.5,0">
@@ -159,6 +165,7 @@
         <Style TargetType="Label" x:Key="DefaultCityStyle" >
             <Setter Property="Height" Value="28" />
             <Setter Property="Width" Value="150" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Top" />
         </Style>
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
index 8ad4c4365..eb1aefb95 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
@@ -24,15 +24,13 @@
             <CheckBox x:Name="ChbAutoUpdateData" Content="Auto Daten Update" IsChecked="True" Margin="625,43,0,0" VerticalContentAlignment="Center" HorizontalAlignment="Left" Width="150" Height="26" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}" />
             <Label x:Name="LblLastUpdate" Content="LAST__UPDATE" Margin="0,43,10,0" VerticalAlignment="Top" ToolTip="Letzte Aktualisierung" Foreground="{StaticResource SolidColorBrush.Foreground.First}" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Width="230"/>
         </Grid>
-
-        <Button Content="Button" HorizontalAlignment="Left" Height="28" Margin="765,10,0,0" VerticalAlignment="Top" Width="91" Click="Button_Click_1"/>
         <ListView x:Name="ListViewPrices" Margin="1,80,1,41" BorderThickness="0" SelectionMode="Single" Foreground="{StaticResource SolidColorBrush.Foreground.First}">
             <ListView.View>
                 <GridView>
                     <GridViewColumn x:Name="GvcCityTitel" Header="CITY" Width="160">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <Label Height="28" Width="150" Margin="0" Content="{Binding Name}" Style="{Binding CityStyle}"/>
+                                <Label Height="28" Width="150" Margin="0" Content="{Binding City}" Style="{Binding CityStyle}"/>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
@@ -133,8 +131,6 @@
             </ListView.View>
         </ListView>
 
-        <StackPanel Visibility="Hidden" x:Name="SpStats" Margin="0,120,0,0"/>
-
         <Grid ZIndex="1" Height="35" VerticalAlignment="Bottom" Margin="1,0,1,1">
             <Grid.Background>
                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
index 91f9ff4d9..4eeb6c5b6 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
@@ -66,10 +66,10 @@ private async void InitializeItemData(Item item)
                 return;
 
             await Dispatcher.InvokeAsync(() =>
-                {
-                    FaLoadIcon.Visibility = Visibility.Visible;
-                    Icon = item.Icon;
-                });
+            {
+                FaLoadIcon.Visibility = Visibility.Visible;
+                Icon = item.Icon;
+            });
 
             StartAutoUpdater();
 
@@ -99,9 +99,9 @@ await Dispatcher.InvokeAsync(() =>
         
         }
 
-        private void StartAutoUpdater()
+        private async void StartAutoUpdater()
         {
-            Task.Run(async () => {
+            await Task.Run(async () => {
                 if (_isAutoUpdateActive)
                     return;
 
@@ -125,75 +125,69 @@ private async void GetPriceStats(string uniqueName, bool showVillages = false)
 
             await Task.Run(async () =>
             {
-                _statsPricesTotalList.Clear();
                 var statPricesList = await StatisticsAnalysisManager.GetItemPricesFromJsonAsync(uniqueName, showVillages);
 
                 if (statPricesList == null)
                     return;
 
-                Dispatcher?.Invoke(() =>
-                {
-                    foreach (var stats in statPricesList)
-                    {
-                        if (_statsPricesTotalList.Exists(s => Locations.GetName(s.City) == stats.City))
-                        {
-                            var spt = _statsPricesTotalList.Find(s => Locations.GetName(s.City) == stats.City);
-                            if (stats.SellPriceMin < spt.SellPriceMin)
-                                spt.SellPriceMin = stats.SellPriceMin;
-
-                            if (stats.SellPriceMax > spt.SellPriceMax)
-                                spt.SellPriceMax = stats.SellPriceMax;
-
-                            if (stats.BuyPriceMin < spt.BuyPriceMin)
-                                spt.BuyPriceMin = stats.BuyPriceMin;
-
-                            if (stats.BuyPriceMax > spt.BuyPriceMax)
-                                spt.BuyPriceMax = stats.BuyPriceMax;
-                        }
-                        else
-                        {
-                            var newSpt = new MarketResponseTotal()
-                            {
-                                City = Locations.GetName(stats.City),
-                                SellPriceMin = stats.SellPriceMin,
-                                SellPriceMax = stats.SellPriceMax,
-                                BuyPriceMin = stats.BuyPriceMin,
-                                BuyPriceMax = stats.BuyPriceMax,
-                                SellPriceMinDate = stats.SellPriceMinDate,
-                                SellPriceMaxDate = stats.SellPriceMaxDate,
-                                BuyPriceMinDate = stats.BuyPriceMinDate,
-                                BuyPriceMaxDate = stats.BuyPriceMaxDate,
-                            };
-
-                            _statsPricesTotalList.Add(newSpt);
-                        }
-                    }
+                var statsPricesTotalList = PriceUpdate(statPricesList);
 
-                    FindBestPrice(ref _statsPricesTotalList);
+                FindBestPrice(ref statsPricesTotalList);
 
-                    // --- NEW ---
-
-                    
-
-                    ListViewPrices.ItemsSource = null;
-
-                    // --- --- ---
+                var marketCurrentPricesItemList = new List<MarketCurrentPricesItem>();
+                foreach (var item in statsPricesTotalList)
+                    marketCurrentPricesItemList.Add(new MarketCurrentPricesItem(item));
 
+                Dispatcher?.Invoke(() =>
+                {
+                    ListViewPrices.ItemsSource = marketCurrentPricesItemList;
+                    SetDifferenceCalculationText(statsPricesTotalList);
+                    LblLastUpdate.Content = Utility.DateFormat(DateTime.Now, 0);
+                });
+            });
+        }
 
+        private List<MarketResponseTotal> PriceUpdate(List<MarketResponse> statPricesList)
+        {
+            var statsPricesTotalList = new List<MarketResponseTotal>();
 
+            foreach (var stats in statPricesList)
+            {
+                if (statsPricesTotalList.Exists(s => Locations.GetName(s.City) == stats.City))
+                {
+                    var spt = statsPricesTotalList.Find(s => Locations.GetName(s.City) == stats.City);
+                    if (stats.SellPriceMin < spt.SellPriceMin)
+                        spt.SellPriceMin = stats.SellPriceMin;
 
+                    if (stats.SellPriceMax > spt.SellPriceMax)
+                        spt.SellPriceMax = stats.SellPriceMax;
 
-                    //SpStats.Children.Clear();
-                    //foreach (var spt in _statsPricesTotalList)
-                    //{
-                    //    CreateGridElement(spt);
-                    //}
+                    if (stats.BuyPriceMin < spt.BuyPriceMin)
+                        spt.BuyPriceMin = stats.BuyPriceMin;
 
-                    SetDifferenceCalculationText(_statsPricesTotalList);
+                    if (stats.BuyPriceMax > spt.BuyPriceMax)
+                        spt.BuyPriceMax = stats.BuyPriceMax;
+                }
+                else
+                {
+                    var newSpt = new MarketResponseTotal()
+                    {
+                        City = Locations.GetName(stats.City),
+                        SellPriceMin = stats.SellPriceMin,
+                        SellPriceMax = stats.SellPriceMax,
+                        BuyPriceMin = stats.BuyPriceMin,
+                        BuyPriceMax = stats.BuyPriceMax,
+                        SellPriceMinDate = stats.SellPriceMinDate,
+                        SellPriceMaxDate = stats.SellPriceMaxDate,
+                        BuyPriceMinDate = stats.BuyPriceMinDate,
+                        BuyPriceMaxDate = stats.BuyPriceMaxDate,
+                    };
+
+                    statsPricesTotalList.Add(newSpt);
+                }
+            }
 
-                    LblLastUpdate.Content = Utility.DateFormat(DateTime.Now, 0);
-                });
-            });
+            return statsPricesTotalList;
         }
 
         private void FindBestPrice(ref List<MarketResponseTotal> list)
@@ -242,204 +236,6 @@ private void FindBestPrice(ref List<MarketResponseTotal> list)
 
         }
 
-        private void CreateGridElement(MarketResponseTotal stats)
-        {
-
-
-            for (var i = 1; i < 5; i++)
-            {
-                var oneItem = new ListViewItem();
-                oneItem.Content = new PriceItem()
-                {
-                    Name = "John",
-                    Alter = 32,
-                    CityStyle = FindResource("CaerleonStyle") as Style
-                };
-                _items.Add(oneItem);
-                ListViewPrices.ItemsSource = _items;
-            }
-            ListViewPrices.Items.Refresh();
-
-
-            // ----------------------
-
-
-            var textColor = new SolidColorBrush(Colors.Gainsboro);
-            
-            var bestPriceLabelStyle = FindResource("BestPriceLabel") as Style;
-
-            var grid = new Grid
-            {
-                VerticalAlignment = VerticalAlignment.Top, Height = 30, Margin = new Thickness(0, 0, 0, 0)
-            };
-
-            var lblCity = new Label
-            {
-                Content = stats.City,
-                Foreground = textColor,
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                Width = 150,
-                Height = 28,
-                Margin = new Thickness(10, 0, 0, 0)
-            };
-
-            switch(stats.City)
-            {
-                case Location.Caerleon:
-                    lblCity.Style = FindResource("CaerleonStyle") as Style;
-                    break;
-                case Location.Thetford:
-                    lblCity.Style = FindResource("ThetfordStyle") as Style;
-                    break;
-                case Location.Bridgewatch:
-                    lblCity.Style = FindResource("BridgewatchStyle") as Style;
-                    break;
-                case Location.Martlock:
-                    lblCity.Style = FindResource("MartlockStyle") as Style;
-                    break;
-                case Location.Lymhurst:
-                    lblCity.Style = FindResource("LymhurstStyle") as Style;
-                    break;
-                case Location.FortSterling:
-                    lblCity.Style = FindResource("FortSterlingStyle") as Style;
-                    break;
-                default:
-                    lblCity.Style = FindResource("DefaultCityStyle") as Style;
-                    break;
-            }
-
-            List<Image> silverImages = new List<Image>();
-
-            var lblSellPriceMin = new Label
-            {
-                Content = string.Format(LanguageController.DefaultCultureInfo, "{0:n0}", stats.SellPriceMin),
-                Foreground = DateTimeToOld(stats.SellPriceMinDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                HorizontalContentAlignment = HorizontalAlignment.Left,
-                Width = 85,
-                Height = 28,
-                Margin = new Thickness(194, 0, 0, 0)
-            };
-            lblSellPriceMin.Style = (stats.BestSellMinPrice && stats.SellPriceMin != 0) ? bestPriceLabelStyle : lblSellPriceMin.Style;
-            silverImages.Add(new Image
-            {
-                Margin = new Thickness(168, 0, 0, 0),
-                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
-            });
-
-            var lblSellPriceMax = new Label
-            {
-                Content = string.Format(LanguageController.DefaultCultureInfo, "{0:n0}", stats.SellPriceMax),
-                Foreground = DateTimeToOld(stats.SellPriceMaxDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                HorizontalContentAlignment = HorizontalAlignment.Left,
-                Width = 85,
-                Height = 28,
-                Margin = new Thickness(444, 0, 0, 0)
-            };
-            silverImages.Add(new Image
-            {
-                Margin = new Thickness(418, 0, 0, 0),
-                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
-            });
-
-            var lblBuyPriceMin = new Label
-            {
-                Content = string.Format(LanguageController.DefaultCultureInfo, "{0:n0}", stats.BuyPriceMin),
-                Foreground = DateTimeToOld(stats.BuyPriceMinDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                HorizontalContentAlignment = HorizontalAlignment.Left,
-                Width = 85,
-                Height = 28,
-                Margin = new Thickness(694, 0, 0, 0)
-            };
-            silverImages.Add(new Image
-            {
-                Margin = new Thickness(668, 0, 0, 0),
-                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
-            });
-
-            var lblBuyPriceMax = new Label
-            {
-                Content = string.Format(LanguageController.DefaultCultureInfo, "{0:n0}", stats.BuyPriceMax),
-                Foreground = DateTimeToOld(stats.BuyPriceMaxDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                HorizontalContentAlignment = HorizontalAlignment.Left,
-                Width = 85,
-                Height = 28,
-                Margin = new Thickness(944, 0, 0, 0)
-            };
-            lblBuyPriceMax.Style = (stats.BestBuyMaxPrice && stats.BuyPriceMax != 0) ? bestPriceLabelStyle : lblBuyPriceMax.Style;
-            silverImages.Add(new Image
-            {
-                Margin = new Thickness(918, 0, 0, 0),
-                Style = FindResource("ListView.Grid.StackPanel.Image.Price.Silver") as Style
-            });
-
-            var lblSellPriceMinDate = new Label
-            {
-                Content = Utility.DateFormat(stats.SellPriceMinDate, 2),
-                Foreground = DateTimeToOld(stats.SellPriceMinDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                Width = 120,
-                Height = 28,
-                Margin = new Thickness(293, 0, 0, 0)
-            };
-
-            var lblSellPriceMaxDate = new Label
-            {
-                Content = Utility.DateFormat(stats.SellPriceMaxDate, 2),
-                Foreground = DateTimeToOld(stats.SellPriceMaxDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                Width = 120,
-                Height = 28,
-                Margin = new Thickness(543, 0, 0, 0)
-            };
-
-            var lblBuyPriceMinDate = new Label
-            {
-                Content = Utility.DateFormat(stats.BuyPriceMinDate, 2),
-                Foreground = DateTimeToOld(stats.BuyPriceMinDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                Width = 120,
-                Height = 28,
-                Margin = new Thickness(793, 0, 0, 0)
-            };
-
-            var lblBuyPriceMaxDate = new Label
-            {
-                Content = Utility.DateFormat(stats.BuyPriceMaxDate, 2),
-                Foreground = DateTimeToOld(stats.BuyPriceMaxDate),
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Top,
-                Width = 120,
-                Height = 28,
-                Margin = new Thickness(1043, 0, 0, 0)
-            };
-
-            SpStats.Children.Add(grid);
-            grid.Children.Add(lblCity);
-            grid.Children.Add(lblSellPriceMin);
-            grid.Children.Add(lblSellPriceMax);
-            grid.Children.Add(lblBuyPriceMin);
-            grid.Children.Add(lblBuyPriceMax);
-            grid.Children.Add(lblSellPriceMinDate);
-            grid.Children.Add(lblSellPriceMaxDate);
-            grid.Children.Add(lblBuyPriceMinDate);
-            grid.Children.Add(lblBuyPriceMaxDate);
-            foreach (var image in silverImages)
-                grid.Children.Add(image);
-
-        }
-
         private void SetDifferenceCalculationText(List<MarketResponseTotal> statsPricesTotalList)
         {
             ulong? bestBuyMaxPrice = 0UL;
@@ -526,36 +322,6 @@ private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.
         {
             Process.Start(e.Uri.AbsoluteUri);
         }
-
-
-        // TEST ------------------------
-
-        private List<ListViewItem> _items = new List<ListViewItem>();
-        private void Button_Click_1(object sender, RoutedEventArgs e)
-        {
-            for (var i = 1; i < 5; i++)
-            {
-                var oneItem = new ListViewItem();
-                oneItem.Content = new PriceItem()
-                {
-                    Name = "John",
-                    Alter = 32,
-                    CityStyle = FindResource("CaerleonStyle") as Style
-                };
-                _items.Add(oneItem);
-                ListViewPrices.ItemsSource = _items;
-            }
-            ListViewPrices.Items.Refresh();
-        }
-        public class PriceItem
-        {
-            public string Name { get; set; }
-            public int Alter { get; set; }
-
-            public Style CityStyle { get; set; }
-
-        public SolidColorBrush Color => new SolidColorBrush(Colors.Gold);
-        }
-
+        
     }
 }
\ No newline at end of file
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
index e41e155ea..9eb212a0f 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/MarketOrder.cs
@@ -104,6 +104,26 @@ public class MarketResponseTotal
 
     public class MarketCurrentPricesItem
     {
+
+        public MarketCurrentPricesItem(MarketResponseTotal marketResponseTotal)
+        {
+            ItemTypeId = marketResponseTotal.ItemTypeId;
+            City = marketResponseTotal.City;
+            QualityLevel = marketResponseTotal.QualityLevel;
+            SellPriceMin = marketResponseTotal.SellPriceMin;
+            SellPriceMinDate = marketResponseTotal.SellPriceMinDate;
+            SellPriceMax = marketResponseTotal.SellPriceMax;
+            SellPriceMaxDate = marketResponseTotal.SellPriceMaxDate;
+            BuyPriceMin = marketResponseTotal.BuyPriceMin;
+            BuyPriceMinDate = marketResponseTotal.BuyPriceMinDate;
+            BuyPriceMax = marketResponseTotal.BuyPriceMax;
+            BuyPriceMaxDate = marketResponseTotal.BuyPriceMaxDate;
+            BestSellMinPrice = marketResponseTotal.BestSellMinPrice;
+            BestSellMaxPrice = marketResponseTotal.BestSellMaxPrice;
+            BestBuyMinPrice = marketResponseTotal.BestBuyMinPrice;
+            BestBuyMaxPrice = marketResponseTotal.BestBuyMaxPrice;
+        }
+
         public string ItemTypeId { get; set; }
         public Location City { get; set; }
         public byte QualityLevel { get; set; }
@@ -121,36 +141,27 @@ public class MarketCurrentPricesItem
         public bool BestBuyMinPrice { get; set; }
         public bool BestBuyMaxPrice { get; set; }
 
-        public Style CityStyle
-        {
-            get
-            {
+        public Style CityStyle {
+            get {
                 switch (City)
                 {
                     case Location.Caerleon:
-                        Style style aa;
-                        style = FindResource("CaerleonStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("CaerleonStyle") as Style;
                     case Location.Thetford:
-                        lblCity.Style = FindResource("ThetfordStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("ThetfordStyle") as Style;
                     case Location.Bridgewatch:
-                        lblCity.Style = FindResource("BridgewatchStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("BridgewatchStyle") as Style;
                     case Location.Martlock:
-                        lblCity.Style = FindResource("MartlockStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("MartlockStyle") as Style;
                     case Location.Lymhurst:
-                        lblCity.Style = FindResource("LymhurstStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("LymhurstStyle") as Style;
                     case Location.FortSterling:
-                        lblCity.Style = FindResource("FortSterlingStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("FortSterlingStyle") as Style;
                     default:
-                        lblCity.Style = FindResource("DefaultCityStyle") as Style;
-                        break;
+                        return Application.Current.FindResource("DefaultCityStyle") as Style;
                 }
             }
         }
+
     }
 }
\ No newline at end of file

From 91a5d624fb40161fc07c47336f8daf45943d9b7d Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Wed, 7 Aug 2019 12:19:32 +0200
Subject: [PATCH 5/8] GridViewColumnHeader adjustments + add resize column
 function

---
 .../StatisticsAnalysisTool/App.xaml           | 27 ++++++++++++++-----
 .../StatisticsAnalysisTool/ItemWindow.xaml.cs |  3 ++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index db405e932..07b8cb258 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -416,13 +416,28 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
-                        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource GridView.Column.Header.Font}" Background="Transparent">
-                            <TextBlock x:Name="ContentHeader" Text="{TemplateBinding Content}" Padding="5,5,5,0" Width="{TemplateBinding Width}" 
-                                       TextAlignment="Left" />
-                        </Border>
+                        <Grid Margin="{TemplateBinding Padding}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Border BorderThickness="1,0,1,1" BorderBrush="{StaticResource GridView.Column.Header.Font}" Background="Transparent">
+                                <TextBlock Text="{TemplateBinding Content}" Padding="5,5,5,0" Width="{TemplateBinding Width}" TextAlignment="Left" />
+                            </Border>
+                            <Thumb x:Name="PART_HeaderGripper" 
+                                   Grid.Column="1"
+                                   HorizontalAlignment="Right"
+                                   Width="1" 
+                                   BorderThickness="0"
+                                   BorderBrush="{Binding VerticalGridLinesBrush, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}}"
+                                   Cursor="SizeWE">
+                                <Thumb.Background>
+                                    <StaticResource ResourceKey="Item.MouseOver.Background" />
+                                </Thumb.Background>
+                            </Thumb>
+                        </Grid>
                     </ControlTemplate>
                 </Setter.Value>
-
             </Setter>
             <Setter Property="OverridesDefaultStyle" Value="True" />
             <Setter Property="FontSize" Value="14" />
@@ -605,8 +620,6 @@
         </Style>
 
 
-
-
     </Application.Resources>
 </Application>
 
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
index 4eeb6c5b6..d0ad3e51a 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 using StatisticsAnalysisTool.Models;
@@ -37,7 +38,7 @@ public ItemWindow(Item item)
             Translation();
             InitializeItemData(item);
         }
-
+        
         private void Translation()
         {
             ChbShowVillages.Content = LanguageController.Translation("SHOW_VILLAGES");

From 70d9deb160d10577e85b3502699272f7f4cce1c0 Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Wed, 7 Aug 2019 16:52:40 +0200
Subject: [PATCH 6/8] Add scrollbar style

---
 .../StatisticsAnalysisTool/App.xaml           | 100 +++++++++++++++---
 1 file changed, 85 insertions(+), 15 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index 07b8cb258..88ef9f574 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -443,19 +443,6 @@
             <Setter Property="FontSize" Value="14" />
             <Setter Property="Foreground" Value="{StaticResource GridView.Column.Header.Font}" />
         </Style>
-        <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
-            <Setter Property="Stylus.IsFlicksEnabled" Value="True" />
-            <Style.Triggers>
-                <Trigger Property="Orientation" Value="Horizontal">
-                    <Setter Property="Height" Value="40" />
-                    <Setter Property="MinHeight" Value="40" />
-                </Trigger>
-                <Trigger Property="Orientation" Value="Vertical">
-                    <Setter Property="Width" Value="20" />
-                    <Setter Property="MinWidth" Value="20" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>
 
         <!-- ComboBox style -->
         <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
@@ -589,8 +576,8 @@
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
-            <Style.Triggers>
-            </Style.Triggers>
+            <!--<Style.Triggers>
+            </Style.Triggers>-->
         </Style>
 
         <!-- SimpleStyles: ComboBoxItem -->
@@ -619,6 +606,89 @@
             </Setter>
         </Style>
 
+        <!--Scrollbar Thumbs-->
+        <Style x:Key="ScrollThumbs" TargetType="{x:Type Thumb}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Thumb}">
+                        <Grid x:Name="Grid">
+                            <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Fill="Transparent" />
+                            <Border x:Name="Rectangle1" CornerRadius="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto"  Background="{TemplateBinding Background}" />
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="Tag" Value="Horizontal">
+                                <Setter TargetName="Rectangle1" Property="Width" Value="Auto" />
+                                <Setter TargetName="Rectangle1" Property="Height" Value="20" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <!--ScrollBars-->
+        <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
+            <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
+            <Setter Property="Foreground" Value="{StaticResource Item.MouseOver.Background}" />
+            <Setter Property="Background" Value="{StaticResource SolidColorBrush.Background.Third}" />
+            <Setter Property="Width" Value="25" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ScrollBar}">
+                        <Grid x:Name="GridRoot" Width="15" Background="{TemplateBinding Background}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="0.00001*" />
+                            </Grid.RowDefinitions>
+
+                            <Track x:Name="PART_Track" Grid.Row="0" IsDirectionReversed="true" Focusable="false">
+                                <Track.Thumb>
+                                    <Thumb x:Name="Thumb" Background="{TemplateBinding Foreground}" Style="{DynamicResource ScrollThumbs}" />
+                                </Track.Thumb>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton x:Name="PageUp" Command="ScrollBar.PageDownCommand" Opacity="0" Focusable="false" />
+                                </Track.IncreaseRepeatButton>
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton x:Name="PageDown" Command="ScrollBar.PageUpCommand" Opacity="0" Focusable="false" />
+                                </Track.DecreaseRepeatButton>
+                            </Track>
+                        </Grid>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
+                                <Setter Value="{StaticResource Item.IsSelected.Background}" TargetName="Thumb" Property="Background" />
+                            </Trigger>
+                            <Trigger SourceName="Thumb" Property="IsDragging" Value="true">
+                                <Setter Value="{StaticResource Item.IsSelected.Background}" TargetName="Thumb" Property="Background" />
+                            </Trigger>
+
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter TargetName="Thumb" Property="Visibility" Value="Collapsed" />
+                            </Trigger>
+                            <Trigger Property="Orientation" Value="Horizontal">
+                                <Setter TargetName="GridRoot" Property="LayoutTransform">
+                                    <Setter.Value>
+                                        <RotateTransform Angle="-90" />
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="PART_Track" Property="LayoutTransform">
+                                    <Setter.Value>
+                                        <RotateTransform Angle="-90" />
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter Property="Width" Value="Auto" />
+                                <Setter Property="Height" Value="12" />
+                                <Setter TargetName="Thumb" Property="Tag" Value="Horizontal" />
+                                <Setter TargetName="PageDown" Property="Command" Value="ScrollBar.PageLeftCommand" />
+                                <Setter TargetName="PageUp" Property="Command" Value="ScrollBar.PageRightCommand" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+
+
 
     </Application.Resources>
 </Application>

From 59b7449aa157a19339188dee8c103d920f51251c Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Wed, 7 Aug 2019 17:06:53 +0200
Subject: [PATCH 7/8] ItemWindow adjustments

---
 .../StatisticsAnalysisTool/App.xaml               | 15 ++++++++-------
 .../StatisticsAnalysisTool/ItemWindow.xaml        |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index 88ef9f574..e2d3df421 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -188,11 +188,11 @@
 
         <!-- ListView grid stackPanel item price -->
         <Style TargetType="StackPanel" x:Key="ListView.Grid.StackPanel.Item.Price">
-            <Setter Property="Width" Value="92"></Setter>
-            <Setter Property="Orientation" Value="Horizontal"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="VerticalAlignment" Value="Center"></Setter>
-            <Setter Property="Margin" Value="0"></Setter>
+            <Setter Property="Width" Value="92"/>
+            <Setter Property="Orientation" Value="Horizontal"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="0"/>
         </Style>
 
         <!-- ListView grid stackPanel image price silver -->
@@ -221,8 +221,9 @@
 
         <!-- ListView grid stackPanel label price -->
         <Style TargetType="Label" x:Key="ListView.Grid.StackPanel.Label.Price">
-            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}"></Setter>
-            <Setter Property="Margin" Value="0"></Setter>
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}"/>
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
         </Style>
 
 
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
index eb1aefb95..5056e17ea 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/ItemWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:fa="http://schemas.fontawesome.io/icons/"
         mc:Ignorable="d"
-        Title="ItemWindow" Height="335" Width="1180" AllowsTransparency="True" Style="{StaticResource PrimaryWindow}" FontSize="{StaticResource BaseFontSize}" WindowStyle="None" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
+        Title="ItemWindow" MinHeight="335" Height="335" MinWidth="900" Width="1180" AllowsTransparency="True" Style="{StaticResource PrimaryWindow}" FontSize="{StaticResource BaseFontSize}" WindowStyle="None" WindowStartupLocation="CenterScreen" ResizeMode="CanResizeWithGrip">
     <Grid>
         <Border BorderThickness="1,0,0,0" BorderBrush="{StaticResource SolidColorBrush.Background.Third}"/>
         <Border BorderThickness="0,1,0,0" BorderBrush="{StaticResource SolidColorBrush.Background.Third}"/>
@@ -19,7 +19,7 @@
             <Button x:Name="MinimizeButton" Style="{StaticResource WindowButtonStyle}" Content="0" Margin="0,0,28,0" Click="MinimizeButton_Click"/>
             <Image x:Name="ImgItemImage" HorizontalAlignment="Left" Height="75" Margin="10,5,0,0" VerticalAlignment="Top" Width="75"/>
             <Label x:Name="LblItemName" Content="ITEM__NAME" Margin="90,5,200,0" VerticalAlignment="Top" Height="33" FontSize="16" Foreground="{StaticResource SolidColorBrush.Foreground.First}"/>
-            <Label x:Name="LblItemId" Content="ITEM__ID" Margin="90,43,713,0" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}"/>
+            <Label x:Name="LblItemId" Content="ITEM__ID" Margin="90,43,0,0" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}" HorizontalAlignment="Left" Width="375"/>
             <CheckBox x:Name="ChbShowVillages" Content="Dörfer Preise anzeigen" Margin="470,43,0,0" VerticalContentAlignment="Center" HorizontalAlignment="Left" Width="150" Height="26" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}" Click="ShowVillagesPrices_Click" />
             <CheckBox x:Name="ChbAutoUpdateData" Content="Auto Daten Update" IsChecked="True" Margin="625,43,0,0" VerticalContentAlignment="Center" HorizontalAlignment="Left" Width="150" Height="26" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}" />
             <Label x:Name="LblLastUpdate" Content="LAST__UPDATE" Margin="0,43,10,0" VerticalAlignment="Top" ToolTip="Letzte Aktualisierung" Foreground="{StaticResource SolidColorBrush.Foreground.First}" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Width="230"/>

From 2cd02154c2b8adec337f0f5d496f6fa4cb21063c Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Wed, 7 Aug 2019 17:10:42 +0200
Subject: [PATCH 8/8] Add new version

---
 .../StatisticsAnalysisTool/Properties/AssemblyInfo.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
index b76134b37..c8d49b2f6 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.*")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.2.*")]
+[assembly: AssemblyFileVersion("1.1.2.0")]