InfoMan: Reference ValueConverters via Static instead of StaticResource

jbe2277 · Jul 19, 2024 · 26d4174 · 26d4174
1 parent 9edc012
commit 26d4174
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 63 deletions.
diff --git a/...amples/BookLibrary/BookLibrary.Reporting.Presentation/Properties/DesignTimeResources.xaml b/...amples/BookLibrary/BookLibrary.Reporting.Presentation/Properties/DesignTimeResources.xaml
@@ -4,7 +4,6 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/BookLibrary;Component/Resources/ImageResources.xaml"/>
-        <ResourceDictionary Source="/BookLibrary;Component/Resources/ConverterResources.xaml"/>
         <ResourceDictionary Source="/BookLibrary;Component/Resources/ControlResources.xaml"/>
         <ResourceDictionary Source="/BookLibrary;Component/Resources/DataResources.xaml"/>
         <ResourceDictionary Source="/BookLibrary;Component/Resources/LayoutResources.xaml"/>

diff --git a/...s/InformationManager/AddressBook.Modules.Presentation/Properties/DesignTimeResources.xaml b/...s/InformationManager/AddressBook.Modules.Presentation/Properties/DesignTimeResources.xaml
@@ -2,7 +2,6 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ImageResources.xaml"/>
-        <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ConverterResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ControlResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ToolBarResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/LayoutResources.xaml"/>

diff --git a/...af/Samples/InformationManager/AddressBook.Modules.Presentation/Views/ContactListView.xaml b/...af/Samples/InformationManager/AddressBook.Modules.Presentation/Views/ContactListView.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ctrl="clr-namespace:Waf.InformationManager.Common.Presentation.Controls;assembly=Waf.InformationManager.Common.Presentation"
+             xmlns:cc="clr-namespace:Waf.InformationManager.Common.Presentation.Converters;assembly=Waf.InformationManager.Common.Presentation"
              xmlns:dd="clr-namespace:Waf.InformationManager.AddressBook.Modules.Presentation.DesignData"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
@@ -34,13 +35,13 @@
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
-                        <TextBlock Text="{Binding Firstname, ValidatesOnNotifyDataErrors=False, Converter={StaticResource TargetStringEmptyValueConverter}}" Margin="7"/>
+                        <TextBlock Text="{Binding Firstname, ValidatesOnNotifyDataErrors=False, Converter={x:Static cc:TargetStringEmptyValueConverter.Default}}" Margin="7"/>
 
-                        <TextBlock Text="{Binding Email, ValidatesOnNotifyDataErrors=False, Converter={StaticResource TargetStringEmptyValueConverter}}" Grid.Column="1" Margin="7"/>
+                        <TextBlock Text="{Binding Email, ValidatesOnNotifyDataErrors=False, Converter={x:Static cc:TargetStringEmptyValueConverter.Default}}" Grid.Column="1" Margin="7"/>
 
-                        <TextBlock Text="{Binding Lastname, ValidatesOnNotifyDataErrors=False, Converter={StaticResource TargetStringEmptyValueConverter}}" Grid.Row="1" Margin="7,0,7,7"/>
+                        <TextBlock Text="{Binding Lastname, ValidatesOnNotifyDataErrors=False, Converter={x:Static cc:TargetStringEmptyValueConverter.Default}}" Grid.Row="1" Margin="7,0,7,7"/>
 
-                        <TextBlock Text="{Binding Phone, ValidatesOnNotifyDataErrors=False, Converter={StaticResource TargetStringEmptyValueConverter}}" Grid.Column="1" Grid.Row="1" Margin="7,0,7,7"/>
+                        <TextBlock Text="{Binding Phone, ValidatesOnNotifyDataErrors=False, Converter={x:Static cc:TargetStringEmptyValueConverter.Default}}" Grid.Column="1" Grid.Row="1" Margin="7,0,7,7"/>
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>

diff --git a/src/System.Waf/Samples/InformationManager/Assembler/App.xaml b/src/System.Waf/Samples/InformationManager/Assembler/App.xaml
@@ -5,7 +5,6 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ImageResources.xaml"/>
-                <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ConverterResources.xaml"/>
                 <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ControlResources.xaml"/>
                 <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ToolBarResources.xaml"/>
                 <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/LayoutResources.xaml"/>

