Revert converters, fixes #6119

Author: Vogel612

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -215,7 +215,7 @@
                 <Setter Property="BorderThickness" Value="1.5"/>
                 <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
                 <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=OneWay}" />
-                <Setter Property="Visibility" Value="{Binding Filtered, Mode=OneWay, Converter={DynamicResource BoolToHiddenVisibility}}" />
+                <Setter Property="Visibility" Value="{Binding Filtered, Mode=OneWay, Converter={StaticResource BoolToHiddenVisibility}}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <EventSetter Event="MouseDoubleClick" Handler="TreeView_OnMouseDoubleClick" />
                 <EventSetter Event="MouseRightButtonDown" Handler="TreeView_OnMouseRightButtonDown" />
@@ -287,7 +287,7 @@
                         <local:CodeExplorerSortOrderBooleanConverter x:Key="CodeFlagConverter" />
                         <local:CodeExplorerSortOrderBooleanConverter x:Key="TypeFlagConverter" />
                     </Menu.Resources>
-                    <MenuItem IsEnabled="{Binding IsBusy, Converter={DynamicResource NotBool}}" VerticalAlignment="Center" >
+                    <MenuItem IsEnabled="{Binding IsBusy, Converter={StaticResource NotBool}}" VerticalAlignment="Center" >
                         <MenuItem.Header>
                             <Image Style="{DynamicResource DisablingIconStyle}" Source="{DynamicResource SortImage}" />
                         </MenuItem.Header>
@@ -297,14 +297,14 @@
                         <MenuItem.Items>
                             <MenuItem IsCheckable="True" Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center" 
                                       Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_SortStyle_ByName}"
-                                      IsChecked="{Binding Path=SortOrder, Converter={DynamicResource NameFlagConverter}, ConverterParameter={x:Static codeExplorer:CodeExplorerSortOrder.Name}}" />
+                                      IsChecked="{Binding Path=SortOrder, Converter={StaticResource NameFlagConverter}, ConverterParameter={x:Static codeExplorer:CodeExplorerSortOrder.Name}}" />
                             <MenuItem IsCheckable="True" Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center" 
                                       Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_SortStyle_ByCodeOrder}"
-                                      IsChecked="{Binding Path=SortOrder, Converter={DynamicResource CodeFlagConverter}, ConverterParameter={x:Static codeExplorer:CodeExplorerSortOrder.CodeLine}}" />
+                                      IsChecked="{Binding Path=SortOrder, Converter={StaticResource CodeFlagConverter}, ConverterParameter={x:Static codeExplorer:CodeExplorerSortOrder.CodeLine}}" />
                             <Separator />
                             <MenuItem IsCheckable="True" Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center" 
                                       Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_SortStyle_ByType}"
-                                      IsChecked="{Binding Path=SortOrder, Converter={DynamicResource TypeFlagConverter}, ConverterParameter={x:Static codeExplorer:CodeExplorerSortOrder.DeclarationType}}" />
+                                      IsChecked="{Binding Path=SortOrder, Converter={StaticResource TypeFlagConverter}, ConverterParameter={x:Static codeExplorer:CodeExplorerSortOrder.DeclarationType}}" />
                         </MenuItem.Items>
                     </MenuItem>
                 </Menu>
@@ -434,7 +434,7 @@
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_OpenDesigner}"
                       Command="{Binding OpenDesignerCommand}"
                       CommandParameter="{Binding SelectedItem, Mode=OneWay}"
-                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={DynamicResource BoolToVisibility}}">
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
                         <MenuItem.Icon>
                             <Image Style="{DynamicResource ToolbarIconStyle}" Source="{DynamicResource OpenDesignerImage}" />
                         </MenuItem.Icon>
@@ -461,7 +461,7 @@
                         <MenuItem.ItemContainerStyle>
                             <Style TargetType="MenuItem">
                                 <Setter Property="Command" Value="{Binding DataContext.AnnotateDeclarationCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" />
