mikx
/
Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add add/delete block group support to blocks

This commit is contained in:
azakhi 2018-09-07 15:26:12 +03:00
parent d23741555a
commit bfd722d362
6 changed files with 230 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Filtration.ObjectModel/ItemFilterBlockGroup.cs
View File

@ -17,14 +17,14 @@ namespace Filtration.ObjectModel
IsLeafNode = isLeafNode;
}
public event EventHandler BlockGroupStatusChanged;
public string GroupName { get; }
public ItemFilterBlockGroup ParentGroup { get; }
public ItemFilterBlockGroup ParentGroup { get; set; }
public List<ItemFilterBlockGroup> ChildGroups { get; }
public bool Advanced { get; }
public bool IsLeafNode { get; }
public event EventHandler BlockGroupStatusChanged;
public bool? IsShowChecked
{
get { return _isShowChecked; }
@ -55,6 +55,57 @@ namespace Filtration.ObjectModel
}
}
public void ClearStatusChangeSubscribers()
{
BlockGroupStatusChanged = null;
}
public void AddOrJoinBlockGroup(ItemFilterBlockGroup blockGroup)
{
var childIndex = ChildGroups.FindIndex(item => item.GroupName.Equals(blockGroup.GroupName));
if (!blockGroup.IsLeafNode && childIndex >= 0)
{
while(blockGroup.ChildGroups.Count > 0)
{
ChildGroups[childIndex].AddOrJoinBlockGroup(blockGroup.ChildGroups[0]);
}
}
else
{
if(blockGroup.ParentGroup != null)
{
blockGroup.ParentGroup.ChildGroups.Remove(blockGroup);
}
blockGroup.ParentGroup = this;
ChildGroups.Add(blockGroup);
}
}
public void DetachSelf(bool keepChildren)
{
if(ParentGroup == null)
return;
if(IsLeafNode && ParentGroup.ParentGroup != null && ParentGroup.ChildGroups.Count < 2)
{
ParentGroup.DetachSelf(false);
}
else
{
ParentGroup.ChildGroups.Remove(this);
if (keepChildren)
{
foreach(var child in ChildGroups)
{
ParentGroup.AddOrJoinBlockGroup(child);
}
}
ParentGroup = null;
}
}
public override string ToString()
{
if(ParentGroup == null)

6
Filtration/ViewModels/ItemFilterBlockGroupViewModel.cs
View File

@ -28,6 +28,7 @@ namespace Filtration.ViewModels
ParentGroup = parent;
Advanced = itemFilterBlockGroup.Advanced;
SourceBlockGroup = itemFilterBlockGroup;
SourceBlockGroup.ClearStatusChangeSubscribers();
SourceBlockGroup.BlockGroupStatusChanged += OnSourceBlockGroupStatusChanged;
IsShowChecked = itemFilterBlockGroup.IsShowChecked;
IsEnableChecked = itemFilterBlockGroup.IsEnableChecked;
@ -205,8 +206,9 @@ namespace Filtration.ViewModels
private void UpdateChildrenCheckState(bool isShowCheck)
{
// Update children only when state is not null
if(isShowCheck && IsShowChecked != null)
// Update children only when state is not null which means update is either from children
// (all children must have same value to be not null) or from user
if (isShowCheck && IsShowChecked != null)
{
foreach (var childGroup in ChildGroups.Where(c => IsShowChecked != null))
{

115
Filtration/ViewModels/ItemFilterBlockViewModel.cs
View File

@ -12,6 +12,7 @@ using Filtration.ObjectModel.Enums;
using Filtration.Services;
using Filtration.Views;
using GalaSoft.MvvmLight.CommandWpf;
using GalaSoft.MvvmLight.Messaging;
using Microsoft.Win32;
using Xceed.Wpf.Toolkit;
@ -52,6 +53,8 @@ namespace Filtration.ViewModels
PlayPositionalSoundCommand = new RelayCommand(OnPlayPositionalSoundCommand, () => HasPositionalSound);
PlayCustomSoundCommand = new RelayCommand(OnPlayCustomSoundCommand, () => HasCustomSound);
CustomSoundFileDialogCommand = new RelayCommand(OnCustomSoundFileDialog);
AddBlockGroupCommand = new RelayCommand(OnAddBlockGroupCommand);
DeleteBlockGroupCommand = new RelayCommand(OnDeleteBlockGroupCommand, () => BlockGroups.Count > 0);
}
public override void Initialise(IItemFilterBlockBase itemFilterBlockBase, IItemFilterScriptViewModel parentScriptViewModel)
@ -62,6 +65,8 @@ namespace Filtration.ViewModels
throw new ArgumentNullException(nameof(itemFilterBlock));
}
BlockGroups = new ObservableCollection<ItemFilterBlockGroup>();
_parentScriptViewModel = parentScriptViewModel;
Block = itemFilterBlock;
@ -74,6 +79,8 @@ namespace Filtration.ViewModels
blockItem.PropertyChanged += OnBlockItemChanged;
}
base.Initialise(itemFilterBlock, parentScriptViewModel);
UpdateBlockGroups();
}
public RelayCommand CopyBlockStyleCommand { get; }
@ -87,9 +94,16 @@ namespace Filtration.ViewModels
public RelayCommand SwitchBlockItemsViewCommand { get; }
public RelayCommand CustomSoundFileDialogCommand { get; }
public RelayCommand PlayCustomSoundCommand { get; }
public RelayCommand AddBlockGroupCommand { get; }
public RelayCommand DeleteBlockGroupCommand { get; }
public IItemFilterBlock Block { get; private set; }
public ObservableCollection<ItemFilterBlockGroup> BlockGroups { get; internal set; }
public ObservableCollection<string> BlockGroupSuggestions { get; internal set; }
public string BlockGroupSearch { get; set; }
public bool IsExpanded
{
@ -118,7 +132,7 @@ namespace Filtration.ViewModels
get { return Block.BlockItems.Where(b => b is IAudioVisualBlockItem); }
}
public bool AdvancedBlockGroup => Block.BlockGroup != null && Block.BlockGroup.Advanced;
public bool AdvancedBlockGroup => Block.BlockGroup?.ParentGroup != null && Block.BlockGroup.ParentGroup.Advanced;
public bool AudioVisualBlockItemsGridVisible
{
@ -535,5 +549,104 @@ namespace Filtration.ViewModels
MessageBox.Show("Couldn't play the file. Please be sure it is a valid audio file.");
}
}
private void OnAddBlockGroupCommand()
{
var baseBlock = Block as ItemFilterBlock;
if (baseBlock == null)
return;
if (!string.IsNullOrWhiteSpace(BlockGroupSearch))
{
var blockToAdd = _parentScriptViewModel.Script.ItemFilterBlockGroups.First();
if(BlockGroups.Count > 0)
{
blockToAdd = BlockGroups.Last();
}
var newGroup = new ItemFilterBlockGroup(BlockGroupSearch, null, AdvancedBlockGroup, false);
if (baseBlock.BlockGroup == null)
{
baseBlock.BlockGroup = new ItemFilterBlockGroup("", null, false, true);
baseBlock.BlockGroup.IsShowChecked = baseBlock.Action == BlockAction.Show;
baseBlock.BlockGroup.IsEnableChecked = BlockEnabled;
}
newGroup.AddOrJoinBlockGroup(baseBlock.BlockGroup);
blockToAdd.AddOrJoinBlockGroup(newGroup);
Block.IsEdited = true;
_parentScriptViewModel.SetDirtyFlag();
Messenger.Default.Send(new NotificationMessage<bool>(_parentScriptViewModel.ShowAdvanced, "BlockGroupsChanged"));
UpdateBlockGroups();
}
BlockGroupSearch = "";
RaisePropertyChanged(nameof(BlockGroupSearch));
}
private void OnDeleteBlockGroupCommand()
{
if(BlockGroups.Count > 0)
{
Block.BlockGroup.DetachSelf(false);
BlockGroups.RemoveAt(BlockGroups.Count - 1);
var blockToAdd = _parentScriptViewModel.Script.ItemFilterBlockGroups.First();
if (BlockGroups.Count > 0)
{
blockToAdd = BlockGroups.Last();
}
blockToAdd.AddOrJoinBlockGroup(Block.BlockGroup);
Block.IsEdited = true;
_parentScriptViewModel.SetDirtyFlag();
Messenger.Default.Send(new NotificationMessage<bool>(_parentScriptViewModel.ShowAdvanced, "BlockGroupsChanged"));
UpdateBlockGroups();
}
}
private void UpdateBlockGroups()
{
var baseBlock = Block as ItemFilterBlock;
if (baseBlock == null)
return;
var currentGroup = baseBlock.BlockGroup;
var groupList = new List<ItemFilterBlockGroup>();
while (currentGroup != null)
{
groupList.Add(currentGroup);
currentGroup = currentGroup.ParentGroup;
}
var topGroup = _parentScriptViewModel.Script.ItemFilterBlockGroups.First();
if (groupList.Count > 1)
{
groupList.Reverse();
groupList.RemoveAt(0);
groupList.RemoveAt(groupList.Count - 1);
if(groupList.Count > 0)
{
topGroup = groupList.Last();
}
}
BlockGroups = new ObservableCollection<ItemFilterBlockGroup>(groupList);
BlockGroupSuggestions = new ObservableCollection<string>();
foreach(var child in topGroup.ChildGroups)
{
if(!child.IsLeafNode)
{
BlockGroupSuggestions.Add(child.GroupName);
}
}
RaisePropertyChanged(nameof(BlockGroups));
RaisePropertyChanged(nameof(BlockGroupSuggestions));
}
}
}