diff --git a/...ples/InformationManager/Common.Presentation/Converters/TargetStringEmptyValueConverter.cs b/...ples/InformationManager/Common.Presentation/Converters/TargetStringEmptyValueConverter.cs
@@ -6,6 +6,9 @@ namespace Waf.InformationManager.Common.Presentation.Converters;
 /// <summary>Value converter that returns a special string if the (string) value is null or empty.</summary>
 public class TargetStringEmptyValueConverter : IValueConverter
 {
+    /// <summary>Default instance of the TargetStringEmptyValueConverter.</summary>
+    public static TargetStringEmptyValueConverter Default { get; } = new();
+
     /// <summary>Returns a special string if the (string) value is null or empty. Otherwise it returns value.</summary>
     /// <param name="value">The string value to convert.</param>
     /// <param name="targetType">The type of the binding target property. This parameter will be ignored.</param>

diff --git a/...em.Waf/Samples/InformationManager/Common.Presentation/Properties/DesignTimeResources.xaml b/...em.Waf/Samples/InformationManager/Common.Presentation/Properties/DesignTimeResources.xaml
@@ -2,7 +2,6 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ImageResources.xaml"/>
-        <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ConverterResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ControlResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ToolBarResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/LayoutResources.xaml"/>

diff --git a/...System.Waf/Samples/InformationManager/Common.Presentation/Resources/ControlResources.xaml b/...System.Waf/Samples/InformationManager/Common.Presentation/Resources/ControlResources.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:waf="http://waf.codeplex.com/schemas">
 
     <SolidColorBrush x:Key="HeaderTextBrush" Color="#003399"/>
 
@@ -8,7 +9,7 @@
             <AdornedElementPlaceholder x:Name="controlWithError"/>
             <Border BorderThickness="1" BorderBrush="#FFDB000C" SnapsToDevicePixels="True">
                 <Border.ToolTip>
-                    <MultiBinding Converter="{StaticResource ValidationErrorsConverter}">
+                    <MultiBinding Converter="{x:Static waf:ValidationErrorsConverter.Default}">
                         <Binding ElementName="controlWithError" Path="AdornedElement.(Validation.Errors)"/>
                         <Binding ElementName="controlWithError" Path="AdornedElement.(Validation.Errors).Count"/>
                     </MultiBinding>

diff --git a/...stem.Waf/Samples/InformationManager/Common.Presentation/Resources/ConverterResources.xaml b/...stem.Waf/Samples/InformationManager/Common.Presentation/Resources/ConverterResources.xaml
diff --git a/...nManager/EmailClient.Modules.Presentation/Converters/StringCollectionToStringConverter.cs b/...nManager/EmailClient.Modules.Presentation/Converters/StringCollectionToStringConverter.cs
@@ -5,6 +5,8 @@ namespace Waf.InformationManager.EmailClient.Modules.Presentation.Converters;
 
 public class StringCollectionToStringConverter : IValueConverter
 {
+    public static StringCollectionToStringConverter Default { get; } = new();
+
     public object Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture) => string.Join("; ", (IEnumerable<string>)value!);
 
     public object ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture) => throw new NotSupportedException();

diff --git a/...s/InformationManager/EmailClient.Modules.Presentation/Properties/DesignTimeResources.xaml b/...s/InformationManager/EmailClient.Modules.Presentation/Properties/DesignTimeResources.xaml
@@ -2,12 +2,9 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ImageResources.xaml"/>
-        <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ConverterResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ControlResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ToolBarResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/LayoutResources.xaml"/>
-
-        <ResourceDictionary Source="/Waf.InformationManager.EmailClient.Modules.Presentation;Component/Resources/ConverterResources.xaml"/>
 	</ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
