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

FIL-13 Comments on the Show/Hide line are now preserved if block groups are not enabled for the script

Browse Source
This commit is contained in:
Ben Wallis
2017-05-14 14:10:54 +01:00
parent 8e54cc3b4b
commit 797c911bb5
5 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Filtration.ObjectModel/BlockItemBaseTypes/ActionBlockItem.cs
View File

@@ -15,7 +15,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
public BlockAction Action
{
get { return _action; }
get => _action;
set
{
_action = value;
@@ -27,6 +27,8 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
}
}
public string Comment { get; set; }
public override string OutputText => Action.GetAttributeDescription();
public override string PrefixText => string.Empty;

6
Filtration.ObjectModel/ItemFilterBlock.cs
View File

@@ -15,6 +15,7 @@ namespace Filtration.ObjectModel
string Description { get; set; }
ItemFilterBlockGroup BlockGroup { get; set; }
BlockAction Action { get; set; }
ActionBlockItem ActionBlockItem { get; }
ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
Color DisplayBackgroundColor { get; }
Color DisplayTextColor { get; }
@@ -32,7 +33,8 @@ namespace Filtration.ObjectModel
public ItemFilterBlock()
{
BlockItems = new ObservableCollection<IItemFilterBlockItem> {new ActionBlockItem(BlockAction.Show)};
ActionBlockItem = new ActionBlockItem(BlockAction.Show);
BlockItems = new ObservableCollection<IItemFilterBlockItem> {ActionBlockItem};
Enabled = true;
}
@@ -79,6 +81,8 @@ namespace Filtration.ObjectModel
}
}
public ActionBlockItem ActionBlockItem { get; }
public ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
public int BlockCount(Type type)