Various bug fixes, added standard POE colours to ColorPickers

2015-06-14 16:50:08 +01:00 · 2015-06-14 16:50:08 +01:00 · 08a193dc6b
parent aa433ad685
commit 08a193dc6b
22 changed files with 375 additions and 92 deletions
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@ -112,6 +112,7 @@
    <Compile Include="Converters\BooleanToBlockActionInverseConverter.cs" />
    <Compile Include="Converters\BooleanToBlockActionConverter.cs" />
    <Compile Include="Converters\ColorToSolidColorBrushConverter.cs" />
+    <Compile Include="Converters\HashSignRemovalConverter.cs" />
    <Compile Include="Converters\ItemRarityConverter.cs" />
    <Compile Include="Converters\BooleanVisibilityConverter.cs" />
    <Compile Include="Converters\StringToVisibilityConverter.cs" />
@ -189,7 +190,9 @@
    <Compile Include="Views\AvalonDock\AvalonDockWorkspaceView.xaml.cs">
      <DependentUpon>AvalonDockWorkspaceView.xaml</DependentUpon>
    </Compile>
+    <Compile Include="Views\Behaviors\BindableSelectedItemBehavior.cs" />
    <Compile Include="Views\BindingProxy.cs" />
+    <Compile Include="Views\PathOfExileColors.cs" />
    <Compile Include="Views\ToolPanes\BlockGroupBrowserView.xaml.cs">
      <DependentUpon>BlockGroupBrowserView.xaml</DependentUpon>
    </Compile>
@ -367,6 +370,8 @@
    <Resource Include="Resources\filtration.ico" />
    <Resource Include="Resources\Icons\replace_colors_icon.png" />
    <Resource Include="Resources\Icons\block_group_browser_icon.png" />
+    <Resource Include="Resources\Icons\clear_filter_icon.png" />
+    <Resource Include="Resources\Icons\filter_icon.png" />
    <Content Include="Resources\ItemBaseTypes.txt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/Filtration/Models/BlockItemTypes/FontSizeBlockItem.cs
+++ b/Filtration/Models/BlockItemTypes/FontSizeBlockItem.cs
@ -6,6 +6,7 @@ namespace Filtration.Models.BlockItemTypes
    {
        public FontSizeBlockItem()
        {
+            Value = 35;
        }

        public FontSizeBlockItem(int value) : base(value)
--- a/Filtration/Models/ItemFilterBlock.cs
+++ b/Filtration/Models/ItemFilterBlock.cs
@ -75,6 +75,25 @@ namespace Filtration.Models
            return BlockItems.Count(b => b is T) > 0; 
        }

+        public bool HasBlockGroupInParentHierarchy(ItemFilterBlockGroup targetBlockGroup, ItemFilterBlockGroup startingBlockGroup)
+        {
+            if (startingBlockGroup == targetBlockGroup)
+            {
+                return true;
+            }
+            if (BlockGroup == null)
+            {
+                return false;
+            }
+
+            if (startingBlockGroup.ParentGroup != null)
+            {
+                return HasBlockGroupInParentHierarchy(targetBlockGroup, startingBlockGroup.ParentGroup);
+            }
+
+            return false;
+        }
+        
        private void OnBlockGroupStatusChanged(object sender, EventArgs e)
        {
            if (BlockGroup.IsChecked == false && Action == BlockAction.Show)
--- a/Filtration/Resources/Icons/clear_filter_icon.png
+++ b/Filtration/Resources/Icons/clear_filter_icon.png
--- a/Filtration/Resources/Icons/filter_icon.png
+++ b/Filtration/Resources/Icons/filter_icon.png
--- a/Filtration/Translators/ItemFilterScriptTranslator.cs
+++ b/Filtration/Translators/ItemFilterScriptTranslator.cs
@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Castle.Core.Internal;
 using Filtration.Models;
 using Filtration.Utilities;

@ -43,7 +44,11 @@ namespace Filtration.Translators
                    script.Description += lines[i].Substring(1).Trim(' ') + Environment.NewLine;
                }    
            }
-            script.Description = script.Description.TrimEnd('\n').TrimEnd('\r');
+
+            if (!script.Description.IsNullOrEmpty())
+            {
+                script.Description = script.Description.TrimEnd('\n').TrimEnd('\r');
+            }

            // Extract each block from between boundaries and translate it into a ItemFilterBlock object
            // and add that object to the ItemFilterBlocks list 
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@ -10,6 +10,7 @@ using Filtration.Models.BlockItemTypes;
 using Filtration.Services;
 using Filtration.Views;
 using GalaSoft.MvvmLight.CommandWpf;
+using Xceed.Wpf.Toolkit;

 namespace Filtration.ViewModels
 {
@ -188,11 +189,25 @@ namespace Filtration.ViewModels
            }
            set
            {
-                Block.Description = value;
-                RaisePropertyChanged();
+                if (Block.Description != value)
+                {
+                    Block.Description = value;
+                    IsDirty = true;
+                    RaisePropertyChanged();
+                }
            }
        }
