Compare commits
No commits in common. "master" and "0" have entirely different histories.
@ -12,8 +12,6 @@
|
|||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<NuGetPackageImportStamp>
|
|
||||||
</NuGetPackageImportStamp>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@ -33,8 +31,17 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
@ -46,24 +53,7 @@
|
|||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="app.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Castle.Core">
|
|
||||||
<Version>4.4.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Moq">
|
|
||||||
<Version>4.10.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="NUnit">
|
|
||||||
<Version>3.11.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Threading.Tasks.Extensions">
|
|
||||||
<Version>4.5.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.ValueTuple">
|
|
||||||
<Version>4.5.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
6
Filtration.Common.Tests/packages.config
Normal file
6
Filtration.Common.Tests/packages.config
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Castle.Core" version="3.3.3" targetFramework="net461" />
|
||||||
|
<package id="Moq" version="4.5.30" targetFramework="net461" />
|
||||||
|
<package id="NUnit" version="3.6.1" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -31,13 +31,36 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Microsoft.Practices.ServiceLocation">
|
||||||
|
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<Reference Include="PresentationFramework" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Runtime.Remoting" />
|
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<Reference Include="System.Web" />
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Xaml" />
|
<Reference Include="System.Xaml" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
@ -52,20 +75,16 @@
|
|||||||
<Compile Include="Converters\ColorToSolidColorBrushConverter.cs" />
|
<Compile Include="Converters\ColorToSolidColorBrushConverter.cs" />
|
||||||
<Compile Include="Converters\InverseBooleanVisibilityConverter.cs" />
|
<Compile Include="Converters\InverseBooleanVisibilityConverter.cs" />
|
||||||
<Compile Include="Converters\StringToVisibilityConverter.cs" />
|
<Compile Include="Converters\StringToVisibilityConverter.cs" />
|
||||||
<Compile Include="Extensions\EnumerationExtension.cs" />
|
|
||||||
<Compile Include="Extensions\HyperlinkExtensions.cs" />
|
|
||||||
<Compile Include="Messages\ThemeClosedMessage.cs" />
|
<Compile Include="Messages\ThemeClosedMessage.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="Services\FileSystemService.cs" />
|
<Compile Include="Services\FileSystemService.cs" />
|
||||||
<Compile Include="Services\MessageBoxService.cs" />
|
<Compile Include="Services\MessageBoxService.cs" />
|
||||||
<Compile Include="Utilities\LineReader.cs" />
|
<Compile Include="Utilities\LineReader.cs" />
|
||||||
<Compile Include="Utilities\PathOfExileColors.cs" />
|
|
||||||
<Compile Include="Utilities\VisualTreeUtility.cs" />
|
|
||||||
<Compile Include="ViewModels\PaneViewModel.cs" />
|
<Compile Include="ViewModels\PaneViewModel.cs" />
|
||||||
<Compile Include="WindsorInstallers\ServicesInstaller.cs" />
|
<Compile Include="WindsorInstallers\ServicesInstaller.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="app.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
|
<ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
|
||||||
@ -79,23 +98,6 @@
|
|||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Castle.Core">
|
|
||||||
<Version>4.4.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Castle.Windsor">
|
|
||||||
<Version>5.0.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="CommonServiceLocator">
|
|
||||||
<Version>2.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Extended.Wpf.Toolkit">
|
|
||||||
<Version>3.5.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="MvvmLightLibs">
|
|
||||||
<Version>5.4.1.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Xceed.Wpf.Toolkit;
|
|
||||||
|
|
||||||
namespace Filtration.Common.Utilities
|
|
||||||
{
|
|
||||||
public static class PathOfExileColors
|
|
||||||
{
|
|
||||||
static PathOfExileColors()
|
|
||||||
{
|
|
||||||
DefaultColors = new ObservableCollection<ColorItem>
|
|
||||||
{
|
|
||||||
new ColorItem(new Color {A = 240, R=127, G = 127, B = 127}, "Default"),
|
|
||||||
new ColorItem(new Color {A = 240, R=255, G = 255, B = 255}, "Value Default"),
|
|
||||||
new ColorItem(new Color {A = 240, R=255, G = 192, B = 203}, "Pink"),
|
|
||||||
new ColorItem(new Color {A = 240, R=30, G = 144, B = 255}, "Dodger Blue"),
|
|
||||||
new ColorItem(new Color {A = 240, R=150, G = 0, B = 0}, "Fire"),
|
|
||||||
new ColorItem(new Color {A = 240, R=54, G = 100, B = 146}, "Cold"),
|
|
||||||
new ColorItem(new Color {A = 240, R=255, G = 215, B = 0}, "Lightning"),
|
|
||||||
new ColorItem(new Color {A = 240, R=208, G = 32, B = 144}, "Chaos"),
|
|
||||||
new ColorItem(new Color {A = 240, R=136, G = 136, B = 255}, "Augmented"),
|
|
||||||
new ColorItem(new Color {A = 240, R=184, G = 218, B = 242}, "Crafted"),
|
|
||||||
new ColorItem(new Color {A = 240, R=210, G = 0, B = 0}, "Unmet"),
|
|
||||||
new ColorItem(new Color {A = 240, R=175, G = 96, B = 37}, "Unique Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=255, G = 255, B = 119}, "Rare Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=136, G = 136, B = 255}, "Magic Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=200, G = 200, B = 200}, "White Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=27, G = 162, B = 155}, "Gem Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=170, G = 158, B = 130}, "Currency Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=74, G = 230, B = 58}, "Quest Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=255, G = 200, B = 0}, "Nemesis Mod"),
|
|
||||||
new ColorItem(new Color {A = 220, R = 255, G = 40, B = 0}, "Nemesis Mod Outline"),
|
|
||||||
new ColorItem(new Color {A = 240, R=231, G = 180, B = 120}, "Title"),
|
|
||||||
new ColorItem(new Color {A = 240, R=210, G = 0, B = 0}, "Corrupted"),
|
|
||||||
new ColorItem(new Color {A = 240, R=170, G = 158, B = 130}, "Favour"),
|
|
||||||
new ColorItem(new Color {A = 240, R=180, G = 96, B = 0}, "Supporter Pack New Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=163, G = 141, B = 109}, "Supporter Pack Item"),
|
|
||||||
new ColorItem(new Color {A = 240, R=210, G = 0, B = 220}, "Bloodline Mod"),
|
|
||||||
new ColorItem(new Color {A = 200, R = 74, G = 0, B = 160}, "Bloodline Mod Outline"),
|
|
||||||
new ColorItem(new Color {A = 240, R=50, G = 230, B = 100}, "Torment Mod"),
|
|
||||||
new ColorItem(new Color {A = 200, R = 0, G = 100, B = 150}, "Torment Mod Outline"),
|
|
||||||
new ColorItem(new Color {A = 240, R=210, G = 0, B = 0}, "Can't Trade or Modify")
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ObservableCollection<ColorItem> DefaultColors { get; private set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
using System.Windows;
|
|
||||||
using System.Windows.Media;
|
|
||||||
|
|
||||||
namespace Filtration.Common.Utilities
|
|
||||||
{
|
|
||||||
public class VisualTreeUtility
|
|
||||||
{
|
|
||||||
public static T FindParent<T>(DependencyObject child)
|
|
||||||
where T : DependencyObject
|
|
||||||
{
|
|
||||||
//get parent item
|
|
||||||
var parentObject = VisualTreeHelper.GetParent(child);
|
|
||||||
|
|
||||||
//we've reached the end of the tree
|
|
||||||
if (parentObject == null) return null;
|
|
||||||
|
|
||||||
//check if the parent matches the type we're looking for
|
|
||||||
if (parentObject is T parent)
|
|
||||||
{
|
|
||||||
return parent;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FindParent<T>(parentObject);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
7
Filtration.Common/packages.config
Normal file
7
Filtration.Common/packages.config
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
|
||||||
|
<package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
|
||||||
|
<package id="CommonServiceLocator" version="1.3" targetFramework="net451" />
|
||||||
|
<package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -46,17 +46,6 @@
|
|||||||
<Compile Include="IEditableDocument.cs" />
|
<Compile Include="IEditableDocument.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<None Include="app.config" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="CommonServiceLocator">
|
|
||||||
<Version>2.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="MvvmLightLibs">
|
|
||||||
<Version>5.4.1.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@ -1,6 +1,4 @@
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Input;
|
|
||||||
using GalaSoft.MvvmLight.CommandWpf;
|
|
||||||
|
|
||||||
namespace Filtration.Interface
|
namespace Filtration.Interface
|
||||||
{
|
{
|
||||||
@ -8,7 +6,6 @@ namespace Filtration.Interface
|
|||||||
{
|
{
|
||||||
bool IsScript { get; }
|
bool IsScript { get; }
|
||||||
bool IsTheme { get; }
|
bool IsTheme { get; }
|
||||||
Task<bool> Close();
|
Task Close();
|
||||||
RelayCommand CloseCommand { get; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||||
|
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||||
</configSections>
|
</configSections>
|
||||||
<entityFramework>
|
<entityFramework>
|
||||||
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
|
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
|
||||||
@ -23,12 +23,9 @@
|
|||||||
<add name="FiltrationDbContext" connectionString="data source="D:\C# Projects\Filtration\Filtration.db"" providerName="System.Data.SQLite.EF6" />
|
<add name="FiltrationDbContext" connectionString="data source="D:\C# Projects\Filtration\Filtration.db"" providerName="System.Data.SQLite.EF6" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
|
|
||||||
<runtime>
|
<system.data>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<DbProviderFactories>
|
||||||
<dependentAssembly>
|
<remove invariant="System.Data.SQLite.EF6" />
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
<remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
|
||||||
</dependentAssembly>
|
</system.data></configuration>
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
@ -38,8 +38,31 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
|
<Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data.SQLite.EF6, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.102.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data.SQLite.Linq, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.102.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Choose>
|
<Choose>
|
||||||
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
|
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
|
||||||
@ -59,6 +82,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Filtration.ItemFilterPreview.Data\Filtration.ItemFilterPreview.Data.csproj">
|
<ProjectReference Include="..\Filtration.ItemFilterPreview.Data\Filtration.ItemFilterPreview.Data.csproj">
|
||||||
@ -70,17 +94,6 @@
|
|||||||
<Name>Filtration.ObjectModel</Name>
|
<Name>Filtration.ObjectModel</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="NUnit">
|
|
||||||
<Version>3.11.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Data.SQLite">
|
|
||||||
<Version>1.0.109.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Data.SQLite.Core">
|
|
||||||
<Version>1.0.109.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Choose>
|
<Choose>
|
||||||
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
|
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -101,6 +114,13 @@
|
|||||||
</Choose>
|
</Choose>
|
||||||
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
<Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
|
||||||
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
|
||||||
|
</Target>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
|||||||
9
Filtration.ItemFilterPreview.Data.Tests/packages.config
Normal file
9
Filtration.ItemFilterPreview.Data.Tests/packages.config
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="EntityFramework" version="6.1.3" targetFramework="net461" />
|
||||||
|
<package id="NUnit" version="3.6.1" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite.EF6" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite.Linq" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
|
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
|
||||||
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||||
|
|
||||||
</configSections>
|
</configSections>
|
||||||
<entityFramework>
|
<entityFramework>
|
||||||
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
|
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
|
||||||
@ -11,23 +11,19 @@
|
|||||||
</parameters>
|
</parameters>
|
||||||
</defaultConnectionFactory>
|
</defaultConnectionFactory>
|
||||||
<providers>
|
<providers>
|
||||||
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
|
|
||||||
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
|
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
|
||||||
</providers>
|
</providers>
|
||||||
</entityFramework>
|
</entityFramework>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||||
</startup>
|
</startup>
|
||||||
<connectionStrings>
|
|
||||||
<add name="FiltrationDbContext" connectionString="data source="D:\C# Projects\Filtration\Filtration.db"" providerName="System.Data.SQLite.EF6" />
|
|
||||||
</connectionStrings>
|
|
||||||
|
|
||||||
<runtime>
|
<connectionStrings>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<add name="FiltrationDbContext" connectionString="data source="D:\C# Projects\Filtration\Filtration.db"" providerName="System.Data.SQLite.EF6" />
|
||||||
<dependentAssembly>
|
</connectionStrings>
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
<system.data>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
<DbProviderFactories>
|
||||||
</dependentAssembly>
|
<remove invariant="System.Data.SQLite.EF6" />
|
||||||
</assemblyBinding>
|
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
|
||||||
</runtime>
|
<remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
|
||||||
</configuration>
|
</system.data></configuration>
|
||||||
@ -33,9 +33,25 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data.SQLite.EF6, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.102.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data.SQLite.Linq, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.102.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
<Reference Include="System.Runtime.Serialization" />
|
||||||
<Reference Include="System.Security" />
|
<Reference Include="System.Security" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
@ -53,6 +69,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
|
<ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
|
||||||
@ -60,15 +77,14 @@
|
|||||||
<Name>Filtration.ObjectModel</Name>
|
<Name>Filtration.ObjectModel</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="System.Data.SQLite">
|
|
||||||
<Version>1.0.109.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Data.SQLite.Core">
|
|
||||||
<Version>1.0.109.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
<Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
|
||||||
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
|
||||||
|
</Target>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
|||||||
8
Filtration.ItemFilterPreview.Data/packages.config
Normal file
8
Filtration.ItemFilterPreview.Data/packages.config
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="EntityFramework" version="6.1.3" targetFramework="net46" />
|
||||||
|
<package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite.EF6" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
<package id="System.Data.SQLite.Linq" version="1.0.102.0" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -23,8 +23,6 @@
|
|||||||
<TestProjectType>CodedUITest</TestProjectType>
|
<TestProjectType>CodedUITest</TestProjectType>
|
||||||
<IsWindowsStoreCodedUITest>True</IsWindowsStoreCodedUITest>
|
<IsWindowsStoreCodedUITest>True</IsWindowsStoreCodedUITest>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<NuGetPackageImportStamp>
|
|
||||||
</NuGetPackageImportStamp>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@ -44,10 +42,29 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
|
<Reference Include="YamlDotNet, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\YamlDotNet.3.9.0\lib\net35\YamlDotNet.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
|
<CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
|
||||||
@ -97,28 +114,9 @@
|
|||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="packages.config" />
|
||||||
<None Include="Resources\MuldiniFilterScript.txt" />
|
<None Include="Resources\MuldiniFilterScript.txt" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Castle.Core">
|
|
||||||
<Version>4.4.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="FluentAssertions">
|
|
||||||
<Version>5.6.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Moq">
|
|
||||||
<Version>4.10.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="NUnit">
|
|
||||||
<Version>3.11.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Threading.Tasks.Extensions">
|
|
||||||
<Version>4.5.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.ValueTuple">
|
|
||||||
<Version>4.5.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
@ -67,7 +67,6 @@ namespace Filtration.ItemFilterPreview.Tests.Services
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Ignore("Outdated item filter")]
|
|
||||||
public void ProcessItemsAgainstItemFilterScript_IntegrationTest()
|
public void ProcessItemsAgainstItemFilterScript_IntegrationTest()
|
||||||
{
|
{
|
||||||
//Arrange
|
//Arrange
|
||||||
@ -103,7 +102,6 @@ namespace Filtration.ItemFilterPreview.Tests.Services
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Ignore("Outdated item filter")]
|
|
||||||
public void ProcessItemsAgainstItemFilterScript_IntegrationTest_10Items()
|
public void ProcessItemsAgainstItemFilterScript_IntegrationTest_10Items()
|
||||||
{
|
{
|
||||||
//Arrange
|
//Arrange
|
||||||
|
|||||||
@ -4,36 +4,12 @@
|
|||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
|
<assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
|
<assemblyIdentity name="ControlzEx" publicKeyToken="f08b075e934b7045" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.2.0.4" newVersion="2.2.0.4" />
|
<bindingRedirect oldVersion="0.0.0.0-2.2.0.4" newVersion="2.2.0.4" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
</configuration>
|
||||||
8
Filtration.ItemFilterPreview.Tests/packages.config
Normal file
8
Filtration.ItemFilterPreview.Tests/packages.config
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Castle.Core" version="3.3.3" targetFramework="net461" />
|
||||||
|
<package id="FluentAssertions" version="4.19.2" targetFramework="net461" />
|
||||||
|
<package id="Moq" version="4.5.30" targetFramework="net461" />
|
||||||
|
<package id="NUnit" version="3.6.1" targetFramework="net461" />
|
||||||
|
<package id="YamlDotNet" version="3.9.0" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -1,26 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@ -36,11 +36,38 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
<Reference Include="System.Runtime.Remoting" />
|
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<Reference Include="System.Web" />
|
<HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
@ -126,6 +153,7 @@
|
|||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<None Include="packages.config" />
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
<Generator>SettingsSingleFileGenerator</Generator>
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||||
@ -163,29 +191,6 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="Model\" />
|
<Folder Include="Model\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Castle.Core">
|
|
||||||
<Version>4.4.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Castle.Windsor">
|
|
||||||
<Version>5.0.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="CommonServiceLocator">
|
|
||||||
<Version>2.0.4</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Moq">
|
|
||||||
<Version>4.10.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="MvvmLightLibs">
|
|
||||||
<Version>5.4.1.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Threading.Tasks.Extensions">
|
|
||||||
<Version>4.5.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.ValueTuple">
|
|
||||||
<Version>4.5.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
8
Filtration.ItemFilterPreview/packages.config
Normal file
8
Filtration.ItemFilterPreview/packages.config
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Castle.Core" version="3.3.3" targetFramework="net461" />
|
||||||
|
<package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
|
||||||
|
<package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
|
||||||
|
<package id="Moq" version="4.5.30" targetFramework="net461" />
|
||||||
|
<package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -12,8 +12,6 @@
|
|||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<NuGetPackageImportStamp>
|
|
||||||
</NuGetPackageImportStamp>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@ -33,9 +31,18 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
@ -57,27 +64,7 @@
|
|||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="app.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Castle.Core">
|
|
||||||
<Version>4.4.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Moq">
|
|
||||||
<Version>4.10.1</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="NUnit">
|
|
||||||
<Version>3.11.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Threading.Tasks.Extensions">
|
|
||||||
<Version>4.5.2</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.ValueTuple">
|
|
||||||
<Version>4.5.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|||||||
@ -1,27 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
6
Filtration.ObjectModel.Tests/packages.config
Normal file
6
Filtration.ObjectModel.Tests/packages.config
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Castle.Core" version="3.3.3" targetFramework="net461" />
|
||||||
|
<package id="Moq" version="4.5.30" targetFramework="net461" />
|
||||||
|
<package id="NUnit" version="3.6.1" targetFramework="net461" />
|
||||||
|
</packages>
|
||||||
@ -27,6 +27,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string Comment { get; set; }
|
||||||
|
|
||||||
public override string OutputText => Action.GetAttributeDescription();
|
public override string OutputText => Action.GetAttributeDescription();
|
||||||
|
|
||||||
public override string PrefixText => string.Empty;
|
public override string PrefixText => string.Empty;
|
||||||
@ -41,7 +43,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
|
|
||||||
public override Color SummaryTextColor => Action == BlockAction.Show ? Colors.Black : Colors.White;
|
public override Color SummaryTextColor => Action == BlockAction.Show ? Colors.Black : Colors.White;
|
||||||
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Action;
|
public override int SortOrder => 0;
|
||||||
|
|
||||||
public void ToggleAction()
|
public void ToggleAction()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.Annotations;
|
using Filtration.ObjectModel.Annotations;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
||||||
{
|
{
|
||||||
@ -17,8 +16,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
public abstract string SummaryText { get; }
|
public abstract string SummaryText { get; }
|
||||||
public abstract Color SummaryBackgroundColor { get; }
|
public abstract Color SummaryBackgroundColor { get; }
|
||||||
public abstract Color SummaryTextColor { get; }
|
public abstract Color SummaryTextColor { get; }
|
||||||
public abstract BlockItemOrdering SortOrder { get; }
|
public abstract int SortOrder { get; }
|
||||||
public string Comment { get; set; }
|
|
||||||
|
|
||||||
public bool IsDirty
|
public bool IsDirty
|
||||||
{
|
{
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + BooleanValue;
|
public override string OutputText => PrefixText + " " + BooleanValue;
|
||||||
public override string SummaryText => DisplayHeading + " = " + BooleanValue;
|
public override string SummaryText => PrefixText + " = " + BooleanValue;
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
|
|
||||||
public void ToggleValue()
|
public void ToggleValue()
|
||||||
|
|||||||
@ -4,7 +4,7 @@ using Filtration.ObjectModel.ThemeEditor;
|
|||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
||||||
{
|
{
|
||||||
public abstract class ColorBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
|
public abstract class ColorBlockItem : BlockItemBase, IAudioVisualBlockItem
|
||||||
{
|
{
|
||||||
private Color _color;
|
private Color _color;
|
||||||
private ThemeComponent _themeComponent;
|
private ThemeComponent _themeComponent;
|
||||||
@ -19,7 +19,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
}
|
}
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " "
|
public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " "
|
||||||
+ Color.B + (Color.A != 240 ? " " + Color.A : string.Empty) +
|
+ Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
|
||||||
(ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
(ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
public override string SummaryText => string.Empty;
|
||||||
@ -63,7 +63,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
|
|
||||||
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Color = ((ColorThemeComponent) sender).Color;
|
Color = ((ThemeComponent) sender).Color;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
||||||
|
|||||||
@ -1,53 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.ThemeEditor;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|
||||||
{
|
|
||||||
public abstract class ColorBooleanBlockItem : BlockItemBase, IAudioVisualBlockItem
|
|
||||||
{
|
|
||||||
private Color _color;
|
|
||||||
private bool _booleanValue;
|
|
||||||
|
|
||||||
protected ColorBooleanBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected ColorBooleanBlockItem(Color color, bool booleanValue)
|
|
||||||
{
|
|
||||||
Color = color;
|
|
||||||
BooleanValue = booleanValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " "
|
|
||||||
+ Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) +
|
|
||||||
(BooleanValue ? " True" : " False");
|
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
|
||||||
public override Color SummaryTextColor => Colors.Transparent;
|
|
||||||
|
|
||||||
public Color Color
|
|
||||||
{
|
|
||||||
get { return _color; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_color = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool BooleanValue
|
|
||||||
{
|
|
||||||
get { return _booleanValue; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_booleanValue = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
using Filtration.ObjectModel.Extensions;
|
|
||||||
using Filtration.ObjectModel.ThemeEditor;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|
||||||
{
|
|
||||||
public abstract class EffectColorBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
|
|
||||||
{
|
|
||||||
private EffectColor _color;
|
|
||||||
private bool _temporary;
|
|
||||||
private ThemeComponent _themeComponent;
|
|
||||||
|
|
||||||
protected EffectColorBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected EffectColorBlockItem(EffectColor color, bool temporary)
|
|
||||||
{
|
|
||||||
Color = color;
|
|
||||||
Temporary = temporary;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + Color.GetAttributeDescription() +
|
|
||||||
(Temporary ? " " + "Temp" : string.Empty) +
|
|
||||||
(ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
|
||||||
|
|
||||||
public ThemeComponent ThemeComponent
|
|
||||||
{
|
|
||||||
get { return _themeComponent; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_themeComponent == value) { return; }
|
|
||||||
|
|
||||||
if (_themeComponent != null)
|
|
||||||
{
|
|
||||||
_themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
|
|
||||||
_themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
if (value != null)
|
|
||||||
{
|
|
||||||
value.ThemeComponentUpdated += OnThemeComponentUpdated;
|
|
||||||
value.ThemeComponentDeleted += OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
_themeComponent = value;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
|
||||||
public override Color SummaryTextColor => Colors.Transparent;
|
|
||||||
|
|
||||||
public EffectColor Color
|
|
||||||
{
|
|
||||||
get { return _color; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_color = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool Temporary
|
|
||||||
{
|
|
||||||
get { return _temporary; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_temporary = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Color = ((EffectColorThemeComponent)sender).EffectColor;
|
|
||||||
Temporary = ((EffectColorThemeComponent)sender).Temporary;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
ThemeComponent = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
using Filtration.ObjectModel.Extensions;
|
|
||||||
using Filtration.ObjectModel.ThemeEditor;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|
||||||
{
|
|
||||||
public abstract class IconBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
|
|
||||||
{
|
|
||||||
private IconSize _size;
|
|
||||||
private IconColor _color;
|
|
||||||
private IconShape _shape;
|
|
||||||
private ThemeComponent _themeComponent;
|
|
||||||
|
|
||||||
protected IconBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected IconBlockItem(IconSize size, IconColor color, IconShape shape)
|
|
||||||
{
|
|
||||||
Size = size;
|
|
||||||
Color = color;
|
|
||||||
Shape = shape;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + (int)Size + " " + Color.GetAttributeDescription() + " " + Shape.GetAttributeDescription() +
|
|
||||||
(ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
|
||||||
|
|
||||||
public ThemeComponent ThemeComponent
|
|
||||||
{
|
|
||||||
get { return _themeComponent; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_themeComponent == value) { return; }
|
|
||||||
|
|
||||||
if (_themeComponent != null)
|
|
||||||
{
|
|
||||||
_themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
|
|
||||||
_themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
if (value != null)
|
|
||||||
{
|
|
||||||
value.ThemeComponentUpdated += OnThemeComponentUpdated;
|
|
||||||
value.ThemeComponentDeleted += OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
_themeComponent = value;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
|
||||||
public override Color SummaryTextColor => Colors.Transparent;
|
|
||||||
|
|
||||||
public IconSize Size
|
|
||||||
{
|
|
||||||
get { return _size; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_size = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public IconColor Color
|
|
||||||
{
|
|
||||||
get { return _color; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_color = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public IconShape Shape
|
|
||||||
{
|
|
||||||
get { return _shape; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_shape = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Size = ((IconThemeComponent)sender).IconSize;
|
|
||||||
Color = ((IconThemeComponent)sender).IconColor;
|
|
||||||
Shape = ((IconThemeComponent)sender).IconShape;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
ThemeComponent = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,13 +1,10 @@
|
|||||||
using System;
|
using System.Windows.Media;
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.ThemeEditor;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
||||||
{
|
{
|
||||||
public abstract class IntegerBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
|
public abstract class IntegerBlockItem : BlockItemBase, IAudioVisualBlockItem
|
||||||
{
|
{
|
||||||
private int _value;
|
private int _value;
|
||||||
private ThemeComponent _themeComponent;
|
|
||||||
|
|
||||||
protected IntegerBlockItem()
|
protected IntegerBlockItem()
|
||||||
{
|
{
|
||||||
@ -18,7 +15,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
Value = value;
|
Value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + Value + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
public override string OutputText => PrefixText + " " + Value;
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
public override string SummaryText => string.Empty;
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
public override Color SummaryBackgroundColor => Colors.Transparent;
|
||||||
@ -27,29 +24,6 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
public abstract int Minimum { get; }
|
public abstract int Minimum { get; }
|
||||||
public abstract int Maximum { get; }
|
public abstract int Maximum { get; }
|
||||||
|
|
||||||
public ThemeComponent ThemeComponent
|
|
||||||
{
|
|
||||||
get { return _themeComponent; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_themeComponent == value) { return; }
|
|
||||||
|
|
||||||
if (_themeComponent != null)
|
|
||||||
{
|
|
||||||
_themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
|
|
||||||
_themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
if (value != null)
|
|
||||||
{
|
|
||||||
value.ThemeComponentUpdated += OnThemeComponentUpdated;
|
|
||||||
value.ThemeComponentDeleted += OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
_themeComponent = value;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public int Value
|
public int Value
|
||||||
{
|
{
|
||||||
get { return _value; }
|
get { return _value; }
|
||||||
@ -60,15 +34,5 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|||||||
OnPropertyChanged();
|
OnPropertyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Value = ((IntegerBlockItem)sender).Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
ThemeComponent = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|
||||||
{
|
|
||||||
public abstract class NilBlockItem : BlockItemBase
|
|
||||||
{
|
|
||||||
protected NilBlockItem()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string OutputText => PrefixText;
|
|
||||||
public override string SummaryText => DisplayHeading;
|
|
||||||
public override int MaximumAllowed => 1;
|
|
||||||
|
|
||||||
public abstract string Description { get; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.ThemeEditor;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|
||||||
{
|
|
||||||
public abstract class StrIntBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
|
|
||||||
{
|
|
||||||
private string _value;
|
|
||||||
private int _secondValue;
|
|
||||||
private ThemeComponent _themeComponent;
|
|
||||||
|
|
||||||
protected StrIntBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected StrIntBlockItem(string value, int secondValue)
|
|
||||||
{
|
|
||||||
Value = value;
|
|
||||||
SecondValue = secondValue;
|
|
||||||
Value = value;
|
|
||||||
SecondValue = secondValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " " + Value + " " + SecondValue + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
|
||||||
public override Color SummaryTextColor => Colors.Transparent;
|
|
||||||
|
|
||||||
public ThemeComponent ThemeComponent
|
|
||||||
{
|
|
||||||
get { return _themeComponent; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_themeComponent == value) { return; }
|
|
||||||
|
|
||||||
if (_themeComponent != null)
|
|
||||||
{
|
|
||||||
_themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
|
|
||||||
_themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
if (value != null)
|
|
||||||
{
|
|
||||||
value.ThemeComponentUpdated += OnThemeComponentUpdated;
|
|
||||||
value.ThemeComponentDeleted += OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
_themeComponent = value;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Value
|
|
||||||
{
|
|
||||||
get { return _value; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public int SecondValue
|
|
||||||
{
|
|
||||||
get { return _secondValue; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_secondValue = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Value = ((StrIntBlockItem)sender).Value;
|
|
||||||
SecondValue = ((StrIntBlockItem)sender).SecondValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
ThemeComponent = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.ThemeEditor;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
|
||||||
{
|
|
||||||
public abstract class StringBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
|
|
||||||
{
|
|
||||||
private string _value;
|
|
||||||
private ThemeComponent _themeComponent;
|
|
||||||
|
|
||||||
protected StringBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected StringBlockItem(string value)
|
|
||||||
{
|
|
||||||
Value = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string OutputText => PrefixText + " \"" + Value + "\""
|
|
||||||
+ (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
|
|
||||||
|
|
||||||
public override string SummaryText => string.Empty;
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
|
||||||
public override Color SummaryTextColor => Colors.Transparent;
|
|
||||||
|
|
||||||
public ThemeComponent ThemeComponent
|
|
||||||
{
|
|
||||||
get { return _themeComponent; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_themeComponent == value) { return; }
|
|
||||||
|
|
||||||
if (_themeComponent != null)
|
|
||||||
{
|
|
||||||
_themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
|
|
||||||
_themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
if (value != null)
|
|
||||||
{
|
|
||||||
value.ThemeComponentUpdated += OnThemeComponentUpdated;
|
|
||||||
value.ThemeComponentDeleted += OnThemeComponentDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
_themeComponent = value;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Value
|
|
||||||
{
|
|
||||||
get { return _value; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
IsDirty = true;
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentUpdated(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Value = ((StringThemeComponent)sender).Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnThemeComponentDeleted(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
ThemeComponent = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace Filtration.ObjectModel.BlockItemBaseTypes
|
||||||
|
{
|
||||||
|
public abstract class StrIntBlockItem : BlockItemBase, IAudioVisualBlockItem
|
||||||
|
{
|
||||||
|
private string _value;
|
||||||
|
private int _secondValue;
|
||||||
|
|
||||||
|
protected StrIntBlockItem()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected StrIntBlockItem(string value, int secondValue)
|
||||||
|
{
|
||||||
|
Value = value;
|
||||||
|
SecondValue = secondValue;
|
||||||
|
Value = value;
|
||||||
|
SecondValue = secondValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string OutputText => PrefixText + " " + Value + " " + SecondValue;
|
||||||
|
|
||||||
|
public override string SummaryText => string.Empty;
|
||||||
|
public override Color SummaryBackgroundColor => Colors.Transparent;
|
||||||
|
public override Color SummaryTextColor => Colors.Transparent;
|
||||||
|
|
||||||
|
public string Value
|
||||||
|
{
|
||||||
|
get { return _value; }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_value = value;
|
||||||
|
IsDirty = true;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int SecondValue
|
||||||
|
{
|
||||||
|
get { return _secondValue; }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_secondValue = value;
|
||||||
|
IsDirty = true;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,23 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public sealed class AnyEnchantmentBlockItem : BooleanBlockItem
|
|
||||||
{
|
|
||||||
public AnyEnchantmentBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public AnyEnchantmentBlockItem(bool booleanValue) : base(booleanValue)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "AnyEnchantment";
|
|
||||||
public override string DisplayHeading => "Any Enchantment";
|
|
||||||
public override Color SummaryBackgroundColor => Colors.YellowGreen;
|
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.AnyEnchantment;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
@ -8,7 +7,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
{
|
{
|
||||||
public BackgroundColorBlockItem()
|
public BackgroundColorBlockItem()
|
||||||
{
|
{
|
||||||
Color = new Color { A = 240, R = 0, G = 0, B = 0 };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public BackgroundColorBlockItem(Color color) : base(color)
|
public BackgroundColorBlockItem(Color color) : base(color)
|
||||||
@ -18,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string PrefixText => "SetBackgroundColor";
|
public override string PrefixText => "SetBackgroundColor";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Background Color";
|
public override string DisplayHeading => "Background Color";
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.SetBackgroundColor;
|
public override int SortOrder => 18;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -17,23 +16,23 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
{
|
{
|
||||||
if (Items.Count > 0 && Items.Count < 4)
|
if (Items.Count > 0 && Items.Count < 4)
|
||||||
{
|
{
|
||||||
return "Base Types: " +
|
return "Item Base Types: " +
|
||||||
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
||||||
}
|
}
|
||||||
if (Items.Count >= 4)
|
if (Items.Count >= 4)
|
||||||
{
|
{
|
||||||
var remaining = Items.Count - 3;
|
var remaining = Items.Count - 3;
|
||||||
return "Base Types: " + Items.Take(3)
|
return "Item Base Types: " + Items.Take(3)
|
||||||
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
||||||
.TrimEnd(' ')
|
.TrimEnd(' ')
|
||||||
.TrimEnd(',') + " (+" + remaining + " more)";
|
.TrimEnd(',') + " (+" + remaining + " more)";
|
||||||
}
|
}
|
||||||
return "Base Types: (none)";
|
return "Item Base Types: (none)";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.MediumTurquoise;
|
public override Color SummaryBackgroundColor => Colors.MediumTurquoise;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.BaseType;
|
public override int SortOrder => 16;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public sealed class BlightedMapBlockItem : BooleanBlockItem
|
|
||||||
{
|
|
||||||
public BlightedMapBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public BlightedMapBlockItem(bool booleanValue) : base(booleanValue)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "BlightedMap";
|
|
||||||
public override string DisplayHeading => "Blighted Map";
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Khaki;
|
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.BligtedMap;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -8,7 +7,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
{
|
{
|
||||||
public BorderColorBlockItem()
|
public BorderColorBlockItem()
|
||||||
{
|
{
|
||||||
Color = new Color {A = 240, R = 0, G = 0, B = 0};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public BorderColorBlockItem(Color color) : base(color)
|
public BorderColorBlockItem(Color color) : base(color)
|
||||||
@ -18,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string PrefixText => "SetBorderColor";
|
public override string PrefixText => "SetBorderColor";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Border Color";
|
public override string DisplayHeading => "Border Color";
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.SetBorderColor;
|
public override int SortOrder => 19;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -17,23 +16,23 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
{
|
{
|
||||||
if (Items.Count > 0 && Items.Count < 4)
|
if (Items.Count > 0 && Items.Count < 4)
|
||||||
{
|
{
|
||||||
return "Classes: " +
|
return "Item Classes: " +
|
||||||
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
||||||
}
|
}
|
||||||
if (Items.Count >= 4)
|
if (Items.Count >= 4)
|
||||||
{
|
{
|
||||||
var remaining = Items.Count - 3;
|
var remaining = Items.Count - 3;
|
||||||
return "Classes: " + Items.Take(3)
|
return "Item Classes: " + Items.Take(3)
|
||||||
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
||||||
.TrimEnd(' ')
|
.TrimEnd(' ')
|
||||||
.TrimEnd(',') + " (+" + remaining + " more)";
|
.TrimEnd(',') + " (+" + remaining + " more)";
|
||||||
}
|
}
|
||||||
return "Classes: (none)";
|
return "Item Classes: (none)";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.MediumSeaGreen;
|
public override Color SummaryBackgroundColor => Colors.MediumSeaGreen;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Class;
|
public override int SortOrder => 15;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string DisplayHeading => "Corrupted";
|
public override string DisplayHeading => "Corrupted";
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkRed;
|
public override Color SummaryBackgroundColor => Colors.DarkRed;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Corrupted;
|
public override int SortOrder => 5;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class CustomSoundBlockItem : StringBlockItem
|
|
||||||
{
|
|
||||||
public CustomSoundBlockItem()
|
|
||||||
{
|
|
||||||
Value = "placeholder.mp3";
|
|
||||||
}
|
|
||||||
|
|
||||||
public CustomSoundBlockItem(string value) : base(value)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "CustomAlertSound";
|
|
||||||
public override int MaximumAllowed => 1;
|
|
||||||
public override string DisplayHeading => "Custom Alert Sound";
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.CustomAlertSound;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public sealed class DisableDropSoundBlockItem : NilBlockItem, IAudioVisualBlockItem
|
|
||||||
{
|
|
||||||
public DisableDropSoundBlockItem() : base()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "DisableDropSound";
|
|
||||||
public override string DisplayHeading => "Disable Drop Sound";
|
|
||||||
public override string Description => "Default drop sound disabled.";
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Transparent;
|
|
||||||
public override Color SummaryTextColor => Colors.Transparent;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.DisableDropSound;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Drop Level " + FilterPredicate;
|
public override string SummaryText => "Drop Level " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DodgerBlue;
|
public override Color SummaryBackgroundColor => Colors.DodgerBlue;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.DropLevel;
|
public override int SortOrder => 13;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 100;
|
public override int Maximum => 100;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string DisplayHeading => "Elder Item";
|
public override string DisplayHeading => "Elder Item";
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkGray;
|
public override Color SummaryBackgroundColor => Colors.DarkGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.ElderItem;
|
public override int SortOrder => 6;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public sealed class ElderMapBlockItem : BooleanBlockItem
|
|
||||||
{
|
|
||||||
public ElderMapBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public ElderMapBlockItem(bool booleanValue) : base(booleanValue)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "ElderMap";
|
|
||||||
public override string DisplayHeading => "Elder Map";
|
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
|
|
||||||
public override Color SummaryTextColor => Colors.White;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.ElderMap;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -17,7 +16,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string PrefixText => "SetFontSize";
|
public override string PrefixText => "SetFontSize";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Font Size";
|
public override string DisplayHeading => "Font Size";
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.SetFontSize;
|
public override int SortOrder => 20;
|
||||||
public override int Minimum => 11;
|
public override int Minimum => 11;
|
||||||
public override int Maximum => 45;
|
public override int Maximum => 45;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public sealed class FracturedItemBlockItem : BooleanBlockItem
|
|
||||||
{
|
|
||||||
public FracturedItemBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public FracturedItemBlockItem(bool booleanValue) : base(booleanValue)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "FracturedItem";
|
|
||||||
public override string DisplayHeading => "Fractured Item";
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Salmon;
|
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.FracturedItem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class GemLevelBlockItem : NumericFilterPredicateBlockItem
|
|
||||||
{
|
|
||||||
public GemLevelBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public GemLevelBlockItem(FilterPredicateOperator predicateOperator, int predicateOperand)
|
|
||||||
: base(predicateOperator, predicateOperand)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "GemLevel";
|
|
||||||
public override int MaximumAllowed => 2;
|
|
||||||
public override string DisplayHeading => "Gem Level";
|
|
||||||
public override string SummaryText => "Gem Level " + FilterPredicate;
|
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
|
||||||
public override Color SummaryTextColor => Colors.White;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.GemLevel;
|
|
||||||
public override int Minimum => 0;
|
|
||||||
public override int Maximum => 21;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
using System.Linq;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class HasEnchantmentBlockItem : StringListBlockItem
|
|
||||||
{
|
|
||||||
public override string PrefixText => "HasEnchantment";
|
|
||||||
public override int MaximumAllowed => 1;
|
|
||||||
public override string DisplayHeading => "Has Enchantment";
|
|
||||||
|
|
||||||
public override string SummaryText
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (Items.Count > 0 && Items.Count < 4)
|
|
||||||
{
|
|
||||||
return "Enchantments: " +
|
|
||||||
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
|
||||||
}
|
|
||||||
if (Items.Count >= 4)
|
|
||||||
{
|
|
||||||
var remaining = Items.Count - 3;
|
|
||||||
return "Enchantments: " + Items.Take(3)
|
|
||||||
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
|
||||||
.TrimEnd(' ')
|
|
||||||
.TrimEnd(',') + " (+" + remaining + " more)";
|
|
||||||
}
|
|
||||||
return "Enchantments: (none)";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.PaleGreen;
|
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.HasEnchantment;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
using System.Linq;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class HasExplicitModBlockItem : StringListBlockItem
|
|
||||||
{
|
|
||||||
public override string PrefixText => "HasExplicitMod";
|
|
||||||
public override int MaximumAllowed => 8;
|
|
||||||
public override string DisplayHeading => "Has Explicit Mod";
|
|
||||||
|
|
||||||
public override string SummaryText
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (Items.Count > 0 && Items.Count < 4)
|
|
||||||
{
|
|
||||||
return "Explicit Mods: " +
|
|
||||||
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
|
||||||
}
|
|
||||||
if (Items.Count >= 4)
|
|
||||||
{
|
|
||||||
var remaining = Items.Count - 3;
|
|
||||||
return "Explicit Mods: " + Items.Take(3)
|
|
||||||
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
|
||||||
.TrimEnd(' ')
|
|
||||||
.TrimEnd(',') + " (+" + remaining + " more)";
|
|
||||||
}
|
|
||||||
return "Explicit Mods: (none)";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.MidnightBlue;
|
|
||||||
public override Color SummaryTextColor => Colors.White;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.HasExplicitMod;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Height " + FilterPredicate;
|
public override string SummaryText => "Height " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.LightBlue;
|
public override Color SummaryBackgroundColor => Colors.LightBlue;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Height;
|
public override int SortOrder => 10;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 6;
|
public override int Maximum => 6;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string DisplayHeading => "Identified";
|
public override string DisplayHeading => "Identified";
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Identified;
|
public override int SortOrder => 4;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,7 +20,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Item Level " + FilterPredicate;
|
public override string SummaryText => "Item Level " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.ItemLevel;
|
public override int SortOrder => 12;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 100;
|
public override int Maximum => 100;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Linked Sockets " + FilterPredicate;
|
public override string SummaryText => "Linked Sockets " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.Gold;
|
public override Color SummaryBackgroundColor => Colors.Gold;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.LinkedSockets;
|
public override int SortOrder => 1;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 6;
|
public override int Maximum => 6;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class MapIconBlockItem : IconBlockItem
|
|
||||||
{
|
|
||||||
public MapIconBlockItem()
|
|
||||||
{
|
|
||||||
Size = IconSize.Largest;
|
|
||||||
Color = IconColor.Red;
|
|
||||||
Shape = IconShape.Circle;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MapIconBlockItem(IconSize size, IconColor iconColor, IconShape iconShape) : base(size, iconColor, iconShape)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "MinimapIcon";
|
|
||||||
public override int MaximumAllowed => 1;
|
|
||||||
public override string DisplayHeading => "Minimap Icon";
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.MinimapIcon;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class MapTierBlockItem : NumericFilterPredicateBlockItem
|
|
||||||
{
|
|
||||||
public MapTierBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public MapTierBlockItem(FilterPredicateOperator predicateOperator, int predicateOperand)
|
|
||||||
: base(predicateOperator, predicateOperand)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "MapTier";
|
|
||||||
public override int MaximumAllowed => 2;
|
|
||||||
public override string DisplayHeading => "Map Tier";
|
|
||||||
public override string SummaryText => "Map Tier " + FilterPredicate;
|
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
|
||||||
public override Color SummaryTextColor => Colors.White;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.MapTier;
|
|
||||||
public override int Minimum => 1;
|
|
||||||
public override int Maximum => 16;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class PlayEffectBlockItem : EffectColorBlockItem
|
|
||||||
{
|
|
||||||
public PlayEffectBlockItem()
|
|
||||||
{
|
|
||||||
Color = EffectColor.Red;
|
|
||||||
Temporary = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PlayEffectBlockItem(EffectColor effectColor, bool temporary) : base(effectColor, temporary)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "PlayEffect";
|
|
||||||
public override int MaximumAllowed => 1;
|
|
||||||
public override string DisplayHeading => "Play Effect";
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.PlayEffect;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string PrefixText => "PlayAlertSoundPositional";
|
public override string PrefixText => "PlayAlertSoundPositional";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Play Positional Alert Sound";
|
public override string DisplayHeading => "Play Positional Alert Sound";
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.PlayAlertSoundPositional;
|
public override int SortOrder => 22;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
using System.Linq;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class ProphecyBlockItem : StringListBlockItem
|
|
||||||
{
|
|
||||||
public override string PrefixText => "Prophecy";
|
|
||||||
public override int MaximumAllowed => 1;
|
|
||||||
public override string DisplayHeading => "Prophecy";
|
|
||||||
|
|
||||||
public override string SummaryText
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (Items.Count > 0 && Items.Count < 4)
|
|
||||||
{
|
|
||||||
return "Prophecies: " +
|
|
||||||
Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(',');
|
|
||||||
}
|
|
||||||
if (Items.Count >= 4)
|
|
||||||
{
|
|
||||||
var remaining = Items.Count - 3;
|
|
||||||
return "Prophecies: " + Items.Take(3)
|
|
||||||
.Aggregate(string.Empty, (current, i) => current + i + ", ")
|
|
||||||
.TrimEnd(' ')
|
|
||||||
.TrimEnd(',') + " (+" + remaining + " more)";
|
|
||||||
}
|
|
||||||
return "Prophecies: (none)";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkMagenta;
|
|
||||||
public override Color SummaryTextColor => Colors.White;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Prophecy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -21,8 +21,8 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Quality " + FilterPredicate;
|
public override string SummaryText => "Quality " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkOrange;
|
public override Color SummaryBackgroundColor => Colors.DarkOrange;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Quality;
|
public override int SortOrder => 3;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 99;
|
public override int Maximum => 20;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();
|
((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();
|
||||||
public override Color SummaryBackgroundColor => Colors.LightCoral;
|
public override Color SummaryBackgroundColor => Colors.LightCoral;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Rarity;
|
public override int SortOrder => 14;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => (int)ItemRarity.Unique;
|
public override int Maximum => (int)ItemRarity.Unique;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string DisplayHeading => "Shaped Map";
|
public override string DisplayHeading => "Shaped Map";
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
|
public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.ShapedMap;
|
public override int SortOrder => 8;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string DisplayHeading => "Shaper Item";
|
public override string DisplayHeading => "Shaper Item";
|
||||||
public override Color SummaryBackgroundColor => Colors.DimGray;
|
public override Color SummaryBackgroundColor => Colors.DimGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.ShaperItem;
|
public override int SortOrder => 7;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.GhostWhite;
|
public override Color SummaryBackgroundColor => Colors.GhostWhite;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.SocketGroup;
|
public override int SortOrder => 9;
|
||||||
|
|
||||||
private SocketColor StringToSocketColor(char socketColorString)
|
private SocketColor StringToSocketColor(char socketColorString)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Sockets " + FilterPredicate;
|
public override string SummaryText => "Sockets " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.LightGray;
|
public override Color SummaryBackgroundColor => Colors.LightGray;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Sockets;
|
public override int SortOrder => 2;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 6;
|
public override int Maximum => 6;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -18,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string PrefixText => "PlayAlertSound";
|
public override string PrefixText => "PlayAlertSound";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Play Alert Sound";
|
public override string DisplayHeading => "Play Alert Sound";
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.PlayAlertSound;
|
public override int SortOrder => 21;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,28 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public class StackSizeBlockItem : NumericFilterPredicateBlockItem
|
|
||||||
{
|
|
||||||
public StackSizeBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public StackSizeBlockItem(FilterPredicateOperator predicateOperator, int predicateOperand)
|
|
||||||
: base(predicateOperator, predicateOperand)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "StackSize";
|
|
||||||
public override int MaximumAllowed => 2;
|
|
||||||
public override string DisplayHeading => "Stack Size";
|
|
||||||
public override string SummaryText => "Stack Size " + FilterPredicate;
|
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
|
||||||
public override Color SummaryTextColor => Colors.White;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.StackSize;
|
|
||||||
public override int Minimum => 0;
|
|
||||||
public override int Maximum => 1000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
using System.Windows.Media;
|
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
|
||||||
{
|
|
||||||
public sealed class SynthesisedItemBlockItem : BooleanBlockItem
|
|
||||||
{
|
|
||||||
public SynthesisedItemBlockItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public SynthesisedItemBlockItem(bool booleanValue) : base(booleanValue)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string PrefixText => "SynthesisedItem";
|
|
||||||
public override string DisplayHeading => "Synthesised Item";
|
|
||||||
public override Color SummaryBackgroundColor => Colors.Salmon;
|
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.SynthesisedItem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using Filtration.ObjectModel.BlockItemBaseTypes;
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
using Filtration.ObjectModel.Enums;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.BlockItemTypes
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
{
|
{
|
||||||
@ -8,7 +7,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
{
|
{
|
||||||
public TextColorBlockItem()
|
public TextColorBlockItem()
|
||||||
{
|
{
|
||||||
Color = PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextColorBlockItem(Color color) : base(color)
|
public TextColorBlockItem(Color color) : base(color)
|
||||||
@ -18,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string PrefixText => "SetTextColor";
|
public override string PrefixText => "SetTextColor";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Text Color";
|
public override string DisplayHeading => "Text Color";
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.SetTextColor;
|
public override int SortOrder => 17;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
|||||||
public override string SummaryText => "Width " + FilterPredicate;
|
public override string SummaryText => "Width " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.MediumPurple;
|
public override Color SummaryBackgroundColor => Colors.MediumPurple;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override BlockItemOrdering SortOrder => BlockItemOrdering.Width;
|
public override int SortOrder => 11;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 2;
|
public override int Maximum => 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,42 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class AddBlockItemToBlocksCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> _input;
|
|
||||||
|
|
||||||
public AddBlockItemToBlocksCommand(List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> input)
|
|
||||||
{
|
|
||||||
_input = input;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
foreach (var v in _input)
|
|
||||||
{
|
|
||||||
var blockItems = v.Item1;
|
|
||||||
var item = v.Item2;
|
|
||||||
|
|
||||||
blockItems.Add(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
foreach (var v in _input)
|
|
||||||
{
|
|
||||||
var blockItems = v.Item1;
|
|
||||||
var item = v.Item2;
|
|
||||||
blockItems.Remove(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
||||||
|
{
|
||||||
|
public class MoveBlockDownCommand : IUndoableCommand
|
||||||
|
{
|
||||||
|
private readonly IItemFilterScript _itemFilterScript;
|
||||||
|
private readonly IItemFilterBlockBase _blockToMove;
|
||||||
|
private int _indexMovedFrom;
|
||||||
|
|
||||||
|
public MoveBlockDownCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
|
||||||
|
{
|
||||||
|
_itemFilterScript = itemFilterScript;
|
||||||
|
_blockToMove = blockToMove;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Execute()
|
||||||
|
{
|
||||||
|
_indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
|
||||||
|
|
||||||
|
if (_indexMovedFrom >= _itemFilterScript.ItemFilterBlocks.Count)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Cannot move the bottom block down");
|
||||||
|
}
|
||||||
|
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom + 1, _blockToMove);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Undo()
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Redo() => Execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
||||||
|
{
|
||||||
|
public class MoveBlockToBottomCommand : IUndoableCommand
|
||||||
|
{
|
||||||
|
private readonly IItemFilterScript _itemFilterScript;
|
||||||
|
private readonly IItemFilterBlockBase _blockToMove;
|
||||||
|
private int _indexMovedFrom;
|
||||||
|
|
||||||
|
public MoveBlockToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
|
||||||
|
{
|
||||||
|
_itemFilterScript = itemFilterScript;
|
||||||
|
_blockToMove = blockToMove;
|
||||||
|
}
|
||||||
|
public void Execute()
|
||||||
|
{
|
||||||
|
_indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
|
||||||
|
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Add(_blockToMove);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Undo()
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Redo() => Execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
||||||
|
{
|
||||||
|
public class MoveBlockToTopCommand : IUndoableCommand
|
||||||
|
{
|
||||||
|
private readonly IItemFilterScript _itemFilterScript;
|
||||||
|
private readonly IItemFilterBlockBase _blockToMove;
|
||||||
|
private int _indexMovedFrom;
|
||||||
|
|
||||||
|
public MoveBlockToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
|
||||||
|
{
|
||||||
|
_itemFilterScript = itemFilterScript;
|
||||||
|
_blockToMove = blockToMove;
|
||||||
|
}
|
||||||
|
public void Execute()
|
||||||
|
{
|
||||||
|
_indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
|
||||||
|
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(0, _blockToMove);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Undo()
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Redo() => Execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
||||||
|
{
|
||||||
|
public class MoveBlockUpCommand : IUndoableCommand
|
||||||
|
{
|
||||||
|
private readonly IItemFilterScript _itemFilterScript;
|
||||||
|
private readonly IItemFilterBlockBase _blockToMove;
|
||||||
|
private int _indexMovedFrom;
|
||||||
|
|
||||||
|
public MoveBlockUpCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase blockToMove)
|
||||||
|
{
|
||||||
|
_itemFilterScript = itemFilterScript;
|
||||||
|
_blockToMove = blockToMove;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Execute()
|
||||||
|
{
|
||||||
|
_indexMovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_blockToMove);
|
||||||
|
|
||||||
|
if (_indexMovedFrom <= 0)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Cannot move the top block up");
|
||||||
|
}
|
||||||
|
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom-1, _blockToMove);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Undo()
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_blockToMove);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexMovedFrom, _blockToMove);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Redo() => Execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,60 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class MoveBlocksToBottomCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly IItemFilterScript _itemFilterScript;
|
|
||||||
private readonly List<int> _sourceIndexes;
|
|
||||||
|
|
||||||
public MoveBlocksToBottomCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
|
|
||||||
}
|
|
||||||
|
|
||||||
public MoveBlocksToBottomCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = sourceIndexes;
|
|
||||||
_sourceIndexes.Sort();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var block in blocksToMove)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Add(block);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
var movedIndex = _itemFilterScript.ItemFilterBlocks.Count - _sourceIndexes.Count;
|
|
||||||
blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[movedIndex]);
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(movedIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class MoveBlocksToIndexCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly IItemFilterScript _itemFilterScript;
|
|
||||||
private List<int> _sourceIndexes;
|
|
||||||
private int _targetIndex;
|
|
||||||
|
|
||||||
public MoveBlocksToIndexCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block, int targetIndex)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
|
|
||||||
_targetIndex = targetIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MoveBlocksToIndexCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes, int targetIndex)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = sourceIndexes;
|
|
||||||
_sourceIndexes.Sort();
|
|
||||||
_targetIndex = targetIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < blocksToMove.Count; i++)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_targetIndex + i, blocksToMove[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_targetIndex]);
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(_targetIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class MoveBlocksToTopCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly IItemFilterScript _itemFilterScript;
|
|
||||||
private readonly List<int> _sourceIndexes;
|
|
||||||
|
|
||||||
public MoveBlocksToTopCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
|
|
||||||
}
|
|
||||||
|
|
||||||
public MoveBlocksToTopCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = sourceIndexes;
|
|
||||||
_sourceIndexes.Sort();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(i, blocksToMove[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
List<IItemFilterBlockBase> blocksToMove = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
blocksToMove.Add(_itemFilterScript.ItemFilterBlocks[0]);
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], blocksToMove[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,37 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
||||||
|
{
|
||||||
|
public class PasteBlockCommand : IUndoableCommand
|
||||||
|
{
|
||||||
|
private readonly IItemFilterScript _itemFilterScript;
|
||||||
|
private readonly IItemFilterBlockBase _pastedItemFilterBlock;
|
||||||
|
private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
|
||||||
|
|
||||||
|
public PasteBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase pastedItemFilterBlock, IItemFilterBlockBase addAfterItemFilterBlock)
|
||||||
|
{
|
||||||
|
_itemFilterScript = itemFilterScript;
|
||||||
|
_pastedItemFilterBlock = pastedItemFilterBlock;
|
||||||
|
_addAfterItemFilterBlock = addAfterItemFilterBlock;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Execute()
|
||||||
|
{
|
||||||
|
if (_addAfterItemFilterBlock != null)
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(_addAfterItemFilterBlock) + 1, _pastedItemFilterBlock);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Add(_pastedItemFilterBlock);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Undo()
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_pastedItemFilterBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Redo() => Execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,56 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class PasteBlocksCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly IItemFilterScript _itemFilterScript;
|
|
||||||
private readonly List<IItemFilterBlockBase> _pastedItemFilterBlocks;
|
|
||||||
private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
|
|
||||||
|
|
||||||
public PasteBlocksCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block, IItemFilterBlockBase addAfterItemFilterBlock)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_pastedItemFilterBlocks = new List<IItemFilterBlockBase> { block };
|
|
||||||
_addAfterItemFilterBlock = addAfterItemFilterBlock;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PasteBlocksCommand(IItemFilterScript itemFilterScript, List<IItemFilterBlockBase> pastedItemFilterBlocks, IItemFilterBlockBase addAfterItemFilterBlock)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_pastedItemFilterBlocks = pastedItemFilterBlocks;
|
|
||||||
_addAfterItemFilterBlock = addAfterItemFilterBlock;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
if (_addAfterItemFilterBlock != null)
|
|
||||||
{
|
|
||||||
var lastAddedBlock = _addAfterItemFilterBlock;
|
|
||||||
foreach (var block in _pastedItemFilterBlocks)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(lastAddedBlock) + 1, block);
|
|
||||||
lastAddedBlock = block;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
foreach (var block in _pastedItemFilterBlocks)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Add(block);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
foreach (var block in _pastedItemFilterBlocks)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Remove(block);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class PasteSectionCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly IItemFilterScript _itemFilterScript;
|
|
||||||
private readonly List<IItemFilterBlockBase> _pastedItemFilterBlocks;
|
|
||||||
private readonly IItemFilterBlockBase _addAfterItemFilterBlock;
|
|
||||||
|
|
||||||
public PasteSectionCommand(IItemFilterScript itemFilterScript, List<IItemFilterBlockBase> pastedItemFilterBlocks, IItemFilterBlockBase addAfterItemFilterBlock)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_pastedItemFilterBlocks = pastedItemFilterBlocks;
|
|
||||||
_addAfterItemFilterBlock = addAfterItemFilterBlock;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
if (_addAfterItemFilterBlock != null)
|
|
||||||
{
|
|
||||||
var lastAddedBlock = _addAfterItemFilterBlock;
|
|
||||||
foreach(var block in _pastedItemFilterBlocks)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_itemFilterScript.ItemFilterBlocks.IndexOf(lastAddedBlock) + 1, block);
|
|
||||||
lastAddedBlock = block;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
foreach (var block in _pastedItemFilterBlocks)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Add(block);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
foreach (var block in _pastedItemFilterBlocks)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Remove(block);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
||||||
|
{
|
||||||
|
public class RemoveBlockCommand : IUndoableCommand
|
||||||
|
{
|
||||||
|
private readonly IItemFilterScript _itemFilterScript;
|
||||||
|
private IItemFilterBlockBase _removedItemFilterBlock;
|
||||||
|
private int _indexRemovedFrom;
|
||||||
|
|
||||||
|
public RemoveBlockCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase itemFilterBlockBase)
|
||||||
|
{
|
||||||
|
_itemFilterScript = itemFilterScript;
|
||||||
|
_removedItemFilterBlock = itemFilterBlockBase;
|
||||||
|
}
|
||||||
|
public void Execute()
|
||||||
|
{
|
||||||
|
_indexRemovedFrom = _itemFilterScript.ItemFilterBlocks.IndexOf(_removedItemFilterBlock);
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Remove(_removedItemFilterBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Undo()
|
||||||
|
{
|
||||||
|
_itemFilterScript.ItemFilterBlocks.Insert(_indexRemovedFrom, _removedItemFilterBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Redo() => Execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,48 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class RemoveBlockItemFromBlocksCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> _input;
|
|
||||||
|
|
||||||
public RemoveBlockItemFromBlocksCommand(List<Tuple<ObservableCollection<IItemFilterBlockItem>, IItemFilterBlockItem>> input)
|
|
||||||
{
|
|
||||||
_input = input;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
foreach (var pair in _input)
|
|
||||||
{
|
|
||||||
var blockItems = pair.Item1;
|
|
||||||
var blockItem = pair.Item2;
|
|
||||||
|
|
||||||
for (var i = 0; i < blockItems.Count; i++)
|
|
||||||
{
|
|
||||||
if (blockItems[i] == blockItem)
|
|
||||||
{
|
|
||||||
blockItems.RemoveAt(i--);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
foreach (var pair in _input)
|
|
||||||
{
|
|
||||||
var blockItems = pair.Item1;
|
|
||||||
var blockItem = pair.Item2;
|
|
||||||
blockItems.Add(blockItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Commands.ItemFilterScript
|
|
||||||
{
|
|
||||||
public class RemoveBlocksCommand : IUndoableCommand
|
|
||||||
{
|
|
||||||
private readonly IItemFilterScript _itemFilterScript;
|
|
||||||
private List<IItemFilterBlockBase> _removedItemFilterBlocks;
|
|
||||||
private List<int> _sourceIndexes;
|
|
||||||
|
|
||||||
public RemoveBlocksCommand(IItemFilterScript itemFilterScript, IItemFilterBlockBase block)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = new List<int> { _itemFilterScript.ItemFilterBlocks.IndexOf(block) };
|
|
||||||
_removedItemFilterBlocks = new List<IItemFilterBlockBase> { block };
|
|
||||||
}
|
|
||||||
|
|
||||||
public RemoveBlocksCommand(IItemFilterScript itemFilterScript, List<int> sourceIndexes)
|
|
||||||
{
|
|
||||||
_itemFilterScript = itemFilterScript;
|
|
||||||
_sourceIndexes = sourceIndexes;
|
|
||||||
_sourceIndexes.Sort();
|
|
||||||
_removedItemFilterBlocks = new List<IItemFilterBlockBase>();
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
_removedItemFilterBlocks.Add(_itemFilterScript.ItemFilterBlocks[_sourceIndexes[i]]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Execute()
|
|
||||||
{
|
|
||||||
for (var i = _sourceIndexes.Count - 1; i >= 0; i--)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.RemoveAt(_sourceIndexes[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Undo()
|
|
||||||
{
|
|
||||||
for (var i = 0; i < _sourceIndexes.Count; i++)
|
|
||||||
{
|
|
||||||
_itemFilterScript.ItemFilterBlocks.Insert(_sourceIndexes[i], _removedItemFilterBlocks[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Redo() => Execute();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Enums
|
|
||||||
{
|
|
||||||
public enum BlockItemOrdering
|
|
||||||
{
|
|
||||||
Action,
|
|
||||||
LinkedSockets,
|
|
||||||
Sockets,
|
|
||||||
Quality,
|
|
||||||
Identified,
|
|
||||||
Corrupted,
|
|
||||||
ElderItem,
|
|
||||||
ShaperItem,
|
|
||||||
SynthesisedItem,
|
|
||||||
FracturedItem,
|
|
||||||
AnyEnchantment,
|
|
||||||
MapTier,
|
|
||||||
ShapedMap,
|
|
||||||
ElderMap,
|
|
||||||
BligtedMap,
|
|
||||||
SocketGroup,
|
|
||||||
Height,
|
|
||||||
Width,
|
|
||||||
ItemLevel,
|
|
||||||
DropLevel,
|
|
||||||
GemLevel,
|
|
||||||
StackSize,
|
|
||||||
Rarity,
|
|
||||||
Class,
|
|
||||||
BaseType,
|
|
||||||
Prophecy,
|
|
||||||
HasExplicitMod,
|
|
||||||
HasEnchantment,
|
|
||||||
SetTextColor,
|
|
||||||
SetBackgroundColor,
|
|
||||||
SetBorderColor,
|
|
||||||
SetFontSize,
|
|
||||||
PlayAlertSound,
|
|
||||||
PlayAlertSoundPositional,
|
|
||||||
DisableDropSound,
|
|
||||||
MinimapIcon,
|
|
||||||
PlayEffect,
|
|
||||||
CustomAlertSound
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -8,7 +8,6 @@
|
|||||||
Rarity,
|
Rarity,
|
||||||
Class,
|
Class,
|
||||||
BaseType,
|
BaseType,
|
||||||
Prophecy,
|
|
||||||
Sockets,
|
Sockets,
|
||||||
LinkedSockets,
|
LinkedSockets,
|
||||||
SocketGroup,
|
SocketGroup,
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Enums
|
|
||||||
{
|
|
||||||
public enum EffectColor
|
|
||||||
{
|
|
||||||
[Description("Red")]
|
|
||||||
Red,
|
|
||||||
[Description("Green")]
|
|
||||||
Green,
|
|
||||||
[Description("Blue")]
|
|
||||||
Blue,
|
|
||||||
[Description("Brown")]
|
|
||||||
Brown,
|
|
||||||
[Description("White")]
|
|
||||||
White,
|
|
||||||
[Description("Yellow")]
|
|
||||||
Yellow
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Enums
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Each of the colors supported by the MinimapIcon block rule.
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>
|
|
||||||
/// The ordering here should match the ordering of the colors within the source image.
|
|
||||||
/// </remarks>
|
|
||||||
public enum IconColor
|
|
||||||
{
|
|
||||||
[Description("Blue")]
|
|
||||||
Blue,
|
|
||||||
[Description("Green")]
|
|
||||||
Green,
|
|
||||||
[Description("Brown")]
|
|
||||||
Brown,
|
|
||||||
[Description("Red")]
|
|
||||||
Red,
|
|
||||||
[Description("White")]
|
|
||||||
White,
|
|
||||||
[Description("Yellow")]
|
|
||||||
Yellow
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Enums
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Each of the shapes supported by the MinimapIcon block rule.
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>
|
|
||||||
/// The ordering here should match the ordering of the shapes within the source image.
|
|
||||||
/// </remarks>
|
|
||||||
public enum IconShape
|
|
||||||
{
|
|
||||||
[Description("Circle")]
|
|
||||||
Circle,
|
|
||||||
[Description("Diamond")]
|
|
||||||
Diamond,
|
|
||||||
[Description("Hexagon")]
|
|
||||||
Hexagon,
|
|
||||||
[Description("Square")]
|
|
||||||
Square,
|
|
||||||
[Description("Star")]
|
|
||||||
Star,
|
|
||||||
[Description("Triangle")]
|
|
||||||
Triangle
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace Filtration.ObjectModel.Enums
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Each of the sizes supported by the MinimapIcon block rule.
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>
|
|
||||||
/// The ordering here should match the ordering of the sizes within the source image.
|
|
||||||
/// </remarks>
|
|
||||||
public enum IconSize
|
|
||||||
{
|
|
||||||
[Description("Largest")]
|
|
||||||
Largest,
|
|
||||||
[Description("Medium")]
|
|
||||||
Medium,
|
|
||||||
[Description("Small")]
|
|
||||||
Small
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -4,6 +4,8 @@ namespace Filtration.ObjectModel.Enums
|
|||||||
{
|
{
|
||||||
public enum ItemRarity
|
public enum ItemRarity
|
||||||
{
|
{
|
||||||
|
[Description("Not Set")]
|
||||||
|
NotSet,
|
||||||
[Description("Normal")]
|
[Description("Normal")]
|
||||||
Normal,
|
Normal,
|
||||||
[Description("Magic")]
|
[Description("Magic")]
|
||||||
|
|||||||
@ -9,16 +9,6 @@ namespace Filtration.ObjectModel.Enums
|
|||||||
[Description("Background")]
|
[Description("Background")]
|
||||||
BackgroundColor,
|
BackgroundColor,
|
||||||
[Description("Border")]
|
[Description("Border")]
|
||||||
BorderColor,
|
BorderColor
|
||||||
[Description("Font Size")]
|
|
||||||
FontSize,
|
|
||||||
[Description("Alert Sound")]
|
|
||||||
AlertSound,
|
|
||||||
[Description("Custom Sound")]
|
|
||||||
CustomSound,
|
|
||||||
[Description("Icon")]
|
|
||||||
Icon,
|
|
||||||
[Description("Effect")]
|
|
||||||
Effect
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,20 +16,23 @@ namespace Filtration.ObjectModel.Extensions
|
|||||||
}
|
}
|
||||||
case ItemRarity.Normal:
|
case ItemRarity.Normal:
|
||||||
{
|
{
|
||||||
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
|
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
|
||||||
}
|
}
|
||||||
case ItemRarity.Rare:
|
case ItemRarity.Rare:
|
||||||
{
|
{
|
||||||
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.RareItem];
|
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.RareItem];
|
||||||
}
|
}
|
||||||
case ItemRarity.Unique:
|
case ItemRarity.Unique:
|
||||||
{
|
{
|
||||||
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.UniqueItem];
|
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.UniqueItem];
|
||||||
}
|
}
|
||||||
default:
|
case ItemRarity.NotSet:
|
||||||
{
|
{
|
||||||
throw new ArgumentOutOfRangeException(nameof(itemRarity), itemRarity, null);
|
return PathOfExileNamedColors.Colors[PathOfExileNamedColor.QuestItem];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(itemRarity), itemRarity, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,8 +24,8 @@ namespace Filtration.ObjectModel
|
|||||||
ItemFilterBlock = itemFilterBlock;
|
ItemFilterBlock = itemFilterBlock;
|
||||||
|
|
||||||
BlockAction = itemFilterBlock?.Action ?? BlockAction.Show;
|
BlockAction = itemFilterBlock?.Action ?? BlockAction.Show;
|
||||||
BackgroundColor = itemFilterBlock?.DisplayBackgroundColor ?? new Color { A = 240, R = 0, G = 0, B = 0 };
|
BackgroundColor = itemFilterBlock?.DisplayBackgroundColor ?? new Color { A = 255, R = 0, G = 0, B = 0 };
|
||||||
BorderColor = itemFilterBlock?.DisplayBorderColor ?? new Color {A = 240, R = 0, G = 0, B = 0};
|
BorderColor = itemFilterBlock?.DisplayBorderColor ?? new Color {A = 255, R = 0, G = 0, B = 0};
|
||||||
FontSize = (itemFilterBlock?.DisplayFontSize ?? 34) / 1.8;
|
FontSize = (itemFilterBlock?.DisplayFontSize ?? 34) / 1.8;
|
||||||
|
|
||||||
SetTextColor();
|
SetTextColor();
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user