7
Filtration/ViewModels/ToolPanes/BlockGroupBrowserViewModel.cs
View File

@ -43,6 +43,11 @@ namespace Filtration.ViewModels.ToolPanes
OnShowAdvancedToggled(message.Content);
break;
}
case "BlockGroupsChanged":
{
BlockGroupViewModels = RebuildBlockGroupViewModels(message.Content);
break;
}
}
});
@ -107,7 +112,7 @@ namespace Filtration.ViewModels.ToolPanes
// This assumes that there will only ever be a single root node.
return new ObservableCollection<ItemFilterBlockGroupViewModel>
(
new ItemFilterBlockGroupViewModel(AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script.ItemFilterBlockGroups.First(), showAdvanced, null).ChildGroups
new ItemFilterBlockGroupViewModel(AvalonDockWorkspaceViewModel.ActiveScriptViewModel.Script.ItemFilterBlockGroups.First(), showAdvanced, null).VisibleChildGroups
);
}

45
Filtration/Views/ItemFilterBlockView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:viewModels="clr-namespace:Filtration.ViewModels"
xmlns:userControls="clr-namespace:Filtration.UserControls"
xmlns:toolkit="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit"
xmlns:views="clr-namespace:Filtration.Views"
xmlns:converters="clr-namespace:Filtration.Converters"
xmlns:blockItemBaseTypes="clr-namespace:Filtration.ObjectModel.BlockItemBaseTypes;assembly=Filtration.ObjectModel"
@ -200,9 +201,47 @@
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid Grid.Row="0" Visibility="{Binding AudioVisualBlockItemsGridVisible, Converter={StaticResource InverseBooleanVisibilityConverter}}">
<WrapPanel Grid.Row="0">
<TextBlock Text="Group" VerticalAlignment="Center" FontWeight="Bold" />
<ItemsControl ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding BlockGroups}"
BorderThickness="0">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel IsItemsHost="True" Orientation="Horizontal" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<WrapPanel VerticalAlignment="Center">
<TextBlock Text=" > " FontWeight="ExtraBold" />
<TextBlock Text="{Binding GroupName}" />
</WrapPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Button Height="10" Command="{Binding DeleteBlockGroupCommand}" Content="{StaticResource DeleteIcon}" ToolTip="Delete"
Background="Transparent" BorderThickness="0" Margin="2,3,0,0" VerticalAlignment="Top">
<Button.Style>
<Style TargetType="{x:Type Button}" >
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Visibility" Value="Collapsed" />
</Trigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
<toolkit:AutoCompleteBox ItemsSource="{Binding BlockGroupSuggestions}" Text="{Binding BlockGroupSearch, Mode=TwoWay}"
MinWidth="100" Margin="5,0,0,0" BorderThickness="0, 0, 0, 1" FilterMode="Contains"
PreviewKeyDown="AutoCompleteBox_PreviewKeyDown" />
<Button Height="12" Command="{Binding AddBlockGroupCommand}" Content="{StaticResource AddIcon}"
ToolTip="Add" Background="Transparent" BorderThickness="0" Margin="3,0,0,0" />
</WrapPanel>
<Grid Grid.Row="1" Visibility="{Binding AudioVisualBlockItemsGridVisible, Converter={StaticResource InverseBooleanVisibilityConverter}}">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
@ -285,7 +324,7 @@
</ItemsControl>
</WrapPanel>
</Grid>
<Grid Grid.Row="0" Visibility="{Binding AudioVisualBlockItemsGridVisible, Converter={StaticResource BooleanVisibilityConverter}}">
<Grid Grid.Row="1" Visibility="{Binding AudioVisualBlockItemsGridVisible, Converter={StaticResource BooleanVisibilityConverter}}">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
@ -339,7 +378,7 @@
</ItemsControl>
</WrapPanel>
</Grid>
<Grid Grid.Row="1" Margin="0,5,0,5">
<Grid Grid.Row="2" Margin="0,5,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />

10
Filtration/Views/ItemFilterBlockView.xaml.cs
View File

@ -20,5 +20,15 @@ namespace Filtration.Views
BlockExpander.IsExpanded = !BlockExpander.IsExpanded;
}
private void AutoCompleteBox_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
System.Windows.Controls.AutoCompleteBox box = sender as System.Windows.Controls.AutoCompleteBox;
dynamic viewModel = box.DataContext;
viewModel.AddBlockGroupCommand.Execute(null);
}
}
}
}