-        
+
+        public ObservableCollection<ColorItem> AvailableColors
+        {
+            get
+            {
+                {
+                    return PathOfExileColors.DefaultColors;
+                }
+            }
+        }
+
        public bool HasTextColor
        {
            get { return Block.HasBlockItemOfType<TextColorBlockItem>(); }
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Windows;
+using System.Windows.Data;
 using System.Windows.Forms;
 using Castle.Core.Internal;
+using Filtration.Enums;
 using Filtration.Models;
 using Filtration.Services;
 using Filtration.Translators;
@ -22,11 +25,12 @@ namespace Filtration.ViewModels
        IItemFilterBlockViewModel SectionBrowserSelectedBlockViewModel { get; set; }
        IEnumerable<ItemFilterBlockGroup> BlockGroups { get; }
        IEnumerable<IItemFilterBlockViewModel> ItemFilterSectionViewModels { get; }
+        Predicate<IItemFilterBlockViewModel> BlockFilterPredicate { get; set; }
        bool IsDirty { get; }
        string Description { get; set; }
        string DisplayName { get; }
        
-        void Initialise(ItemFilterScript itemFilterScript);
+        void Initialise(ItemFilterScript itemFilterScript, bool newScript);
        void RemoveDirtyFlag();
        void SaveScript();
        void SaveScriptAs();
@ -47,12 +51,23 @@ namespace Filtration.ViewModels
        private bool _isDirty;
        private IItemFilterBlockViewModel _selectedBlockViewModel;
        private IItemFilterBlockViewModel _sectionBrowserSelectedBlockViewModel;
+        private readonly ObservableCollection<IItemFilterBlockViewModel> _itemFilterBlockViewModels;
+        private ICollectionView _itemFilterBlockViewModelsCollectionView;
+        private Predicate<IItemFilterBlockViewModel> _blockFilterPredicate;

        public ItemFilterScriptViewModel(IItemFilterBlockViewModelFactory itemFilterBlockViewModelFactory,
                                         IItemFilterBlockTranslator blockTranslator,
                                         IAvalonDockWorkspaceViewModel avalonDockWorkspaceViewModel,
                                         IItemFilterPersistenceService persistenceService)
        {
+            _itemFilterBlockViewModelFactory = itemFilterBlockViewModelFactory;
+            _blockTranslator = blockTranslator;
+            _avalonDockWorkspaceViewModel = avalonDockWorkspaceViewModel;
+            _avalonDockWorkspaceViewModel.ActiveDocumentChanged += OnActiveDocumentChanged;
+            _persistenceService = persistenceService;
+            _itemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModel>();
+
+            ClearFilterCommand = new RelayCommand(OnClearFilterCommand, () => BlockFilterPredicate != null);
            CloseCommand = new RelayCommand(OnCloseCommand);
            DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand, () => SelectedBlockViewModel != null);
            MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand, () => SelectedBlockViewModel != null);
@ -63,13 +78,9 @@ namespace Filtration.ViewModels
            AddSectionCommand = new RelayCommand(OnAddSectionCommand, () => SelectedBlockViewModel != null);
            CopyBlockCommand = new RelayCommand(OnCopyBlockCommand, () => SelectedBlockViewModel != null);
            PasteBlockCommand = new RelayCommand(OnPasteBlockCommand, () => SelectedBlockViewModel != null);
-            _itemFilterBlockViewModelFactory = itemFilterBlockViewModelFactory;
-            _blockTranslator = blockTranslator;
-            _avalonDockWorkspaceViewModel = avalonDockWorkspaceViewModel;
-            _persistenceService = persistenceService;
-            ItemFilterBlockViewModels = new ObservableCollection<IItemFilterBlockViewModel>();
        }

+        public RelayCommand ClearFilterCommand { get; private set; }
        public RelayCommand CloseCommand { get; private set; }
        public RelayCommand DeleteBlockCommand { get; private set; }
        public RelayCommand MoveBlockToTopCommand { get; private set; }
@ -81,8 +92,43 @@ namespace Filtration.ViewModels
        public RelayCommand CopyBlockCommand { get; private set; }
        public RelayCommand PasteBlockCommand { get; private set; }

-        public ObservableCollection<IItemFilterBlockViewModel> ItemFilterBlockViewModels { get; private set; }
+        public ObservableCollection<IItemFilterBlockViewModel> ItemFilterBlockViewModels
+        {
+            get
+            {
+                _itemFilterBlockViewModelsCollectionView =
+                    CollectionViewSource.GetDefaultView(_itemFilterBlockViewModels);
+                if (BlockFilterPredicate != null)
+                {
+                    _itemFilterBlockViewModelsCollectionView.Filter = BlockFilter;
+                }
+                else
+                {
+                    _itemFilterBlockViewModelsCollectionView.Filter = null;
+                }
+                return _itemFilterBlockViewModels;
+                
+            }
+        }

+        private bool BlockFilter(object item)
+        {
+            var blockViewModel = item as IItemFilterBlockViewModel;
+            return BlockFilterPredicate(blockViewModel);
+        }
+
+        public Predicate<IItemFilterBlockViewModel> BlockFilterPredicate
+        {
+            get { return _blockFilterPredicate; }
+            set
+            {
+                _blockFilterPredicate = value;
+                RaisePropertyChanged("ItemFilterBlockViewModels");
+            }
+        }
+
+        public ObservableCollection<IItemFilterBlockViewModel> DisplayedItemFilterBlockViewModels { get; private set; }
+        
        public IEnumerable<IItemFilterBlockViewModel> ItemFilterSectionViewModels
        {
            get { return ItemFilterBlockViewModels.Where(b => b.Block.GetType() == typeof (ItemFilterSection)); }
@ -99,7 +145,7 @@ namespace Filtration.ViewModels
            set
            {
                Script.Description = value;
-                _isDirty = true;
+                IsDirty = true;
                RaisePropertyChanged();
            }
        }