-                                <Setter Property="Header" Value="{Binding Path=., Converter={DynamicResource AnnotationToCodeString}}" />
+                                <Setter Property="Header" Value="{Binding Path=., Converter={StaticResource AnnotationToCodeString}}" />
                                 <Setter Property="CommandParameter">
                                     <Setter.Value>
                                         <MultiBinding Converter="{DynamicResource AnnotateDeclarationCommandParameterToTuple}">
@@ -609,7 +609,7 @@
                     <StackPanel Orientation="Horizontal">
                         <Grid>
                             <Image Style="{DynamicResource ToolbarIconStyle}" 
-                                   ToolTip="{Binding Converter={DynamicResource DeclarationTypeNameConverter}}">
+                                   ToolTip="{Binding Converter={StaticResource DeclarationTypeNameConverter}}">
                                 <Image.Source>
                                     <MultiBinding Converter="{DynamicResource NodeToIcon}">
                                         <MultiBinding.Bindings>
@@ -621,8 +621,8 @@
                                     </MultiBinding>
                                 </Image.Source>
                             </Image>
-                            <Image Source="{Binding Declaration, Converter={DynamicResource AccessibilityToIcon}}" Style="{DynamicResource ToolbarIconStyle}"
-                                   ToolTip="{Binding Converter={DynamicResource DeclarationTypeNameConverter}}"/>
+                            <Image Source="{Binding Declaration, Converter={StaticResource AccessibilityToIcon}}" Style="{DynamicResource ToolbarIconStyle}"
+                                   ToolTip="{Binding Converter={StaticResource DeclarationTypeNameConverter}}"/>
                         </Grid>
                         <TextBlock Style="{DynamicResource TreeViewItemStyleModified}" />
                     </StackPanel>
@@ -634,9 +634,9 @@
             </i:Interaction.Behaviors>
         </TreeView>
 
-        <controls:EmptyUIRefresh Grid.Row="2" Visibility="{Binding Unparsed, Converter={DynamicResource BoolToVisibility}}" />
+        <controls:EmptyUIRefresh Grid.Row="2" Visibility="{Binding Unparsed, Converter={StaticResource BoolToVisibility}}" />
 
-        <controls:BusyIndicator Grid.Row="2" Width="120" Height="120" Visibility="{Binding IsBusy, Converter={DynamicResource BoolToVisibility}}" />
+        <controls:BusyIndicator Grid.Row="2" Width="120" Height="120" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibility}}" />
 
         <GridSplitter Grid.Row="3" Height="5" ShowsPreview="True" Cursor="SizeNS" HorizontalAlignment="Stretch"/>
 
@@ -660,23 +660,23 @@
                                 </MultiBinding>
                             </Image.Source>
                         </Image>
-                        <Image Grid.Column="0" Source="{Binding SelectedItem.Declaration, Converter={DynamicResource AccessibilityToIcon}}" Style="{DynamicResource ToolbarIconStyle}" />
+                        <Image Grid.Column="0" Source="{Binding SelectedItem.Declaration, Converter={StaticResource AccessibilityToIcon}}" Style="{DynamicResource ToolbarIconStyle}" />
                         <TextBox Style="{DynamicResource FooterTextBoxStyle}" Grid.Column="1" Text="{Binding SelectedItem.PanelTitle, Mode=OneWay}" FontWeight="Bold" />
                     </Grid>
                     <TextBox Style="{DynamicResource FooterTextBoxStyle}" Text="{Binding SelectedItem.Description, Mode=OneWay}" />
                     <WrapPanel>
                         <controls:LinkButton Margin="4" FontSize="{Binding FontSize, Mode=OneWay}"
                             Command="{Binding IndenterCommand}" CommandParameter="{Binding SelectedItem, Mode=OneWay}"
                             Content="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Indent}"