diff --git a/...les/InformationManager/EmailClient.Modules.Presentation/Resources/ConverterResources.xaml b/...les/InformationManager/EmailClient.Modules.Presentation/Resources/ConverterResources.xaml
diff --git a/...mples/InformationManager/EmailClient.Modules.Presentation/Services/PresentationService.cs b/...mples/InformationManager/EmailClient.Modules.Presentation/Services/PresentationService.cs
diff --git a/....Waf/Samples/InformationManager/EmailClient.Modules.Presentation/Views/EmailListView.xaml b/....Waf/Samples/InformationManager/EmailClient.Modules.Presentation/Views/EmailListView.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Waf.InformationManager.EmailClient.Modules.Presentation.Views.EmailListView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:c="clr-namespace:Waf.InformationManager.EmailClient.Modules.Presentation.Converters"
              xmlns:s="clr-namespace:Waf.InformationManager.EmailClient.Modules.Presentation.Selectors"
              xmlns:ctrl="clr-namespace:Waf.InformationManager.Common.Presentation.Controls;assembly=Waf.InformationManager.Common.Presentation"
              xmlns:dd="clr-namespace:Waf.InformationManager.EmailClient.Modules.Presentation.DesignData"
@@ -42,7 +43,7 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-                <TextBlock Text="{Binding To, ValidatesOnNotifyDataErrors=False, Converter={StaticResource StringCollectionToStringConverter}}"
+                <TextBlock Text="{Binding To, ValidatesOnNotifyDataErrors=False, Converter={x:Static c:StringCollectionToStringConverter.Default}}"
                            Margin="7" TextTrimming="CharacterEllipsis" />
 
                 <TextBlock Text="{Binding Sent, ValidatesOnNotifyDataErrors=False, StringFormat=d}" Grid.Column="1" Margin="7"/>

diff --git a/...stem.Waf/Samples/InformationManager/EmailClient.Modules.Presentation/Views/EmailView.xaml b/...stem.Waf/Samples/InformationManager/EmailClient.Modules.Presentation/Views/EmailView.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Waf.InformationManager.EmailClient.Modules.Presentation.Views.EmailView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:c="clr-namespace:Waf.InformationManager.EmailClient.Modules.Presentation.Converters"
              xmlns:dd="clr-namespace:Waf.InformationManager.EmailClient.Modules.Presentation.DesignData"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
@@ -65,17 +66,17 @@
 
                         <Label Content="To:" Grid.Row="2" Grid.Column="0" Margin="11,0,0,0"/>
                         <Label Grid.Row="2" Grid.Column="1">
-                            <TextBlock Text="{Binding To, Converter={StaticResource StringCollectionToStringConverter}}" TextTrimming="CharacterEllipsis" />
+                            <TextBlock Text="{Binding To, Converter={x:Static c:StringCollectionToStringConverter.Default}}" TextTrimming="CharacterEllipsis" />
                         </Label>
 
                         <Label Content="CC:" Grid.Row="3" Grid.Column="0" Margin="11,0,0,0"/>
                         <Label Grid.Row="3" Grid.Column="1">
-                            <TextBlock Text="{Binding CC, Converter={StaticResource StringCollectionToStringConverter}}" TextTrimming="CharacterEllipsis"/>
+                            <TextBlock Text="{Binding CC, Converter={x:Static c:StringCollectionToStringConverter.Default}}" TextTrimming="CharacterEllipsis"/>
                         </Label>
 
                         <Label Content="BCC:" Grid.Row="4" Grid.Column="0" Margin="11,0,0,0"/>
                         <Label Grid.Row="4" Grid.Column="1">
-                            <TextBlock Text="{Binding Bcc, Converter={StaticResource StringCollectionToStringConverter}}" TextTrimming="CharacterEllipsis"/>
+                            <TextBlock Text="{Binding Bcc, Converter={x:Static c:StringCollectionToStringConverter.Default}}" TextTrimming="CharacterEllipsis"/>
                         </Label>
 
                         <Label Content="Sent:" Grid.Row="5" Grid.Column="0" Margin="11,0,0,0"/>

diff --git a/...f/Samples/InformationManager/EmailClient.Modules.Presentation/Views/Pop3SettingsView.xaml b/...f/Samples/InformationManager/EmailClient.Modules.Presentation/Views/Pop3SettingsView.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="Waf.InformationManager.EmailClient.Modules.Presentation.Views.Pop3SettingsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:waf="http://waf.codeplex.com/schemas"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:dd="clr-namespace:Waf.InformationManager.EmailClient.Modules.Presentation.DesignData"
@@ -54,11 +55,11 @@
         <Label Grid.Column="0" Grid.Row="10" Content="User name"/>
         <TextBox Grid.Column="2" Grid.Row="10" Width="150" 
             Text="{Binding Model.SmtpUserCredits.UserName, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=true}" 