@ -137,20 +183,19 @@ namespace Filtration.ViewModels
            get { return _isDirty || HasDirtyChildren; }
            set
            {
-                _isDirty = value;
-            }
-        }
+                if (_isDirty != value)
+                {
+                    _isDirty = value;
+                    if (_isDirty)
+                    {
+                        Title = Filename + "*";
+                    }
+                    else
+                    {
+                        Title = Filename;
+                    }
+                }

-        private bool HasDirtyChildren
-        {
-            get { return ItemFilterBlockViewModels.Any(vm => vm.IsDirty); }
-        }
-
-        private void CleanChildren()
-        {
-            foreach (var vm in ItemFilterBlockViewModels)
-            {
-                vm.IsDirty = false;
            }
        }

@ -177,7 +222,9 @@ namespace Filtration.ViewModels
            get { return Script.FilePath; }
        }

-        public void Initialise(ItemFilterScript itemFilterScript)
+        private bool _filenameIsFake;
+
+        public void Initialise(ItemFilterScript itemFilterScript, bool newScript)
        {
            ItemFilterBlockViewModels.Clear();

@ -189,6 +236,13 @@ namespace Filtration.ViewModels
                ItemFilterBlockViewModels.Add(vm);
            }

+            _filenameIsFake = newScript;
+
+            if (newScript)
+            {
+                Script.FilePath = "Untitled.filter";
+            }
+
            Title = Filename;
            ContentId = "testcontentid";
        }
@ -197,7 +251,7 @@ namespace Filtration.ViewModels
        {
            if (!ValidateScript()) return;

-            if (string.IsNullOrEmpty(Script.FilePath))
+            if (_filenameIsFake)
            {
                SaveScriptAs();
                return;
@ -235,6 +289,8 @@ namespace Filtration.ViewModels
            {
                Script.FilePath = saveDialog.FileName;
                _persistenceService.SaveItemFilterScript(Script);
+                _filenameIsFake = false;
+                Title = Filename;
                RemoveDirtyFlag();
            }
            catch (Exception e)
@ -245,6 +301,27 @@ namespace Filtration.ViewModels
            }
        }

+        private void OnActiveDocumentChanged(object sender, EventArgs e)
+        {
+            if (_avalonDockWorkspaceViewModel.ActiveScriptViewModel != this)
+            {
+                BlockFilterPredicate = null;
+            }
+        }
+
+        private bool HasDirtyChildren
+        {
+            get { return ItemFilterBlockViewModels.Any(vm => vm.IsDirty); }
+        }
+
+        private void CleanChildren()
+        {
+            foreach (var vm in ItemFilterBlockViewModels)
+            {
+                vm.IsDirty = false;
+            }
+        }
+
        private bool ValidateScript()
        {
            var result = Script.Validate();
@ -265,11 +342,16 @@ namespace Filtration.ViewModels
            return false;
        }

+        private void OnCloseCommand()
+        {
+            Close();
+        }
+        
        public void Close()
        {
            if (!IsDirty)
            {
-                _avalonDockWorkspaceViewModel.CloseDocument(this);
+                CloseScript();
            }
            else
            {
@ -280,12 +362,12 @@ namespace Filtration.ViewModels
                    case MessageBoxResult.Yes:
                        {
                            SaveScript();
-                            _avalonDockWorkspaceViewModel.CloseDocument(this);
+                            CloseScript();
                            break;
                        }
                    case MessageBoxResult.No:
                        {
-                            _avalonDockWorkspaceViewModel.CloseDocument(this);
+                            CloseScript();
                            break;
                        }
                    case MessageBoxResult.Cancel:
@ -296,9 +378,15 @@ namespace Filtration.ViewModels
            }
        }

-        private void OnCloseCommand()
+        private void CloseScript()
        {
-            Close();
+            _avalonDockWorkspaceViewModel.ActiveDocumentChanged -= OnActiveDocumentChanged;
+            _avalonDockWorkspaceViewModel.CloseDocument(this);
+        }
+
+        private void OnClearFilterCommand()
+        {
+            BlockFilterPredicate = null;
        }

        private void OnCopyBlockCommand()
@ -339,7 +427,7 @@ namespace Filtration.ViewModels
            }

            SelectedBlockViewModel = vm;
-            _isDirty = true;
+            IsDirty = true;

        }

@ -359,7 +447,7 @@ namespace Filtration.ViewModels
                Script.ItemFilterBlocks.Remove(block);
                Script.ItemFilterBlocks.Insert(0, block);
                ItemFilterBlockViewModels.Move(currentIndex, 0);
-                _isDirty = true;
+                IsDirty = true;
                RaisePropertyChanged("ItemFilterSectionViewModels");
            }
        }
