diff --git a/Filtration/Converters/BooleanVisibilityConverter.cs b/Filtration/Converters/BooleanVisibilityConverter.cs
index 153b4c2..3be867a 100644
--- a/Filtration/Converters/BooleanVisibilityConverter.cs
+++ b/Filtration/Converters/BooleanVisibilityConverter.cs
@@ -5,7 +5,7 @@ using System.Windows.Data;
namespace Filtration.Converters
{
- internal class BooleanVisibilityConverter : IValueConverter
+ internal class BooleanVisibilityConverterCopy : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
diff --git a/Filtration/Converters/BooleanVisibilityConverterCopy.cs b/Filtration/Converters/BooleanVisibilityConverterCopy.cs
index 3be867a..153b4c2 100644
--- a/Filtration/Converters/BooleanVisibilityConverterCopy.cs
+++ b/Filtration/Converters/BooleanVisibilityConverterCopy.cs
@@ -5,7 +5,7 @@ using System.Windows.Data;
namespace Filtration.Converters
{
- internal class BooleanVisibilityConverterCopy : IValueConverter
+ internal class BooleanVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index bd56f1f..a4f364a 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -136,12 +136,13 @@
+
-
+
@@ -208,9 +209,6 @@
BlockGroupBrowserView.xaml
-
- ItemFilterBlockDisplaySettingsView.xaml
-
ItemFilterScriptView.xaml
@@ -298,10 +296,6 @@
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
Designer
MSBuild:Compile
diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index 7713caa..e28c716 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -50,7 +50,7 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.*")]
+[assembly: AssemblyVersion("0.6.*")]
[assembly: InternalsVisibleTo("Filtration.Tests")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml
index c589cdd..25b022f 100644
--- a/Filtration/UserControls/BlockItemControl.xaml
+++ b/Filtration/UserControls/BlockItemControl.xaml
@@ -8,6 +8,8 @@
xmlns:blockItemTypes="clr-namespace:Filtration.ObjectModel.BlockItemTypes;assembly=Filtration.ObjectModel"
xmlns:extensions="clr-namespace:Filtration.Extensions"
xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
+ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+ xmlns:views="clr-namespace:Filtration.Views"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=userControls:BlockItemControl}"
d:DesignHeight="200" d:DesignWidth="150">
@@ -38,7 +40,7 @@
-
+
@@ -81,6 +83,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Filtration/UserControls/BlockItemControl.xaml.cs b/Filtration/UserControls/BlockItemControl.xaml.cs
index f5a1932..2af5876 100644
--- a/Filtration/UserControls/BlockItemControl.xaml.cs
+++ b/Filtration/UserControls/BlockItemControl.xaml.cs
@@ -1,10 +1,14 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows;
using Filtration.Annotations;
using Filtration.ObjectModel;
using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.Views;
using GalaSoft.MvvmLight.CommandWpf;
+using Xceed.Wpf.Toolkit;
namespace Filtration.UserControls
{
@@ -70,6 +74,25 @@ namespace Filtration.UserControls
SetValue(RemoveEnabledProperty, value);
}
}
+
+
+ public ObservableCollection AvailableColors
+ {
+ get
+ {
+ {
+ return PathOfExileColors.DefaultColors;
+ }
+ }
+ }
+
+ public List SoundsAvailable
+ {
+ get
+ {
+ return new List { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+ }
+ }
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
index adee0b0..51a3ddc 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@@ -33,6 +33,7 @@ namespace Filtration.ViewModels
private bool _displaySettingsPopupOpen;
private bool _isExpanded;
+ private bool _audioVisualBlockItemsGridVisible;
public ItemFilterBlockViewModel(IStaticDataService staticDataService, IReplaceColorsViewModel replaceColorsViewModel)
{
@@ -55,7 +56,7 @@ namespace Filtration.ViewModels
ToggleBlockActionCommand = new RelayCommand(OnToggleBlockActionCommand);
AddAudioVisualBlockItemCommand = new RelayCommand(OnAddAudioVisualBlockItemCommand);
RemoveFilterBlockItemCommand = new RelayCommand(OnRemoveFilterBlockItemCommand);
- RemoveAudioVisualBlockItemCommand = new RelayCommand(OnRemoveAudioVisualBlockItemCommand);
+ SwitchBlockItemsViewCommand = new RelayCommand(OnSwitchBlockItemsViewCommand);
PlaySoundCommand = new RelayCommand(OnPlaySoundCommand, () => HasSound);
}
@@ -93,8 +94,8 @@ namespace Filtration.ViewModels
public RelayCommand AddFilterBlockItemCommand { get; private set; }
public RelayCommand AddAudioVisualBlockItemCommand { get; private set; }
public RelayCommand RemoveFilterBlockItemCommand { get; private set; }
- public RelayCommand RemoveAudioVisualBlockItemCommand { get; private set; }
public RelayCommand PlaySoundCommand { get; private set; }
+ public RelayCommand SwitchBlockItemsViewCommand { get; private set; }
public ItemFilterBlock Block { get; private set; }
@@ -120,6 +121,11 @@ namespace Filtration.ViewModels
get { return Block.BlockItems.Where(b => !(b is IAudioVisualBlockItem)); }
}
+ public IEnumerable RegularBlockItems
+ {
+ get { return Block.BlockItems.Where(b => !(b is IAudioVisualBlockItem)); }
+ }
+
public IEnumerable AudioVisualBlockItems
{
get { return Block.BlockItems.Where(b => b is IAudioVisualBlockItem); }
@@ -133,6 +139,20 @@ namespace Filtration.ViewModels
}
}
+ public bool AudioVisualBlockItemsGridVisible
+ {
+ get { return _audioVisualBlockItemsGridVisible; }
+ set
+ {
+ _audioVisualBlockItemsGridVisible = value;
+ RaisePropertyChanged();
+ if (value && IsExpanded == false)
+ {
+ IsExpanded = true;
+ }
+ }
+ }
+
public bool DisplaySettingsPopupOpen
{
get { return _displaySettingsPopupOpen; }
@@ -153,25 +173,6 @@ namespace Filtration.ViewModels
get { return _staticDataService.ItemBaseTypes; }
}
- public List SoundsAvailable
- {
- get
- {
- return new List
- {
- 1,
- 2,
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9
- };
- }
- }
-
public List BlockItemTypesAvailable
{
get
@@ -293,7 +294,6 @@ namespace Filtration.ViewModels
var fontSize = HasFontSize ? (BlockItems.OfType().First().Value / 1.8) : 19;
return fontSize;
-
}
}
@@ -302,6 +302,11 @@ namespace Filtration.ViewModels
get { return Block.HasBlockItemOfType(); }
}
+ private void OnSwitchBlockItemsViewCommand()
+ {
+ AudioVisualBlockItemsGridVisible = !AudioVisualBlockItemsGridVisible;
+ }
+
private void OnToggleBlockActionCommand()
{
var actionBlock = Block.BlockItems.OfType().First();
@@ -323,6 +328,13 @@ namespace Filtration.ViewModels
private void OnRemoveFilterBlockItemCommand(IItemFilterBlockItem blockItem)
{
BlockItems.Remove(blockItem);
+
+ if (blockItem is IAudioVisualBlockItem)
+ {
+ blockItem.PropertyChanged -= OnAudioVisualBlockItemChanged;
+ OnAudioVisualBlockItemChanged(this, EventArgs.Empty);
+ }
+
IsDirty = true;
}
@@ -333,15 +345,7 @@ namespace Filtration.ViewModels
newBlockItem.PropertyChanged += OnAudioVisualBlockItemChanged;
BlockItems.Add(newBlockItem);
- OnAudioVisualBlockItemChanged(null, null);
- IsDirty = true;
- }
-
- private void OnRemoveAudioVisualBlockItemCommand(IItemFilterBlockItem blockItem)
- {
- blockItem.PropertyChanged -= OnAudioVisualBlockItemChanged;
- BlockItems.Remove(blockItem);
- OnAudioVisualBlockItemChanged(null, null);
+ OnAudioVisualBlockItemChanged(this, EventArgs.Empty);
IsDirty = true;
}
@@ -437,6 +441,7 @@ namespace Filtration.ViewModels
private void OnBlockItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
{
+ RaisePropertyChanged("RegularBlockItems");
RaisePropertyChanged("SummaryBlockItems");
RaisePropertyChanged("AudioVisualBlockItems");
}
diff --git a/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml b/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml
deleted file mode 100644
index 46c991f..0000000
--- a/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml.cs b/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml.cs
deleted file mode 100644
index e2a5f99..0000000
--- a/Filtration/Views/ItemFilterBlockDisplaySettingsView.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Filtration.Views
-{
- public partial class ItemFilterBlockDisplaySettingsView
- {
- public ItemFilterBlockDisplaySettingsView()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml
index 92ec818..bafb426 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml
+++ b/Filtration/Views/ItemFilterBlockView.xaml
@@ -19,6 +19,24 @@
+
@@ -122,7 +140,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
-
-
-
-
-
+
+
+
+
+
+
+
+ Switch to Appearance Block Items
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
+
+
+ +
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Switch to Regular Block Items
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Filtration/Views/SharedResourcesDictionary.xaml b/Filtration/Views/SharedResourcesDictionary.xaml
index b4a4fbb..23b7544 100644
--- a/Filtration/Views/SharedResourcesDictionary.xaml
+++ b/Filtration/Views/SharedResourcesDictionary.xaml
@@ -39,6 +39,7 @@
+