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 @@
+
Always
diff --git a/Filtration/Resources/Icons/filtration_icon.png b/Filtration/Resources/Icons/filtration_icon.png
new file mode 100644
index 0000000..21745d5
Binary files /dev/null and b/Filtration/Resources/Icons/filtration_icon.png differ
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 @@
-
+
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(this, message =>
{
switch (message.Notification)
@@ -151,7 +160,10 @@ namespace Filtration.ViewModels
public RelayCommand 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 @@
+
\ 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 @@
-
+
+
+
+
+
+
+
+
@@ -189,7 +196,7 @@
-
+
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" >