@ -380,7 +468,7 @@ namespace Filtration.ViewModels
                Script.ItemFilterBlocks.RemoveAt(blockPos);
                Script.ItemFilterBlocks.Insert(blockPos - 1, block);
                ItemFilterBlockViewModels.Move(currentIndex, currentIndex - 1);
-                _isDirty = true;
+                IsDirty = true;
                RaisePropertyChanged("ItemFilterSectionViewModels");
            }
        }
@ -401,7 +489,7 @@ namespace Filtration.ViewModels
                Script.ItemFilterBlocks.RemoveAt(blockPos);
                Script.ItemFilterBlocks.Insert(blockPos + 1, block);
                ItemFilterBlockViewModels.Move(currentIndex, currentIndex + 1);
-                _isDirty = true;
+                IsDirty = true;
                RaisePropertyChanged("ItemFilterSectionViewModels");
            }
        }
@ -421,7 +509,7 @@ namespace Filtration.ViewModels
                Script.ItemFilterBlocks.Remove(block);
                Script.ItemFilterBlocks.Add(block);
                ItemFilterBlockViewModels.Move(currentIndex, ItemFilterBlockViewModels.Count - 1);
-                _isDirty = true;
+                IsDirty = true;
                RaisePropertyChanged("ItemFilterSectionViewModels");
            }
        }
@ -449,7 +537,7 @@ namespace Filtration.ViewModels
            }

            SelectedBlockViewModel = vm;
-            _isDirty = true;
+            IsDirty = true;
        }

        private void OnAddSectionCommand()
@ -465,7 +553,7 @@ namespace Filtration.ViewModels

            Script.ItemFilterBlocks.Insert(Script.ItemFilterBlocks.IndexOf(targetBlockViewModel.Block) + 1, newSection);
            ItemFilterBlockViewModels.Insert(ItemFilterBlockViewModels.IndexOf(targetBlockViewModel) + 1, vm);
-            _isDirty = true;
+            IsDirty = true;
            SelectedBlockViewModel = vm;
            RaisePropertyChanged("ItemFilterSectionViewModels");
        }
@ -484,7 +572,7 @@ namespace Filtration.ViewModels
            {
                Script.ItemFilterBlocks.Remove(targetBlockViewModel.Block);
                ItemFilterBlockViewModels.Remove(targetBlockViewModel);
-                _isDirty = true;
+                IsDirty = true;
            }
            SelectedBlockViewModel = null;
        }
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@ -43,7 +43,6 @@ namespace Filtration.ViewModels
            _replaceColorsViewModel = replaceColorsViewModel;
            _avalonDockWorkspaceViewModel = avalonDockWorkspaceViewModel;

-
            OpenAboutWindowCommand = new RelayCommand(OnOpenAboutWindowCommand);
            OpenScriptCommand = new RelayCommand(OnOpenScriptCommand);
            SaveScriptCommand = new RelayCommand(OnSaveScriptCommand, ActiveDocumentIsScript);
@ -76,6 +75,16 @@ namespace Filtration.ViewModels
                        ReplaceColorsCommand.RaiseCanExecuteChanged();
                        break;
                    }
+                    case "NewScript":
+                    {
+                        OnNewScriptCommand();
+                        break;
+                    }
+                    case "OpenScript":
+                    {
+                        OnOpenScriptCommand();
+                        break;
+                    }
                }
            });
        }
@ -145,7 +154,7 @@ namespace Filtration.ViewModels
            }

            var newViewModel = _itemFilterScriptViewModelFactory.Create();
-            newViewModel.Initialise(loadedScript);
+            newViewModel.Initialise(loadedScript, false);
            _avalonDockWorkspaceViewModel.AddDocument(newViewModel);
        }

@ -208,8 +217,7 @@ namespace Filtration.ViewModels
        {
            var newScript = new ItemFilterScript();
            var newViewModel = _itemFilterScriptViewModelFactory.Create();
-            newViewModel.Initialise(newScript);
-            newViewModel.Description = "New Script";
+            newViewModel.Initialise(newScript, true);
            _avalonDockWorkspaceViewModel.AddDocument(newViewModel);
        }

--- a/Filtration/ViewModels/ReplaceColorsViewModel.cs
+++ b/Filtration/ViewModels/ReplaceColorsViewModel.cs
@ -1,8 +1,11 @@
-using System.Linq;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows.Media;
 using Filtration.Models;
 using Filtration.Models.BlockItemTypes;
+using Filtration.Views;
 using GalaSoft.MvvmLight.CommandWpf;
+using Xceed.Wpf.Toolkit;

 namespace Filtration.ViewModels
 {
@ -58,6 +61,16 @@ namespace Filtration.ViewModels
            _itemFilterScript = itemFilterScript;
        }

