revert 9494f3d

Author: retailcoder

Rubberduck.Core/UI/Refactorings/AnnotateDeclaration/AnnotateDeclarationView.xaml

@@ -43,13 +43,13 @@
                 <annotations:AnnotationArgumentType>Boolean</annotations:AnnotationArgumentType>
                 <annotations:AnnotationArgumentType>Inspection</annotations:AnnotationArgumentType>
             </x:Array>
-            <converters:SpecificValuesToVisibilityConverter SpecialValues="{DynamicResource NonDefaultInputArgumentTypes}" CollapseSpecialValues="True" x:Key="DefaultArgumentVisibilityConverter"/>
+            <converters:SpecificValuesToVisibilityConverter SpecialValues="{StaticResource NonDefaultInputArgumentTypes}" CollapseSpecialValues="True" x:Key="DefaultArgumentVisibilityConverter"/>
             <converters:SpecificValueToVisibilityConverter SpecialValue="{x:Static annotations:AnnotationArgumentType.Boolean}" CollapseSpecialValue="False" x:Key="BooleanArgumentVisibilityConverter"/>
             <converters:SpecificValueToVisibilityConverter SpecialValue="{x:Static annotations:AnnotationArgumentType.Inspection}" CollapseSpecialValue="False" x:Key="InspectionArgumentVisibilityConverter"/>
             <DataTemplate DataType="{x:Type local:IAnnotationArgumentViewModel}" x:Key="ArgumentValueTemplate">
                 <StackPanel VerticalAlignment="Center">
                     <TextBox Text="{Binding ArgumentValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
-                             Style="{DynamicResource TextBoxErrorStyle}"
+                             Style="{StaticResource TextBoxErrorStyle}"
                              HorizontalAlignment="Stretch"
                              VerticalAlignment="Stretch"
                              Visibility="{Binding ArgumentType, Converter={StaticResource DefaultArgumentVisibilityConverter}}">
@@ -82,7 +82,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_TitleText}" FontWeight="Bold"/>
             <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_Instructions}" Margin="5,0,0,10" TextWrapping="Wrap" />
         </StackPanel>
@@ -141,12 +141,12 @@
                   Margin="5,0,5,5">
             <DataGrid.Columns>
                 <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_ArgumentTypeHeader}"
-                                        CellTemplateSelector="{DynamicResource AnnotationArgumentTypeCellDataTemplateSelector}"
-                                        CellEditingTemplateSelector="{DynamicResource AnnotationArgumentTypeCellDataTemplateSelector}"
+                                        CellTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
+                                        CellEditingTemplateSelector="{StaticResource AnnotationArgumentTypeCellDataTemplateSelector}"
                                         Width="Auto"/>
                 <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=AnnotateDeclarationDialog_ArgumentValueHeader}"
-                                        CellTemplate="{DynamicResource ArgumentValueTemplate}"
-                                        CellEditingTemplate="{DynamicResource ArgumentValueTemplate}"
+                                        CellTemplate="{StaticResource ArgumentValueTemplate}"
+                                        CellEditingTemplate="{StaticResource ArgumentValueTemplate}"
                                         Width="*"/>
             </DataGrid.Columns>
         </DataGrid>

Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml

@@ -17,7 +17,7 @@
 	        <converters:BoolToVisibleVisibilityConverter x:Key="BoolToVisibleVisibility" />
 	        <BitmapImage x:Key="InvalidNameImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
 	        <Style TargetType="Image" x:Key="InvalidNameIconStyle">
-	            <Setter Property="Source" Value="{DynamicResource InvalidNameImage}" />
+	            <Setter Property="Source" Value="{StaticResource InvalidNameImage}" />
 	            <Setter Property="Height" Value="16" />
 	            <Setter Property="Margin" Value="0,0,-8,0" />
 	            <Setter Property="HorizontalAlignment" Value="Right" />
@@ -36,7 +36,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Grid.Row="0" Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_TitleText}"
                    FontWeight="Bold" />
             <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_InstructionText}"
@@ -84,10 +84,10 @@
                         <TextBlock Grid.Column="0" Margin="0,5"
                                    Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_MembersGroupBox}" />
                         <StackPanel Grid.Column="1" Margin="5" Orientation="Horizontal">
