From c3a40b3412c86fe73f5745ca0c4a552297e429ce Mon Sep 17 00:00:00 2001
From: Ben <ben-wallis@users.noreply.github.com>
Date: Sun, 28 Jun 2015 21:44:36 +0100
Subject: [PATCH] Various bug fixes and sorted app icon

---
 Filtration/Filtration.csproj                    |   1 +
 Filtration/Resources/Icons/filtration_icon.png  | Bin 0 -> 580 bytes
 Filtration/UserControls/ItemPreviewControl.xaml |   2 +-
 Filtration/ViewModels/MainWindowViewModel.cs    |  16 ++++++++++++++--
 Filtration/Views/IconsDictionary.xaml           |   1 +
 Filtration/Views/ItemFilterBlockView.xaml       |  11 +++++++++--
 Filtration/Views/MainWindow.xaml                |   2 +-
 7 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 Filtration/Resources/Icons/filtration_icon.png

diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index f6f0b27..d7ca5d3 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -377,6 +377,7 @@
     <Resource Include="Resources\Icons\ReplaceColors.ico" />
     <Resource Include="Resources\Icons\Theme.ico" />
     <Resource Include="Resources\Images\doge.jpg" />
+    <Resource Include="Resources\Icons\filtration_icon.png" />
     <Content Include="Resources\ItemBaseTypes.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/Filtration/Resources/Icons/filtration_icon.png b/Filtration/Resources/Icons/filtration_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..21745d5f9d8c4432c46d88ec6f28520f3d896e55
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006DNkl<ZScUD=
zv1=1?6bJB^nvx-Kwb6zSji5OB2RL4CDg?R&970LJAW1HpV}=fQ@6JD<a3rIvtE<}u
zq2Q%wNkU99P(*@42Q?0&clVylDK=ixq@H!~zSHr0zkA=$@&owa6Z`R@C<<RzsiG)9
zdsluP#N+W}K@g5E3vvd)%wyMe*NVmBdM1-;|E)r19tQ#dKq4Y&wOXtBeExPioqis6
zIT5`F04Wfls_KY{wuxxfFbt<qDBMb=QU_s`GxI4CZL6v}3IqTE=(^q`qMYY>R}I7X
zS}K)p3WD$=gz`^Bl+$&+H$7XKKF~Dn&_`?<hVi*vF5gHdllC8!e<7lrrfG*k^WOkI
z;s5}4T-V)dHk%)+)#_Fvk?3Be8~}FweSx_$Yhaq@i71Lkp6AtV+kRWG*Eek2enUj*
zMaqfj8#CWS#AoyF%>)1dwA=01k|Yg1&y%~|?ujhR8=X$)9W!5>_a8HRu~=*u5uct1
zoeKZ}FimqHNz%x1oLax%AIY+O-LkAxW?r8IxQ~cW&fC2Zz(@45+3eVL-P&L<cvY!X
z1k17}0I(KNUPHvki|kz(;3Hm&qWIBqoCm|<@VL=v+%Zk_%pD?nh=|QacLL0K1+#*P
z`$V)inN03Z&xmLb5%-tbw=}><JX+>FbU@gN01+SpM1TlzVSuWtVLGDxyL<;HvH_(o
S6*lt#0000<MNUMnLSTYEYX&X=

literal 0
HcmV?d00001

diff --git a/Filtration/UserControls/ItemPreviewControl.xaml b/Filtration/UserControls/ItemPreviewControl.xaml
index 94f4d14..8080fad 100644
--- a/Filtration/UserControls/ItemPreviewControl.xaml
+++ b/Filtration/UserControls/ItemPreviewControl.xaml
@@ -11,7 +11,7 @@
         <ResourceDictionary Source="../Views/SharedResourcesDictionary.xaml" />
     </UserControl.Resources>
     <Border BorderBrush="Black" BorderThickness="1">
-        <Grid Width="154" Height="35">
+        <Grid Width="166" Height="39">
             <Image Source="pack://application:,,,/resources/groundtile.png" Stretch="Fill" />
             <Grid>
                 <Grid.RowDefinitions>
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index 998e928..e0a29df 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -1,7 +1,10 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using Filtration.Common.ViewModels;
 using Filtration.Interface;
 using Filtration.ObjectModel.ThemeEditor;
@@ -89,6 +92,12 @@ namespace Filtration.ViewModels
                 SetItemFilterScriptDirectory();
             }
 
+            var icon = new BitmapImage();
+            icon.BeginInit();
+            icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/filtration_icon.png");
+            icon.EndInit();
+            Icon = icon;
+
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
                 switch (message.Notification)
@@ -151,7 +160,10 @@ namespace Filtration.ViewModels
 
         public RelayCommand<bool> ToggleShowAdvancedCommand { get; private set; }
         public RelayCommand ClearFiltersCommand { get; private set; }
-        
+
+
+        public ImageSource Icon { get; private set; }
+
         public IAvalonDockWorkspaceViewModel AvalonDockWorkspaceViewModel
         {
             get { return _avalonDockWorkspaceViewModel; }
diff --git a/Filtration/Views/IconsDictionary.xaml b/Filtration/Views/IconsDictionary.xaml
index 7b16b14..4b4c6b6 100644
--- a/Filtration/Views/IconsDictionary.xaml
+++ b/Filtration/Views/IconsDictionary.xaml
@@ -28,4 +28,5 @@
     <Image Source="/Filtration;component/Resources/Icons/Copy.ico" x:Key="CopyIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/Paste.ico" x:Key="PasteIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/PasteStyle.ico" x:Key="PasteStyleIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/filtration_icon.png" x:Key="FiltrationIcon" x:Shared="False" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml
index aa2748b..6e86fa2 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml
+++ b/Filtration/Views/ItemFilterBlockView.xaml
@@ -79,7 +79,14 @@
                             </Grid.ColumnDefinitions>
                             <!-- BlockItems Summary Panel -->
                             <StackPanel Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">
-                                <ItemsControl ItemsSource="{Binding SummaryBlockItems}">
+                                <StackPanel.Resources>
+                                    <CollectionViewSource Source="{Binding SummaryBlockItems}" x:Key="SummaryBlockItemsCollectionViewSource">
+                                        <CollectionViewSource.SortDescriptions>
+                                            <componentModel:SortDescription PropertyName="SortOrder"/>
+                                        </CollectionViewSource.SortDescriptions>
+                                    </CollectionViewSource>
+                                </StackPanel.Resources>
+                                <ItemsControl ItemsSource="{Binding Source={StaticResource SummaryBlockItemsCollectionViewSource}}">
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
                                             <WrapPanel />
@@ -189,7 +196,7 @@
                                                 <EventTrigger.Actions>
                                                     <BeginStoryboard>
                                                         <Storyboard>
-                                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:2" />
+                                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:0.5" />
                                                         </Storyboard>
                                                     </BeginStoryboard>
                                                 </EventTrigger.Actions>
diff --git a/Filtration/Views/MainWindow.xaml b/Filtration/Views/MainWindow.xaml
index 824c5cf..1ceba38 100644
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:views="clr-namespace:Filtration.Views"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
-        Title="{Binding WindowTitle}" Height="768" Width="1100" BorderThickness="1" BorderBrush="Black" Icon="{StaticResource MenuPasteIcon}">
+        Title="{Binding WindowTitle}" Height="768" Width="1100" BorderThickness="1" BorderBrush="Black" IsIconVisible="True" >
     <fluent:RibbonWindow.Resources>
         <converters:BooleanVisibilityConverterCopy x:Key="BooleanVisibilityConverterCopy" />
     </fluent:RibbonWindow.Resources>