+        public ObservableCollection<ColorItem> AvailableColors
+        {
+            get
+            {
+                {
+                    return PathOfExileColors.DefaultColors;
+                }
+            }
+        }
+
        public Color NewTextColor
        {
            get { return _replaceColorsParameterSet.NewTextColor; }
--- a/Filtration/ViewModels/StartPageViewModel.cs
+++ b/Filtration/ViewModels/StartPageViewModel.cs
@ -1,4 +1,5 @@
 using GalaSoft.MvvmLight.CommandWpf;
+using GalaSoft.MvvmLight.Messaging;

 namespace Filtration.ViewModels
 {
@ -12,12 +13,23 @@ namespace Filtration.ViewModels
        public StartPageViewModel()
        {
            Title = "Start Page";
+            OpenScriptCommand = new RelayCommand(OnOpenScriptCommand);
+            NewScriptCommand = new RelayCommand(OnNewScriptCommand);
        }
        
-        // TODO: Replace with MVVMLight ViewModel Messages
-        public RelayCommand OpenScriptCommand { get { return null; } }
-        public RelayCommand NewScriptCommand { get { return null; } }
+        public RelayCommand OpenScriptCommand { get; private set; }
+        public RelayCommand NewScriptCommand { get; private set; }

        public bool IsScript { get { return false; } }
+
+        private static void OnOpenScriptCommand()
+        {
+            Messenger.Default.Send(new NotificationMessage("OpenScript"));
+        }
+
+        private static void OnNewScriptCommand()
+        {
+            Messenger.Default.Send(new NotificationMessage("NewScript"));
+        }
    }
 }
--- a/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
+++ b/Filtration/Views/AvalonDock/AvalonDockWorkspaceView.xaml
@ -22,7 +22,7 @@
                             AnchorablesSource="{Binding Tools}"
                             AllowMixedOrientation="True"
                             DocumentsSource="{Binding OpenDocuments}"
-                             ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}">
+                             ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}" >
            <xcad:DockingManager.LayoutItemTemplateSelector>
                <viewsAvalonDock:PanesTemplateSelector>
                    <viewsAvalonDock:PanesTemplateSelector.ItemFilterScriptTemplate>
@ -79,7 +79,7 @@
                <xcad:LayoutPanel Orientation="Horizontal">
                    <xcad:LayoutAnchorablePane Name="SectionBrowserPane" DockWidth="150" />
                    <xcad:LayoutDocumentPane/>
-                    <xcad:LayoutAnchorablePane Name="BlockGroupBrowserPane" DockWidth="150" />
+                    <xcad:LayoutAnchorablePane Name="BlockGroupBrowserPane" DockWidth="200" />
                </xcad:LayoutPanel>
            </xcad:LayoutRoot>
        </xcad:DockingManager>
--- a/Filtration/Views/AvalonDock/LayoutInitializer.cs
+++ b/Filtration/Views/AvalonDock/LayoutInitializer.cs
@ -1,4 +1,6 @@
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Linq;
+using Filtration.ViewModels;
+using Xceed.Wpf.AvalonDock.Layout;

 namespace Filtration.Views.AvalonDock
 {
@ -14,6 +16,16 @@ namespace Filtration.Views.AvalonDock
                destinationContainer.FindParent<LayoutFloatingWindow>() != null)
                return false;

+            if (anchorableToShow.Content is SectionBrowserViewModel)
+            {
+                var toolsPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "SectionBrowserPane");
+                if (toolsPane != null)
+                {
+                    anchorableToShow.CanHide = false;
+                    toolsPane.Children.Add(anchorableToShow);
+                    return true;
+                }
+            }
            //if (anchorableToShow.ContentId == "SectionBrowserTool")
            //{
            //    var toolsPane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(d => d.Name == "SectionBrowserPane");
--- a/Filtration/Views/Behaviors/BindableSelectedItemBehavior.cs
+++ b/Filtration/Views/Behaviors/BindableSelectedItemBehavior.cs
@ -0,0 +1,55 @@
+// Taken from http://stackoverflow.com/a/5118406/4153185
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interactivity;
+
+namespace Filtration.Views.Behaviors
+{
+    internal class BindableSelectedItemBehavior : Behavior<TreeView>
+    {
+        #region SelectedItem Property
+
+        public object SelectedItem
+        {
+            get { return GetValue(SelectedItemProperty); }
+            set { SetValue(SelectedItemProperty, value); }
+        }
+
+        public static readonly DependencyProperty SelectedItemProperty =
+            DependencyProperty.Register("SelectedItem", typeof (object), typeof (BindableSelectedItemBehavior),
+                new UIPropertyMetadata(null, OnSelectedItemChanged));
+
+        private static void OnSelectedItemChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            var item = e.NewValue as TreeViewItem;
+            if (item != null)
+            {
+                item.SetValue(TreeViewItem.IsSelectedProperty, true);
+            }
+        }
+
+        #endregion
+
+        protected override void OnAttached()
+        {
+            base.OnAttached();
+
+            AssociatedObject.SelectedItemChanged += OnTreeViewSelectedItemChanged;
+        }
+
+        protected override void OnDetaching()
+        {
+            base.OnDetaching();
+
+            if (AssociatedObject != null)
+            {
+                AssociatedObject.SelectedItemChanged -= OnTreeViewSelectedItemChanged;
+            }
+        }
+
+        private void OnTreeViewSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            SelectedItem = e.NewValue;
+        }
+    }
+}
--- a/Filtration/Views/IconsDictionary.xaml
+++ b/Filtration/Views/IconsDictionary.xaml
@ -17,4 +17,6 @@
    <Image Source="/Filtration;component/Resources/Icons/play_icon.png" x:Key="PlayIcon" x:Shared="false" />
    <Image Source="/Filtration;component/Resources/Icons/about_icon.png" x:Key="AboutIcon" x:Shared="false" />
    <Image Source="/Filtration;component/Resources/Icons/replace_colors_icon.png" x:Key="ReplaceColorsIcon" x:Shared="false" />