-                            Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={DynamicResource BoolToVisibility}, Mode=OneWay}"/>
+                            Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={StaticResource BoolToVisibility}, Mode=OneWay}"/>
                         <controls:LinkButton Margin="4" FontSize="{Binding FontSize, Mode=OneWay}"
                             Command="{Binding RenameCommand}" CommandParameter="{Binding SelectedItem, Mode=OneWay}"
                             Content="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Rename}"
-                            Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={DynamicResource BoolToVisibility}, Mode=OneWay}"/>
+                            Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={StaticResource BoolToVisibility}, Mode=OneWay}"/>
                         <controls:LinkButton Margin="4" FontSize="{Binding FontSize, Mode=OneWay}"
                             Command="{Binding FindAllReferencesCommand}" CommandParameter="{Binding SelectedItem, Mode=OneWay}"
                             Content="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_FindAllReferencesText}"
-                            Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={DynamicResource BoolToVisibility}, Mode=OneWay}"/>
+                            Visibility="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled, Converter={StaticResource BoolToVisibility}, Mode=OneWay}"/>
                     </WrapPanel>
                 </WrapPanel>
             </ScrollViewer>

Rubberduck.Core/UI/CodeMetrics/CodeMetricsControl.xaml

@@ -50,7 +50,7 @@
                             <Setter Property="BorderThickness" Value="1.5"/>
                             <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
                             <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=OneWay}" />
-                            <Setter Property="Visibility" Value="{Binding Filtered, Mode=OneWay, Converter={DynamicResource BoolToHiddenVisibility}}" />
+                            <Setter Property="Visibility" Value="{Binding Filtered, Mode=OneWay, Converter={StaticResource BoolToHiddenVisibility}}" />
                             <Setter Property="HorizontalAlignment" Value="Left" />
                             <Style.Triggers>
                                 <Trigger Property="IsSelected" Value="True">
@@ -89,7 +89,7 @@
                                     </MultiBinding>
                                 </Image.Source>
                             </Image>
-                            <Image Source="{Binding Declaration, Converter={DynamicResource AccessibilityToIcon}}" Style="{DynamicResource ToolbarIconStyle}" />
+                            <Image Source="{Binding Declaration, Converter={StaticResource AccessibilityToIcon}}" Style="{DynamicResource ToolbarIconStyle}" />
                         </Grid>
                         <TextBlock Style="{DynamicResource TreeViewItemStyleModified}" />
                     </StackPanel>
@@ -129,9 +129,9 @@
             </ListView.ItemTemplate>
         </ListView>
 
-        <controls:EmptyUIRefresh Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="2" Visibility="{Binding Unparsed, Converter={DynamicResource BoolToVisibility}}" />
+        <controls:EmptyUIRefresh Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="2" Visibility="{Binding Unparsed, Converter={StaticResource BoolToVisibility}}" />
 
-        <controls:BusyIndicator Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="2" Width="120" Height="120" Visibility="{Binding IsBusy, Converter={DynamicResource BoolToVisibility}}" />
+        <controls:BusyIndicator Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="2" Width="120" Height="120" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibility}}" />
     </Grid>
 </UserControl>
 

Rubberduck.Core/UI/Controls/GroupingGrid.xaml

@@ -42,7 +42,7 @@
     									VerticalAlignment="Center" 
     									Text="{Binding ItemCount, StringFormat=(\{0\})}" 
     									TextWrapping="NoWrap"
-    									Visibility="{Binding ShowGroupingItemCount, Converter={DynamicResource BooleanToVisibilityConverter}, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:GroupingGrid}}}"/>
+    									Visibility="{Binding ShowGroupingItemCount, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:GroupingGrid}}}"/>
                                     </StackPanel>
                                 </Expander.Header>
                                 <ItemsPresenter Margin="25,0,0,0" />

Rubberduck.Core/UI/Controls/PeekControl.xaml

@@ -40,10 +40,10 @@
 
             <Image Grid.Row="0" Grid.Column="0" VerticalAlignment="Top"
                    Style="{DynamicResource IconStyle}" 
