Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/ResXManager.VSIX.Compatibility.Shared/Refactorings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,6 @@ public bool CanMoveToResource()
.Where(entity => !entity.IsWinFormsDesignerResource)
.ToList();

var filter = EntityFilter.BuildFilter(Settings.Default.ResourceFilter);
if (filter != null)
{
entities.RemoveAll(item => !filter(item.ToString()));
}

var projectResources = new HashSet<ResourceEntity>(GetResourceEntriesFromProject(document, entities));

// put resources from the same project on top
Expand Down
12 changes: 9 additions & 3 deletions src/ResXManager.View/Behaviors/EntityFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Xaml.Behaviors;

using ResXManager.Infrastructure;
using ResXManager.Model;

using Throttle;

Expand Down Expand Up @@ -40,7 +41,7 @@ private void FilterText_Changed()
listBox.Items.Filter = BuildFilter(value);
}

public static Predicate<object>? BuildFilter(string? value)
private static Predicate<object>? BuildFilter(string? value)
{
value = value?.Trim();

Expand All @@ -50,7 +51,7 @@ private void FilterText_Changed()
try
{
var regex = new Regex(value, RegexOptions.IgnoreCase | RegexOptions.Singleline);
return item => regex.IsMatch(item?.ToString() ?? string.Empty);
return item => Filter(item, regex);
}
catch (ArgumentException)
{
Expand All @@ -59,7 +60,7 @@ private void FilterText_Changed()
try
{
var regex = new Regex(value.Replace(@"\", @"\\", StringComparison.Ordinal), RegexOptions.IgnoreCase | RegexOptions.Singleline);
return item => regex.IsMatch(item?.ToString() ?? string.Empty);
return item => Filter(item, regex);
}
catch (ArgumentException)
{
Expand All @@ -68,6 +69,11 @@ private void FilterText_Changed()
return null;
}

private static bool Filter(object item, Regex regex)
{
return item is ResourceEntity entity && (regex.IsMatch(entity.DisplayName) || regex.IsMatch(entity.ProjectName));
}

protected override void OnAttached()
{
base.OnAttached();
Expand Down
15 changes: 15 additions & 0 deletions src/ResXManager.View/Visuals/ProjectFilterItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
namespace ResXManager.View.Visuals;

using System.Text.RegularExpressions;

public class ProjectFilterItem(string displayName)
{
public string DisplayName { get; } = displayName;

public string SearchText { get; } = $"^{Regex.Escape(displayName)}$";

public override string ToString()
{
return SearchText;
}
}
15 changes: 13 additions & 2 deletions src/ResXManager.View/Visuals/ResourceView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,19 @@
VerticalAlignment="Center" HorizontalAlignment="Right" Margin="2,0" />
</StackPanel>
<Decorator DockPanel.Dock="Top" Height="1" />
<TextBox x:Name="EntityFilter" Text="{Binding Path=ResourceFilter, Source={x:Static properties:Settings.Default}, Mode=TwoWay}"
ToolTip="{x:Static properties:Resources.ResourceFilterToolTip}" BorderThickness="0" Style="{DynamicResource {x:Static styles:ResourceKeys.TextBoxStyle}}" />
<ComboBox x:Name="EntityFilter"
IsEditable="True"
ItemsSource="{Binding ProjectNames}"
Text="{Binding Path=ResourceFilter, Source={x:Static properties:Settings.Default}, Mode=TwoWay}"
ToolTip="{x:Static properties:Resources.ResourceFilterToolTip}"
BorderThickness="0"
Style="{DynamicResource {x:Static styles:ResourceKeys.ComboBoxStyle}}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</DockPanel>
</Border>
</DockPanel>
Expand Down
18 changes: 17 additions & 1 deletion src/ResXManager.View/Visuals/ResourceViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
using ResXManager.View.Tools;

using Throttle;

using TomsToolbox.Essentials;
using TomsToolbox.ObservableCollections;
using TomsToolbox.Wpf;
Expand Down Expand Up @@ -55,15 +56,30 @@ public ResourceViewModel(ResourceManager resourceManager, IConfiguration configu
_performanceTracer = performanceTracer;

ResourceTableEntries = SelectedEntities.ObservableSelectMany(entity => entity.Entries);
ResourceTableEntries.CollectionChanged += (_, __) => ResourceTableEntries_CollectionChanged();
ResourceTableEntries.CollectionChanged += (_, _) => ResourceTableEntries_CollectionChanged();

ResourceManager.ResourceEntities.CollectionChanged += (_, _) => ResourceEntities_OnCollectionChanged();

resourceManager.LanguageChanged += ResourceManager_LanguageChanged;
}

[Throttled(typeof(DispatcherThrottle))]
private void ResourceEntities_OnCollectionChanged()
{
ProjectNames.Clear();
ProjectNames.AddRange(ResourceManager.ResourceEntities
.Select(entity => entity.ProjectName)
.Distinct()
.OrderBy(name => name)
.Select(name => new ProjectFilterItem(name)));
}

internal event EventHandler<ResourceTableEntryEventArgs>? ClearFiltersRequest;

public ResourceManager ResourceManager { get; }

public ObservableCollection<ProjectFilterItem> ProjectNames { get; } = [];

public IObservableCollection<ResourceTableEntry> ResourceTableEntries { get; }

public ObservableCollection<ResourceEntity> SelectedEntities { get; } = [];
Expand Down