-            IsEnabled="{Binding UseSameUserCredits, Converter={StaticResource InvertBooleanConverter}}"/>
+            IsEnabled="{Binding UseSameUserCredits, Converter={x:Static waf:InvertBooleanConverter.Default}}"/>
 
         <Label Grid.Column="0" Grid.Row="12" Content="Password"/>
         <PasswordBox x:Name="smtpPassword" Grid.Column="2" Grid.Row="12" LostFocus="SmtpPasswordChanged" Width="150"
-            IsEnabled="{Binding UseSameUserCredits, Converter={StaticResource InvertBooleanConverter}}"/>
+            IsEnabled="{Binding UseSameUserCredits, Converter={x:Static waf:InvertBooleanConverter.Default}}"/>
 
         <CheckBox Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="14" Content="Use same user name and password as for my POP3 server" IsChecked="{Binding UseSameUserCredits}"/>
     </Grid>

diff --git a/...ationManager/Infrastructure.Modules.Presentation/Converters/ItemCountToStringConverter.cs b/...ationManager/Infrastructure.Modules.Presentation/Converters/ItemCountToStringConverter.cs
@@ -5,6 +5,8 @@ namespace Waf.InformationManager.Infrastructure.Modules.Presentation.Converters;
 
 public class ItemCountToStringConverter : IValueConverter
 {
+    public static ItemCountToStringConverter Default { get; } = new();
+
     public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
     {
         if (value == null) return "";

diff --git a/...nformationManager/Infrastructure.Modules.Presentation/Properties/DesignTimeResources.xaml b/...nformationManager/Infrastructure.Modules.Presentation/Properties/DesignTimeResources.xaml
@@ -2,11 +2,8 @@
 
 	<ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ImageResources.xaml"/>
-        <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ConverterResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ControlResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/ToolBarResources.xaml"/>
         <ResourceDictionary Source="/Waf.InformationManager.Common.Presentation;Component/Resources/LayoutResources.xaml"/>
-
-        <ResourceDictionary Source="/Waf.InformationManager.Infrastructure.Modules.Presentation;Component/Resources/ConverterResources.xaml"/>
 	</ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/.../InformationManager/Infrastructure.Modules.Presentation/Resources/ConverterResources.xaml b/.../InformationManager/Infrastructure.Modules.Presentation/Resources/ConverterResources.xaml
diff --git a/...es/InformationManager/Infrastructure.Modules.Presentation/Services/PresentationService.cs b/...es/InformationManager/Infrastructure.Modules.Presentation/Services/PresentationService.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.Composition;
 using System.Globalization;
-using System.Waf.Presentation;
 using System.Windows;
 using System.Windows.Markup;
 using Waf.InformationManager.Common.Applications.Services;
@@ -13,7 +12,5 @@ internal sealed class PresentationService : IPresentationService
     public void Initialize()
     {
         FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
-
-        ResourceHelper.AddToApplicationResources(typeof(PresentationService).Assembly, "Resources/ConverterResources.xaml");
     }
 }
diff --git a/...Waf/Samples/InformationManager/Infrastructure.Modules.Presentation/Views/ShellWindow.xaml b/...Waf/Samples/InformationManager/Infrastructure.Modules.Presentation/Views/ShellWindow.xaml
@@ -1,6 +1,7 @@
 <Window x:Class="Waf.InformationManager.Infrastructure.Modules.Presentation.Views.ShellWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:c="clr-namespace:Waf.InformationManager.Infrastructure.Modules.Presentation.Converters"
         xmlns:vm="clr-namespace:Waf.InformationManager.Infrastructure.Modules.Applications.ViewModels;assembly=Waf.InformationManager.Infrastructure.Modules.Applications"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -46,7 +47,7 @@
                     <DataTemplate>
                         <TextBlock>
                             <Run Text="{Binding Name, Mode=OneWay}"/>
-                            <Run Text="{Binding ItemCount, Mode=OneWay, Converter={StaticResource ItemCountToStringConverter}}" FontWeight="SemiBold"/>
+                            <Run Text="{Binding ItemCount, Mode=OneWay, Converter={x:Static c:ItemCountToStringConverter.Default}}" FontWeight="SemiBold"/>
                         </TextBlock>
                     </DataTemplate>
                 </TreeViewItem.ItemTemplate>