-                   Source="{Binding NavigateCommandParameter, Converter={DynamicResource DeclarationToIcon}, Mode=OneWay}" />
+                   Source="{Binding NavigateCommandParameter, Converter={StaticResource DeclarationToIcon}, Mode=OneWay}" />
             <Image Grid.Row="0" Grid.Column="0" VerticalAlignment="Top"
                    Style="{DynamicResource IconStyle}" 
-                   Source="{Binding Target.Accessibility, Converter={DynamicResource AccessibilityToIcon}, Mode=OneWay}" />
+                   Source="{Binding Target.Accessibility, Converter={StaticResource AccessibilityToIcon}, Mode=OneWay}" />
 
             <TextBlock Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"
                        Text="{Binding Target.IdentifierName}" 

Rubberduck.Core/UI/Controls/SearchBox.xaml

@@ -60,7 +60,7 @@
             <Image VerticalAlignment="Center" HorizontalAlignment="Center"  
                    Width="16" Height="16" 
                    Source="{Binding Text, ElementName=ValueContainer, 
-                            Converter={DynamicResource SearchToIcon}, 
+                            Converter={StaticResource SearchToIcon}, 
                             UpdateSourceTrigger=PropertyChanged}" />
             <i:Interaction.Behaviors>
                 <local:FocusElementAfterClickBehavior FocusElement="{x:Reference ValueContainer}"/>

Rubberduck.Core/UI/Controls/SearchView.xaml

@@ -31,12 +31,12 @@
                                            SelectedItem="{Binding SelectedItem}">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberName}" Binding="{Binding ParentScope.IdentifierName}" />
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberType}" Binding="{Binding ParentScope.DeclarationType, Converter={DynamicResource DeclarationTypeToString}}" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberType}" Binding="{Binding ParentScope.DeclarationType, Converter={StaticResource DeclarationTypeToString}}" />
                             <DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_Location}" Binding="{Binding Selection}" />
                             <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_Context}" Width="*">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <ContentControl Content="{Binding Converter={DynamicResource SearchResultConverter}}" />
+                                        <ContentControl Content="{Binding Converter={StaticResource SearchResultConverter}}" />
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>

Rubberduck.Core/UI/Controls/ToolBar.xaml

@@ -371,7 +371,7 @@
                 <ControlTemplate TargetType="{x:Type ToolBar}">
                     <Grid x:Name="Grid" Margin="3,1,1,1" SnapsToDevicePixels="true">
                         <Grid x:Name="OverflowGrid" HorizontalAlignment="Right">
-                            <ToggleButton x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{DynamicResource ToolBarHorizontalOverflowButtonStyle}" Visibility="{Binding ElementName=OverflowButton, Path=IsEnabled, Converter={DynamicResource BoolToVisibility}}"/>
+                            <ToggleButton x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{DynamicResource ToolBarHorizontalOverflowButtonStyle}" Visibility="{Binding ElementName=OverflowButton, Path=IsEnabled, Converter={StaticResource BoolToVisibility}}"/>
                             <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false">
                                 <themes:SystemDropShadowChrome x:Name="Shdw" Color="Transparent">
                                     <Border x:Name="ToolBarSubMenuBorder" BorderBrush="{DynamicResource ToolBarMenuBorderBrush}" BorderThickness="1" Background="{DynamicResource ToolBarSubMenuBackgroundBrush}" RenderOptions.ClearTypeHint="Enabled">
@@ -455,7 +455,7 @@
         <Setter Property="ToolTip" Value="{Binding ToolTip}" />
         <Setter Property="ToolTipService.InitialShowDelay" Value="500" />
         <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-        <Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={DynamicResource BooleanToDimmed}}" />
+        <Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding IsObsolete}" Value="True">
                 <Setter Property="Foreground" Value="{DynamicResource CaptionDisabledColor}" />