-                            <Button Style="{DynamicResource CommandButtonStyle}" TabIndex="2"
+                            <Button Style="{StaticResource CommandButtonStyle}" TabIndex="2"
                                     Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SelectAll_Button}"
                                     Command="{Binding SelectAllCommand}" />
-                            <Button Style="{DynamicResource CommandButtonStyle}" TabIndex="3"
+                            <Button Style="{StaticResource CommandButtonStyle}" TabIndex="3"
                                     Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=DeselectAll_Button}"
                                     Command="{Binding DeselectAllCommand}">
                             </Button>
@@ -112,7 +112,7 @@
                                             Text="{Binding TargetDeclarationExpression, Mode=OneWay}"
                                             FontWeight="Bold">
                                     </TextBlock>
-                                    <Image Style="{DynamicResource InvalidNameIconStyle}"
+                                    <Image Style="{StaticResource InvalidNameIconStyle}"
                                            Visibility="{Binding Path=HasValidEncapsulationAttributes, Converter={StaticResource BoolToHiddenVisibility}}" />
                                 </StackPanel>
                             </DataTemplate>
@@ -146,7 +146,7 @@
                                          VerticalAlignment="Center" 
                                          VerticalContentAlignment="Center"
                                          Height="22" />
-                                <Image Grid.Row="1" Style="{DynamicResource InvalidNameIconStyle}"
+                                <Image Grid.Row="1" Style="{StaticResource InvalidNameIconStyle}"
                                        Visibility="{Binding Path=SelectionHasValidEncapsulationAttributes, Converter={StaticResource BoolToHiddenVisibility}}" />
                             </Grid>
                             <CheckBox IsChecked="{Binding Path=IsReadOnly, Mode=TwoWay}"
@@ -168,7 +168,7 @@
             <StackPanel Grid.Row="3" Margin="10,5" Orientation="Horizontal">
                     <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=EncapsulateField_Preview}" 
                                FontSize="14" FontWeight="Bold" />
-                    <Image Style="{DynamicResource InvalidNameIconStyle}" Margin="0,-4"
+                    <Image Style="{StaticResource InvalidNameIconStyle}" Margin="0,-4"
                            Visibility="{Binding Path=HasValidNames, Converter={StaticResource BoolToHiddenVisibility}}" />
             </StackPanel>
             <controls:BindableTextEditor Grid.Row="4" Margin="10" BorderThickness="1"
@@ -188,12 +188,12 @@
                 </Grid.ColumnDefinitions>
                 <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=OK}"
                         Grid.Column="0"
-                        Style="{DynamicResource CommandButtonStyle}"
+                        Style="{StaticResource CommandButtonStyle}"
                         IsEnabled="{Binding IsValidInterfaceName}"
                         Command="{Binding OkButtonCommand}" />
                 <Button Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CancelButtonText}"
                         Grid.Column="1"
-                        Style="{DynamicResource CommandButtonStyle}"
+                        Style="{StaticResource CommandButtonStyle}"
                         Command="{Binding CancelButtonCommand}"/>
             </Grid>
         </Grid>

Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml

@@ -23,7 +23,7 @@
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <DockPanel Dock="Top"
-                   Background="{DynamicResource BackgroundLightBrush}">
+                   Background="{StaticResource BackgroundLightBrush}">
             <StackPanel>
                 <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=ExtractInterface_TitleLabel}" 
                        FontWeight="Bold" />
@@ -47,7 +47,7 @@
                          VerticalContentAlignment="Center"
                          Text="{Binding InterfaceName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 <Image Grid.Row="1"
-                       Source="{DynamicResource InvalidInterfaceImage}"
+                       Source="{StaticResource InvalidInterfaceImage}"
                        Height="16"
                        Margin="0,-10,-8,0"
                        HorizontalAlignment="Right"

Rubberduck.Core/UI/Refactorings/ExtractMethod/ExtractMethodView.xaml

@@ -94,7 +94,7 @@
                         <ColumnDefinition Width="25" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <Image Source="{DynamicResource WarningIcon}"
