Merge pull request #51 from GlenCFL/fixes

0.16 Regression Fixing

Filtration.ObjectModel/Commands/ItemFilterScript/AddCommentBlockCommand.cs

@@ -15,7 +15,10 @@ namespace Filtration.ObjectModel.Commands.ItemFilterScript
         }
         public void Execute()
         {
-            _newItemFilterBlock = new ItemFilterCommentBlock(_itemFilterScript);
+            _newItemFilterBlock = new ItemFilterCommentBlock(_itemFilterScript)
+            {
+                Comment = string.Empty
+            };
             if (_addAfterItemFilterBlock != null)
             {
                 _itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _newItemFilterBlock);

Filtration/ViewModels/ItemFilterBlockViewModel.cs

@@ -28,7 +28,6 @@ namespace Filtration.ViewModels
         private readonly IStaticDataService _staticDataService;
         private readonly IReplaceColorsViewModel _replaceColorsViewModel;
         private readonly MediaPlayer _mediaPlayer = new MediaPlayer();
-        private IItemFilterScriptViewModel _parentScriptViewModel;
 
         private bool _displaySettingsPopupOpen;
         private bool _isExpanded;
@@ -39,17 +38,8 @@ namespace Filtration.ViewModels
             _staticDataService = staticDataService;
             _replaceColorsViewModel = replaceColorsViewModel;
 
-            CopyBlockCommand = new RelayCommand(OnCopyBlockCommand);
-            PasteBlockCommand = new RelayCommand(OnPasteBlockCommand);
             CopyBlockStyleCommand = new RelayCommand(OnCopyBlockStyleCommand);
             PasteBlockStyleCommand = new RelayCommand(OnPasteBlockStyleCommand);
-            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);
             ReplaceColorsCommand = new RelayCommand(OnReplaceColorsCommand);
             AddFilterBlockItemCommand = new RelayCommand<Type>(OnAddFilterBlockItemCommand);
             ToggleBlockActionCommand = new RelayCommand(OnToggleBlockActionCommand);
@@ -82,17 +72,8 @@ namespace Filtration.ViewModels
             base.Initialise(itemFilterBlock, parentScriptViewModel);
         }
 
-        public RelayCommand CopyBlockCommand { get; }
-        public RelayCommand PasteBlockCommand { get; }
         public RelayCommand CopyBlockStyleCommand { get; }
         public RelayCommand PasteBlockStyleCommand { 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 RelayCommand ToggleBlockActionCommand { get; }
         public RelayCommand ReplaceColorsCommand { get; }
         public RelayCommand<Type> AddFilterBlockItemCommand { get; }
@@ -365,7 +346,7 @@ namespace Filtration.ViewModels
                 case "ShBlessed":
                     filePart = "SH22Blessed.wav";
                     break;
-                case "SH22Chaos":
+                case "ShChaos":
                     filePart = "SH22Chaos.wav";
                     break;
                 case "ShDivine":

Filtration/ViewModels/ItemFilterBlockViewModelBase.cs

@@ -1,6 +1,7 @@
 using System;
 using Filtration.ObjectModel;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
 
 namespace Filtration.ViewModels
 {
@@ -16,14 +17,40 @@ namespace Filtration.ViewModels
     {
         private bool _isDirty;
 
+        public ItemFilterBlockViewModelBase()
+        {
+            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 virtual void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
         {
             BaseBlock = itemfilterBlock;
+            _parentScriptViewModel = itemFilterScriptViewModel;
         }
 
         public event EventHandler BlockBecameDirty;
 
         public IItemFilterBlockBase BaseBlock { get; protected set; }
+        public IItemFilterScriptViewModel _parentScriptViewModel;
+
+        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 bool IsDirty
         {
@@ -38,5 +65,50 @@ namespace Filtration.ViewModels
                 }
             }
         }
+
+        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);
+        }
     }
 }

Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs

@@ -10,12 +10,9 @@ namespace Filtration.ViewModels
 
     internal class ItemFilterCommentBlockViewModel : ItemFilterBlockViewModelBase, IItemFilterCommentBlockViewModel
     {
-        public ItemFilterCommentBlockViewModel()
-        {
-        }
-
         public override void Initialise(IItemFilterBlockBase itemfilterBlock, IItemFilterScriptViewModel itemFilterScriptViewModel)
         {
+            _parentScriptViewModel = itemFilterScriptViewModel;
             ItemFilterCommentBlock = itemfilterBlock as IItemFilterCommentBlock;
             BaseBlock = ItemFilterCommentBlock;
 
@@ -24,6 +21,21 @@ namespace Filtration.ViewModels
 
         public IItemFilterCommentBlock ItemFilterCommentBlock { get; private set; }
 
-        public string Comment => ItemFilterCommentBlock.Comment;
+        public string Comment
+        {
+            get
+            {
+                return ItemFilterCommentBlock.Comment;
+            }
+            set
+            {
+                if (ItemFilterCommentBlock.Comment != value)
+                {
+                    ItemFilterCommentBlock.Comment = value;
+                    IsDirty = true;
+                    RaisePropertyChanged();
+                }
+            }
+        }
     }
 }

Filtration/Views/ItemFilterCommentBlockView.xaml

@@ -4,16 +4,47 @@
              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:views="clr-namespace:Filtration.Views"
+             xmlns:converters="clr-namespace:Filtration.Converters"
              d:DataContext="{d:DesignInstance Type=viewModels:ItemFilterCommentBlockViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="50" d:DesignWidth="300">
     <UserControl.Resources>
-        <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MetroTextBox}">
-            <Style.Setters>
-                <Setter Property="BorderBrush" Value="Transparent" />
-                <Setter Property="Background" Value="Transparent" />
-            </Style.Setters>
-        </Style>
+        <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.Setters>
+                        <Setter Property="BorderBrush" Value="Transparent" />
+                        <Setter Property="Background" Value="Transparent" />
+                    </Style.Setters>
+                </Style>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+        
     </UserControl.Resources>
     <Grid>
         <Grid.ContextMenu>
@@ -45,7 +76,7 @@
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <TextBox Grid.Column ="0" Text="{Binding Comment, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" VerticalAlignment="Center" TextWrapping="Wrap" MinWidth="150"/>
+                <TextBox Grid.Column ="0" Text="{Binding Comment, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" VerticalAlignment="Center" TextWrapping="Wrap" MinWidth="150"/>
             </Grid>
         </Border>
     </Grid>