Merge branch 'bugfix/FixBlockOutputPreview'

Filtration/Filtration.nuspec

@@ -9,26 +9,9 @@
     <description>A Path of Exile loot filter script editor</description>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
-    <releaseNotes>### New Features
+    <releaseNotes>* Fixed the Block Output Preview pane not working
-
+* The Block Output Preview pane now supports previewing multiple selected blocks
-* Implemented copying and pasting of multiple blocks (multiple blocks can be selected by holding the Ctrl and/or Shift keys while clicking)
+* The Block Output Preview pane now supports selecting the text within it</releaseNotes>
-* Added Expand All, Collapse All, and Clear All Filters buttons to the Block Group Browser
-* It is now possible to add/remove Block Groups from blocks (there is a new text box and a + button on each block in the editor)
-* The Block Group browser now has an additional column of checkboxes which enables block groups to be enabled/disabled as well as shown/hidden
-* Implemented a new auto-update mechanism - previous versions of Filtration will need to be manually uninstalled
-* The state (maximised/restored) and size of the application window is now remembered
-* The visibility of the Section Browser, Block Group Browser, and Block Output Preview tool panes is now remembered
-* The last active script is now re-opened on when the application is launched
-
-### Bug Fixes / Improvements
-
-* Fixed incorrect filtering behavior in the Block Group Browser
-* Increased the maximum value of Quality block items to 30 from 20
-* Changed default opacity of colours to 240 from 255
-* MinimapIcon preview icons have been improved in appearance and now have a transparent background
-* Fixed an issue where several section-related commands didn't correctly mark the script as unsaved
-* Increased the HasExplicitMod block item limit from 1 to 8 since it is possible to use up to 8 of these blocks together to only match items that have an explicit mod from all HasExplicitMod block items within a block
-* Changed the default colours of TextColor, BorderColor and BackgroundColor block items to sensible defaults instead of 100% transparent</releaseNotes>
     <dependencies />
   </metadata>
   <files>

Filtration/Properties/AssemblyInfo.cs

@@ -10,8 +10,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

Filtration/ViewModels/ItemFilterScriptViewModel.cs

@@ -143,6 +143,7 @@ namespace Filtration.ViewModels
             {
                 RaisePropertyChanged(nameof(SelectedBlockViewModels));
                 RaisePropertyChanged(nameof(LastSelectedBlockViewModel));
+                Messenger.Default.Send(new NotificationMessage("LastSelectedBlockChanged"));
             };
             _lastAddedBlocks = new List<IItemFilterBlockViewModelBase>();
             _showAdvanced = Settings.Default.ShowAdvanced;

Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Media.Imaging;
 using Filtration.Parser.Interface.Services;
 using GalaSoft.MvvmLight.Messaging;
@@ -28,19 +29,10 @@ namespace Filtration.ViewModels.ToolPanes
 
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
-                switch (message.Notification)
+                if (message.Notification == "LastSelectedBlockChanged")
-                {
+                    OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                    case "LastSelectedBlockChanged":
+                else if (message.Notification == "ActiveDocumentChanged")
-                    {
+                    OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                    case "ActiveDocumentChanged":
-                    {
-                        OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                }
             });
 
         }
@@ -49,7 +41,7 @@ namespace Filtration.ViewModels.ToolPanes
 
         public string PreviewText
         {
-            get { return _previewText; }
+            get => _previewText;
             private set
             {
                 _previewText = value;
@@ -64,15 +56,16 @@ namespace Filtration.ViewModels.ToolPanes
 
         private void OnLastSelectedBlockChanged(object sender, EventArgs e)
         {
-            if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.LastSelectedBlockViewModel == null)
+            if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.SelectedBlockViewModels == null || 
+                AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.Count == 0)
             {
                 PreviewText = string.Empty;
                 return;
             }
-
+            
-            PreviewText =
+            PreviewText = AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels
-                _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(
+                .Select(s => _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(s.BaseBlock))
-                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.LastSelectedBlockViewModel.BaseBlock);
+                .Aggregate((prev, curr) => prev + Environment.NewLine + Environment.NewLine + curr);
         }
     }
 }

Filtration/Views/ToolPanes/BlockOutputPreviewView.xaml

@@ -8,6 +8,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
-        <TextBlock Text="{Binding PreviewText}" ToolTip="{Binding PreviewText}" Margin="10" />
+        <TextBox IsReadOnly="True" Text="{Binding PreviewText, Mode=OneWay}" ToolTip="{Binding PreviewText}" Padding="5" Background="Transparent" BorderThickness="0" />
     </Grid>
 </UserControl>