Fix the contextual Delete Section command.
This commit is contained in:
parent
07fdc2eb49
commit
d96234f099
|
@ -1,4 +1,5 @@
|
||||||
using Filtration.ObjectModel;
|
using Filtration.ObjectModel;
|
||||||
|
using GalaSoft.MvvmLight.CommandWpf;
|
||||||
|
|
||||||
namespace Filtration.ViewModels
|
namespace Filtration.ViewModels
|
||||||
{
|
{
|
||||||
|
@ -10,12 +11,34 @@ namespace Filtration.ViewModels
|
||||||
|
|
||||||
internal class ItemFilterCommentBlockViewModel : ItemFilterBlockViewModelBase, IItemFilterCommentBlockViewModel
|
internal class ItemFilterCommentBlockViewModel : ItemFilterBlockViewModelBase, IItemFilterCommentBlockViewModel
|
||||||
{
|
{
|
||||||
|
private IItemFilterScriptViewModel _parentScriptViewModel;
|
||||||
|
|
||||||
public ItemFilterCommentBlockViewModel()
|
public ItemFilterCommentBlockViewModel()
|
||||||
{
|
{
|
||||||
|
CopyBlockCommand = new RelayCommand(OnCopyBlockCommand);
|
||||||
|
PasteBlockCommand = new RelayCommand(OnPasteBlockCommand);
|
||||||
|
AddBlockCommand = new RelayCommand(OnAddBlockCommand);
|
||||||
|
AddSectionCommand = new RelayCommand(OnAddSectionCommand);
|
||||||
|
DeleteBlockCommand = new RelayCommand(OnDeleteBlockCommand);
|
||||||
|
MoveBlockUpCommand = new RelayCommand(OnMoveBlockUpCommand);
|
||||||
|
MoveBlockDownCommand = new RelayCommand(OnMoveBlockDownCommand);
|
||||||
|
MoveBlockToTopCommand = new RelayCommand(OnMoveBlockToTopCommand);
|
||||||
|
MoveBlockToBottomCommand = new RelayCommand(OnMoveBlockToBottomCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RelayCommand CopyBlockCommand { get; }
|
||||||
|
public RelayCommand PasteBlockCommand { get; }
|
||||||
|
public RelayCommand AddBlockCommand { get; }
|
||||||
|
public RelayCommand AddSectionCommand { get; }
|
||||||
|
public RelayCommand DeleteBlockCommand { get; }
|
||||||
|
public RelayCommand MoveBlockUpCommand { get; }
|
||||||
|
public RelayCommand MoveBlockDownCommand { get; }
|
||||||
|
public RelayCommand MoveBlockToTopCommand { get; }
|
||||||
|
public RelayCommand MoveBlockToBottomCommand { get; }
|
||||||
|
|
||||||
public override void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
|
public override void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
|
||||||
{
|
{
|
||||||
|
_parentScriptViewModel = itemFilterScriptViewModel;
|
||||||
ItemFilterCommentBlock = itemfilterBlock as IItemFilterCommentBlock;
|
ItemFilterCommentBlock = itemfilterBlock as IItemFilterCommentBlock;
|
||||||
BaseBlock = ItemFilterCommentBlock;
|
BaseBlock = ItemFilterCommentBlock;
|
||||||
|
|
||||||
|
@ -25,5 +48,50 @@ namespace Filtration.ViewModels
|
||||||
public IItemFilterCommentBlock ItemFilterCommentBlock { get; private set; }
|
public IItemFilterCommentBlock ItemFilterCommentBlock { get; private set; }
|
||||||
|
|
||||||
public string Comment => ItemFilterCommentBlock.Comment;
|
public string Comment => ItemFilterCommentBlock.Comment;
|
||||||
|
|
||||||
|
private void OnCopyBlockCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.CopyBlock(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPasteBlockCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.PasteBlock(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnAddBlockCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.AddBlock(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnAddSectionCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.AddCommentBlock(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDeleteBlockCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.DeleteBlock(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMoveBlockUpCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.MoveBlockUp(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMoveBlockDownCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.MoveBlockDown(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMoveBlockToTopCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.MoveBlockToTop(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnMoveBlockToBottomCommand()
|
||||||
|
{
|
||||||
|
_parentScriptViewModel.MoveBlockToBottom(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,16 +4,47 @@
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:viewModels="clr-namespace:Filtration.ViewModels"
|
xmlns:viewModels="clr-namespace:Filtration.ViewModels"
|
||||||
|
xmlns:views="clr-namespace:Filtration.Views"
|
||||||
|
xmlns:converters="clr-namespace:Filtration.Converters"
|
||||||
d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterCommentBlockViewModel}"
|
d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterCommentBlockViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="50" d:DesignWidth="300">
|
d:DesignHeight="50" d:DesignWidth="300">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
|
<ResourceDictionary>
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<ResourceDictionary>
|
||||||
|
<views:BindingProxy x:Key="Proxy" Data="{Binding}" />
|
||||||
|
<converters:BlockGroupAdvancedFillColorConverter x:Key="BlockGroupAdvancedFillColorConverter" />
|
||||||
|
<Style TargetType="{x:Type ContentPresenter}" x:Key="BlockItemFadeInStyle">
|
||||||
|
<Setter Property="LayoutTransform">
|
||||||
|
<Setter.Value>
|
||||||
|
<ScaleTransform x:Name="transform" />
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Style.Triggers>
|
||||||
|
<EventTrigger RoutedEvent="Loaded">
|
||||||
|
<EventTrigger.Actions>
|
||||||
|
<BeginStoryboard>
|
||||||
|
<Storyboard>
|
||||||
|
<DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:0.5" />
|
||||||
|
</Storyboard>
|
||||||
|
</BeginStoryboard>
|
||||||
|
</EventTrigger.Actions>
|
||||||
|
</EventTrigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
</ResourceDictionary>
|
||||||
|
<ResourceDictionary>
|
||||||
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MetroTextBox}">
|
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MetroTextBox}">
|
||||||
<Style.Setters>
|
<Style.Setters>
|
||||||
<Setter Property="BorderBrush" Value="Transparent" />
|
<Setter Property="BorderBrush" Value="Transparent" />
|
||||||
<Setter Property="Background" Value="Transparent" />
|
<Setter Property="Background" Value="Transparent" />
|
||||||
</Style.Setters>
|
</Style.Setters>
|
||||||
</Style>
|
</Style>
|
||||||
|
</ResourceDictionary>
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
|
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ContextMenu>
|
<Grid.ContextMenu>
|
||||||
|
@ -25,7 +56,7 @@
|
||||||
<MenuItem Header="Add Block" Command="{Binding AddBlockCommand}" Icon="{StaticResource AddBlockIcon}" />
|
<MenuItem Header="Add Block" Command="{Binding AddBlockCommand}" Icon="{StaticResource AddBlockIcon}" />
|
||||||
<MenuItem Header="Add Section" Command="{Binding AddSectionCommand}" Icon="{StaticResource AddSectionIcon}" />
|
<MenuItem Header="Add Section" Command="{Binding AddSectionCommand}" Icon="{StaticResource AddSectionIcon}" />
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem Header="Delete Section" Command="{Binding DeleteBlockCommand}" Icon="{StaticResource DeleteIcon}" />
|
<MenuItem Header="Delete Section" Command="{Binding Data.DeleteBlockCommand, Source={StaticResource Proxy}}" Icon="{StaticResource DeleteIcon}" />
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem Header="Move Section To Top" Command="{Binding MoveBlockToTopCommand}" Icon="{StaticResource MoveToTopIcon}" />
|
<MenuItem Header="Move Section To Top" Command="{Binding MoveBlockToTopCommand}" Icon="{StaticResource MoveToTopIcon}" />
|
||||||
<MenuItem Header="Move Section Up" Command="{Binding MoveBlockUpCommand}" Icon="{StaticResource MoveUpIcon}" />
|
<MenuItem Header="Move Section Up" Command="{Binding MoveBlockUpCommand}" Icon="{StaticResource MoveUpIcon}" />
|
||||||
|
|
Loading…
Reference in New Issue