+    <Image Source="/Filtration;component/Resources/Icons/clear_filter_icon.png" x:Key="ClearFilterIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/filter_icon.png" x:Key="FilterIcon" x:Shared="False" />
 </ResourceDictionary>
--- a/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml
+++ b/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml
@ -62,7 +62,7 @@
                                <ColumnDefinition SharedSizeGroup="AudioVisualBlockItemCloseColumn" Width="Auto"  />
                            </Grid.ColumnDefinitions>
                            <TextBlock Grid.Column="0" Text="{Binding DisplayHeading}" Style="{StaticResource DisplayHeading}" />
-                            <xctk:ColorPicker Grid.Column="1" SelectedColor="{Binding Color}" HorizontalAlignment="Right" Width="100" />
+                            <xctk:ColorPicker Grid.Column="1" SelectedColor="{Binding Color}" HorizontalAlignment="Right" Width="100" AvailableColors="{Binding ElementName=SettingsGrid, Path=DataContext.AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors"/>
                            <userControls:CrossButton Grid.Column="2" Height="12" Command="{Binding ElementName=SettingsGrid, Path=DataContext.RemoveAudioVisualBlockItemCommand}" CommandParameter="{Binding}" />
                        </Grid>
                    </DataTemplate>
--- a/Filtration/Views/ItemFilterScriptView.xaml
+++ b/Filtration/Views/ItemFilterScriptView.xaml
@ -47,39 +47,22 @@
        </Border>
        <Border Grid.Row="1" BorderThickness="1" BorderBrush="DarkGray" Margin="5,5,5,5" Padding="2">
            <DockPanel LastChildFill="True">
-            <ToolBarTray DockPanel.Dock="Top">
-                <ToolBar>
-                    <Button ToolTip="Add Block" Command="{Binding AddBlockCommand}" Content="{StaticResource AddBlockIcon}" />
-                    <Button ToolTip="Add Section" Command="{Binding AddSectionCommand}" Content="{StaticResource AddSectionIcon}" />
+                <ToolBarTray DockPanel.Dock="Top">
+                    <ToolBar>
+                        <Button ToolTip="Add Block" Command="{Binding AddBlockCommand}" Content="{StaticResource AddBlockIcon}" />
+                        <Button ToolTip="Add Section" Command="{Binding AddSectionCommand}" Content="{StaticResource AddSectionIcon}" />
                        <Button ToolTip="Delete Block/Section" Command="{Binding DeleteBlockCommand}" Content="{StaticResource DeleteIcon}" />
                    </ToolBar>
-                <ToolBar>
-                    <Button ToolTip="Move Block to Top" Command="{Binding MoveBlockToTopCommand}" Content="{StaticResource MoveToTopIcon}" />
-                    <Button ToolTip="Move Block Up" Command="{Binding MoveBlockUpCommand}" Content="{StaticResource MoveUpIcon}" />
-                    <Button ToolTip="Move Block Down" Command="{Binding MoveBlockDownCommand}" Content="{StaticResource MoveDownIcon}" />
-                    <Button ToolTip="Move Block to Bottom" Command="{Binding MoveBlockToBottomCommand}" Content="{StaticResource MoveToBottomIcon}" />
-                </ToolBar>
+                    <ToolBar>
+                        <Button ToolTip="Move Block to Top" Command="{Binding MoveBlockToTopCommand}" Content="{StaticResource MoveToTopIcon}" />
+                        <Button ToolTip="Move Block Up" Command="{Binding MoveBlockUpCommand}" Content="{StaticResource MoveUpIcon}" />
+                        <Button ToolTip="Move Block Down" Command="{Binding MoveBlockDownCommand}" Content="{StaticResource MoveDownIcon}" />
+                        <Button ToolTip="Move Block to Bottom" Command="{Binding MoveBlockToBottomCommand}" Content="{StaticResource MoveToBottomIcon}" />
+                    </ToolBar>
+                    <ToolBar>
+                        <Button ToolTip="Clear Filter" Command="{Binding ClearFilterCommand}" Content="{StaticResource ClearFilterIcon}" />
+                    </ToolBar>
                </ToolBarTray>
-                <!--<Expander DockPanel.Dock="Left" ExpandDirection="Right" MaxWidth="200" HorizontalAlignment="Left" >
-                    <Expander.Header>
-                        <TextBlock Text="Section Browser" Foreground="White" VerticalAlignment="Top">
-                            <TextBlock.LayoutTransform>
-                                <RotateTransform Angle="-90"/>
-                            </TextBlock.LayoutTransform>
-                        </TextBlock>
-                    </Expander.Header>
-                    <ListBox ItemsSource="{Binding ItemFilterSectionViewModels}"
-                             SelectedItem="{Binding SectionBrowserSelectedViewModel}"
-                             x:Name="SectionBrowserListBox"
-                             SelectionChanged="SectionBrowserListBox_OnSelectionChanged"
-                             ScrollViewer.HorizontalScrollBarVisibility="Hidden">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding BlockDescription}" ToolTip="{Binding BlockDescription}" />
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </Expander>-->
                <userControls:AutoScrollingListBox ItemsSource="{Binding ItemFilterBlockViewModels}"
                                                   Margin="5,5,5,5"
                                                   Padding="5"
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@ -9,7 +9,7 @@
        xmlns:viewsAvalonDock="clr-namespace:Filtration.Views.AvalonDock"
        mc:Ignorable="d"
        d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