+                    <Image Source="{StaticResource WarningIcon}"
                            Height="16"
                            Margin="5"
                            VerticalAlignment="Top" />

Rubberduck.Core/UI/Refactorings/MoveCloserToUsage/MoveCloserToUsageView.xaml

@@ -19,7 +19,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=MoveCloserToUsageDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>

Rubberduck.Core/UI/Refactorings/MoveFolder/MoveMultipleFoldersView.xaml

@@ -19,7 +19,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=MoveFoldersDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
@@ -33,7 +33,7 @@
                        Margin="0,0,5,0" />
             <TextBox Name="MoveToFolderTextBox"
                      Grid.Column="1"
-                     Style="{DynamicResource TextBoxErrorStyle}"
+                     Style="{StaticResource TextBoxErrorStyle}"
                      Text="{Binding NewFolder, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                      Height="22"
                      VerticalAlignment="Top"

Rubberduck.Core/UI/Refactorings/MoveToFolder/MoveMultipleToFolderView.xaml

@@ -19,7 +19,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=MoveToFolderDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
@@ -33,7 +33,7 @@
                        Margin="0,0,5,0" />
             <TextBox Name="MoveToFolderTextBox"
                      Grid.Column="1"
-                     Style="{DynamicResource TextBoxErrorStyle}"
+                     Style="{StaticResource TextBoxErrorStyle}"
                      Text="{Binding NewFolder, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                      Height="22"
                      VerticalAlignment="Top"

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml

@@ -31,7 +31,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RemoveParamsDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RemoveParamsDialog_InstructionsLabelText}"
                        Margin="5,0" />
@@ -84,7 +84,7 @@
                         Command="{Binding RemoveParameterCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="{DynamicResource RemoveParameterImage}" />
+                        <Image Source="{StaticResource RemoveParameterImage}" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" />
                     </StackPanel>
                 </Button>
@@ -93,7 +93,7 @@
                         Command="{Binding RestoreParameterCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="{DynamicResource RestoreParameterImage}" />
+                        <Image Source="{StaticResource RestoreParameterImage}" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Restore}" />
                     </StackPanel>
                 </Button>
@@ -102,8 +102,8 @@
             <Expander Grid.Row="1"
                       Grid.ColumnSpan="2"
                       IsExpanded="True"
-                      Background="{DynamicResource ExpanderBackgroundBrush}"
-                      BorderBrush="{DynamicResource ExpanderBorderBrush}"
+                      Background="{StaticResource ExpanderBackgroundBrush}"
+                      BorderBrush="{StaticResource ExpanderBorderBrush}"
                       Margin="5,0,5,5">
                 <Expander.Header>
                     <Label FontWeight="SemiBold">

Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml

@@ -19,7 +19,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RenameDialog_TitleText}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
@@ -32,7 +32,7 @@
                        VerticalAlignment="Top"
                        Margin="0,0,5,0" />
             <TextBox Name="RenameTextBox"
-                     Style="{DynamicResource TextBoxErrorStyle}"
+                     Style="{StaticResource TextBoxErrorStyle}"
                      Grid.Column="1"
                      Text="{Binding NewName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                      Height="22"

Rubberduck.Core/UI/Refactorings/RenameFolder/RenameFolderView.xaml

@@ -19,7 +19,7 @@
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
-        <StackPanel Background="{DynamicResource BackgroundLightBrush}">
+        <StackPanel Background="{StaticResource BackgroundLightBrush}">
             <Label Content="{Resx ResxName=Rubberduck.Refactorings.RefactoringsUI, Key=RenameDialog_TitleText_Folder}" FontWeight="Bold" />
             <TextBlock Text="{Binding Instructions}" Margin="5,0" />
         </StackPanel>
@@ -33,7 +33,7 @@
                        Margin="0,0,5,0" />
             <TextBox Name="RenameFolderTextBox"
                      Grid.Column="1"
-                     Style="{DynamicResource TextBoxErrorStyle}"
+                     Style="{StaticResource TextBoxErrorStyle}"
                      Text="{Binding NewFolderName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                      Height="22"
                      VerticalAlignment="Center"