-        Title="{Binding WindowTitle}" Height="707" Width="930" BorderThickness="1" BorderBrush="Black">
+        Title="{Binding WindowTitle}" Height="768" Width="1024" BorderThickness="1" BorderBrush="Black">
    <DockPanel>
        <Menu DockPanel.Dock="Top">
            <MenuItem Header="_File">
--- a/Filtration/Views/PathOfExileColors.cs
+++ b/Filtration/Views/PathOfExileColors.cs
@ -0,0 +1,48 @@
+using System.Collections.ObjectModel;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit;
+
+namespace Filtration.Views
+{
+    static internal class PathOfExileColors
+    {
+        static PathOfExileColors()
+        {
+            DefaultColors = new ObservableCollection<ColorItem>
+            {
+                 new ColorItem(new Color {A = 255, R=127, G = 127, B = 127}, "Default"),
+                        new ColorItem(new Color {A = 255, R=255, G = 255, B = 255}, "Value Default"),
+                        new ColorItem(new Color {A = 255, R=255, G = 192, B = 203}, "Pink"),
+                        new ColorItem(new Color {A = 255, R=30, G = 144, B = 255}, "Dodger Blue"),
+                        new ColorItem(new Color {A = 255, R=150, G = 0, B = 0}, "Fire"),
+                        new ColorItem(new Color {A = 255, R=54, G = 100, B = 146}, "Cold"),
+                        new ColorItem(new Color {A = 255, R=255, G = 215, B = 0}, "Lightning"),
+                        new ColorItem(new Color {A = 255, R=208, G = 32, B = 144}, "Chaos"),
+                        new ColorItem(new Color {A = 255, R=136, G = 136, B = 255}, "Augmented"),
+                        new ColorItem(new Color {A = 255, R=184, G = 218, B = 242}, "Crafted"),
+                        new ColorItem(new Color {A = 255, R=210, G = 0, B = 0}, "Unmet"),
+                        new ColorItem(new Color {A = 255, R=175, G = 96, B = 37}, "Unique Item"),
+                        new ColorItem(new Color {A = 255, R=255, G = 255, B = 119}, "Rare Item"),
+                        new ColorItem(new Color {A = 255, R=136, G = 136, B = 255}, "Magic Item"),
+                        new ColorItem(new Color {A = 255, R=200, G = 200, B = 200}, "White Item"),
+                        new ColorItem(new Color {A = 255, R=27, G = 162, B = 155}, "Gem Item"),
+                        new ColorItem(new Color {A = 255, R=170, G = 158, B = 130}, "Currency Item"),
+                        new ColorItem(new Color {A = 255, R=74, G = 230, B = 58}, "Quest Item"),
+                        new ColorItem(new Color {A = 255, R=255, G = 200, B = 0}, "Nemesis Mod"),
+                        new ColorItem(new Color {A = 220, R = 255, G = 40, B = 0}, "Nemesis Mod Outline"),
+                        new ColorItem(new Color {A = 255, R=231, G = 180, B = 120}, "Title"),
+                        new ColorItem(new Color {A = 255, R=210, G = 0, B = 0}, "Corrupted"),
+                        new ColorItem(new Color {A = 255, R=170, G = 158, B = 130}, "Favour"),
+                        new ColorItem(new Color {A = 255, R=180, G = 96, B = 0}, "Supporter Pack New Item"),
+                        new ColorItem(new Color {A = 255, R=163, G = 141, B = 109}, "Supporter Pack Item"),
+                        new ColorItem(new Color {A = 255, R=210, G = 0, B = 220}, "Bloodline Mod"),
+                        new ColorItem(new Color {A = 200, R = 74, G = 0, B = 160}, "Bloodline Mod Outline"),
+                        new ColorItem(new Color {A = 255, R=50, G = 230, B = 100}, "Torment Mod"),
+                        new ColorItem(new Color {A = 200, R = 0, G = 100, B = 150}, "Torment Mod Outline"),
+                        new ColorItem(new Color {A = 255, R=210, G = 0, B = 0}, "Can't Trade or Modify")
+            };
+        }
+
+        public static ObservableCollection<ColorItem> DefaultColors { get; private set; }
+    }
+}
--- a/Filtration/Views/ReplaceColorsWindow.xaml
+++ b/Filtration/Views/ReplaceColorsWindow.xaml
@ -40,22 +40,22 @@
        </Grid.ColumnDefinitions>
        <CheckBox Grid.Row="0" Grid.Column="0" Content="Replace Text Color" IsChecked="{Binding ReplaceTextColor}" />
        <TextBlock Grid.Row="0" Grid.Column="2" VerticalAlignment="Center">Existing Text Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="0" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldTextColor}"  />
+        <xctk:ColorPicker Grid.Row="0" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldTextColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
        <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">New Text Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="1" Grid.Column="4" SelectedColor="{Binding NewTextColor}"  />
+        <xctk:ColorPicker Grid.Row="1" Grid.Column="4" SelectedColor="{Binding NewTextColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />


        <CheckBox Grid.Row="2" Grid.Column="0" Content="Replace Background Color" IsChecked="{Binding ReplaceBackgroundColor}" />
        <TextBlock Grid.Row="2" Grid.Column="2" VerticalAlignment="Center">Existing Background Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="2" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBackgroundColor}"  />
+        <xctk:ColorPicker Grid.Row="2" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBackgroundColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
        <TextBlock Grid.Row="3" Grid.Column="2" VerticalAlignment="Center">New Background Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="3" Grid.Column="4" SelectedColor="{Binding NewBackgroundColor}"  />
+        <xctk:ColorPicker Grid.Row="3" Grid.Column="4" SelectedColor="{Binding NewBackgroundColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />

        <CheckBox Grid.Row="4" Grid.Column="0" Content="Replace Border Color" IsChecked="{Binding ReplaceBorderColor}" />
        <TextBlock Grid.Row="4" Grid.Column="2" VerticalAlignment="Center">Existing Border Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="4" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBorderColor}"  />
+        <xctk:ColorPicker Grid.Row="4" Grid.Column="4" SelectedColor="{Binding ReplaceColorsParameterSet.OldBorderColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />
        <TextBlock Grid.Row="5" Grid.Column="2" VerticalAlignment="Center">New Border Color</TextBlock>
-        <xctk:ColorPicker Grid.Row="5" Grid.Column="4" SelectedColor="{Binding NewBorderColor}"  />
+        <xctk:ColorPicker Grid.Row="5" Grid.Column="4" SelectedColor="{Binding NewBorderColor}" AvailableColors="{Binding AvailableColors}" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors" />

        <userControls:ItemPreviewControl Grid.Row="6" Grid.Column="4" TextColor="{Binding DisplayTextColor}" BackgroundColor="{Binding DisplayBackgroundColor}" BorderColor="{Binding DisplayBorderColor}" />
        <TextBlock Grid.Row="6" Grid.Column="2" VerticalAlignment="Center">Preview</TextBlock>
--- a/Filtration/Views/ToolPanes/BlockGroupBrowserView.xaml
+++ b/Filtration/Views/ToolPanes/BlockGroupBrowserView.xaml
@ -5,6 +5,8 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:models="clr-namespace:Filtration.Models"
             xmlns:viewModels="clr-namespace:Filtration.ViewModels"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:behaviors="clr-namespace:Filtration.Views.Behaviors"
             mc:Ignorable="d" 
             d:DataContext="{d:DesignInstance Type=viewModels:BlockGroupBrowserViewModel}"
             d:DesignHeight="300" d:DesignWidth="300">
@ -12,11 +14,22 @@

    </UserControl.Resources>
    <Grid>
-        <TreeView ItemsSource="{Binding BlockGroups}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <ToolBar Grid.Row="0">
+            <Button Height="20" Command="{Binding FilterToSelectedBlockGroupCommand}" Content="{StaticResource FilterIcon}" ToolTip="Filter to Selected Block Group" />
+        </ToolBar>
+        
+        <TreeView Grid.Row="1" ItemsSource="{Binding BlockGroups}">
+            <i:Interaction.Behaviors>
+                <behaviors:BindableSelectedItemBehavior SelectedItem="{Binding SelectedBlockGroup, Mode=OneWayToSource}" />
+            </i:Interaction.Behaviors>
            <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type models:ItemFilterBlockGroup}" ItemsSource="{Binding ChildGroups}">
                    <WrapPanel>
-                        <CheckBox IsThreeState="True" IsChecked="{Binding IsChecked}" Click="BlockGroupCheckBox_Clicked"  />
+                        <CheckBox IsThreeState="True" IsChecked="{Binding IsChecked}" Click="BlockGroupCheckBox_Clicked"   />
                        <TextBlock Text="{Binding GroupName}" />
                    </WrapPanel>
                </HierarchicalDataTemplate>
--- a/Filtration/Views/ToolPanes/SectionBrowserView.xaml
+++ b/Filtration/Views/ToolPanes/SectionBrowserView.xaml
@ -4,9 +4,13 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:viewModels="clr-namespace:Filtration.ViewModels"
+             xmlns:converters="clr-namespace:Filtration.Converters"
             d:DataContext="{d:DesignInstance Type=viewModels:SectionBrowserViewModel}"
             mc:Ignorable="d" 
             d:DesignHeight="300" d:DesignWidth="300">
+    <UserControl.Resources>
+        <converters:HashSignRemovalConverter x:Key="HashSignRemovalConverter" />
+    </UserControl.Resources>
    <Grid>
        <ListBox ItemsSource="{Binding SectionBlockViewModels}"
                             SelectedItem="{Binding SelectedSectionBlockViewModel}"
@ -14,7 +18,7 @@
                             ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
            <ListBox.ItemTemplate>
                <DataTemplate>
-                    <TextBlock Text="{Binding Block.Description}" ToolTip="{Binding Block.Description}" />
+                    <TextBlock Text="{Binding Block.Description, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Block.Description}" />
                </DataTemplate>
            </ListBox.ItemTemplate>
        </ListBox>