Merge branch 'rubberduck-vba/next' into NRE_4659

Author: BZngr

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesWindow.xaml

@@ -232,7 +232,7 @@
                                       SelectionMode="Single"
                                       ItemsSource="{Binding AvailableReferences}" 
                                       HorizontalContentAlignment="Stretch"
-                                      ScrollViewer.HorizontalScrollBarVisibility="Hidden">
+                                      ScrollViewer.HorizontalScrollBarVisibility="Auto">
                                 <ListView.ItemContainerStyle>
                                     <Style TargetType="ListViewItem">
                                         <Setter Property="Height" Value="20" />
@@ -289,7 +289,7 @@
                                       SelectedItem="{Binding SelectedReference, Mode=TwoWay}" 
                                       SelectionMode="Single"
                                       ItemsSource="{Binding ProjectReferences, NotifyOnTargetUpdated=True}" 
-                                      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                      ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                       HorizontalContentAlignment="Stretch">
                                 <ListView.ItemContainerStyle>
                                     <Style TargetType="ListViewItem">

Rubberduck.Core/UI/Controls/EmptyUIRefresh.xaml

@@ -5,14 +5,17 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
+    <UserControl.Resources>
+        <BitmapImage x:Key="DoubleArrowImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
+    </UserControl.Resources>
 
     <Border Background="AliceBlue" DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext}">
         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWithOverflow" TextAlignment="Center"
                        MinWidth="200" Visibility="{Binding EmptyUIRefreshMessageVisibility}">
             <Run FontWeight="Bold" Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=EmptyUIRefreshMessage_Title}"/><LineBreak/>
             <LineBreak/>
             <Button Command="{Binding RefreshCommand}" BorderThickness="0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
-                <Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" ClipToBounds="True" />
+                <Image Height="16" Source="{StaticResource DoubleArrowImage}" ClipToBounds="True" />
                 <Button.ToolTip>
                     <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Refresh}" />
                 </Button.ToolTip>

Rubberduck.Core/UI/FindSymbol/FindSymbolControl.xaml

@@ -13,6 +13,10 @@
                         Executed="CommandBinding_OnExecuted"
                         CanExecute="CommandBinding_OnCanExecute"/>
     </UserControl.CommandBindings>
+
+    <UserControl.Resources>
+        <BitmapImage x:Key="ArrowImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow.png" />
+    </UserControl.Resources>
 
     <Grid>
 
@@ -43,7 +47,7 @@
         </ComboBox>
 
         <Button Grid.Column="1" Command="local:FindSymbolControl.GoCommand">
-            <Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow.png" />
+            <Image Height="16" Source="{StaticResource ArrowImage}" />
         </Button>
 
     </Grid>

Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs

@@ -329,7 +329,7 @@ public void FilterResults(IEnumerable<CodeInspectionSeverity> inspections)
 
         private void OpenSettings(object param)
         {
-            using (var window = _settingsFormFactory.Create())
+            using (var window = _settingsFormFactory.Create(SettingsViews.InspectionSettings))
             {
                 window.ShowDialog();
                 _settingsFormFactory.Release(window);

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

@@ -9,6 +9,8 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
+
+        <BitmapImage x:Key="InvalidEntryImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -49,7 +51,7 @@
                                  VerticalContentAlignment="Center"
                                  Text="{Binding PropertyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                         <Image Grid.Row="1"
-                               Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
+                               Source="{StaticResource InvalidEntryImage}"
                                Height="16"
                                Margin="0,-10,-8,0"
                                HorizontalAlignment="Right"
@@ -69,7 +71,7 @@
                                  VerticalContentAlignment="Center"
                                  Text="{Binding ParameterName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                         <Image Grid.Row="1"
-                               Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
+                               Source="{StaticResource InvalidEntryImage}"
                                Height="16"
                                Margin="0,-10,-8,0"
                                HorizontalAlignment="Right"

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

@@ -52,6 +52,8 @@
                 </MultiTrigger>
             </Style.Triggers>
         </Style>
+
+        <BitmapImage x:Key="InvalidInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -79,7 +81,8 @@
                          VerticalAlignment="Top"
                          VerticalContentAlignment="Center"
                          Text="{Binding InterfaceName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
+                <Image Grid.Row="1"
+                       Source="{StaticResource InvalidInterfaceImage}"
                        Height="16"
                        Margin="0,-10,-8,0"
                        HorizontalAlignment="Right"

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

@@ -12,6 +12,9 @@
         <converters:InvertBoolValueConverter x:Key="InvertedBool" />
         <removeParameters:ParameterTextDecorationConverter x:Key="ParameterTextDecoration" />
 
+        <BitmapImage x:Key="RemoveParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
+        <BitmapImage x:Key="RestoreParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" />
+
         <Style x:Key="FocusVisual">
             <Setter Property="Control.Template">
                 <Setter.Value>
@@ -139,7 +142,7 @@
                         Command="{Binding RemoveParameterCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" Margin="0,0,5,0" />
+                        <Image Height="10" Source="{StaticResource RemoveParameterImage}" Margin="0,0,5,0" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" />
                     </StackPanel>
                 </Button>
@@ -152,7 +155,7 @@
                         Command="{Binding RestoreParameterCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" Margin="0,0,5,0" />
+                        <Image Height="10" Source="{StaticResource RestoreParameterImage}" Margin="0,0,5,0" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Restore}" />
                     </StackPanel>
                 </Button>

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

@@ -8,6 +8,8 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
+
+        <BitmapImage x:Key="InvalidNameImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -35,7 +37,7 @@
                      VerticalContentAlignment="Center"
                      HorizontalAlignment="Stretch" />
             <Image Grid.Column="1"
-                   Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
+                   Source="{StaticResource InvalidNameImage}"
                    Height="16"
                    Margin="0,-8,-8,0"
                    HorizontalAlignment="Right"

Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml

@@ -11,6 +11,9 @@
         <reorderParameters:IndexIsNotZeroConverter x:Key="IndexIsNotZero" />
         <reorderParameters:IndexIsNotLastConverter x:Key="IndexIsNotLast" />
 
+        <BitmapImage x:Key="MoveUpImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-090.png" />
+        <BitmapImage x:Key="MoveDownImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-270.png" />
+
         <Style x:Key="FocusVisual">
             <Setter Property="Control.Template">
                 <Setter.Value>
@@ -141,7 +144,7 @@
                         Command="{Binding MoveParameterUpCommand}"
                         CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
                     <StackPanel Orientation="Horizontal">
-                        <Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-090.png" Margin="0,0,5,0" />
+                        <Image Source="{StaticResource MoveUpImage}" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_MoveUpButtonText}" />
                     </StackPanel>
                 </Button>
@@ -165,7 +168,7 @@
                         </Style>
                     </Button.Style>
                     <StackPanel Orientation="Horizontal">
-                        <Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-270.png" Margin="0,0,5,0" />
+                        <Image Source="{StaticResource MoveDownImage}" />
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_MoveDownButtonText}" />
                     </StackPanel>
                 </Button>

Rubberduck.Core/UI/Settings/InspectionSettings.xaml

@@ -19,6 +19,7 @@
 
         <BitmapImage x:Key="AddImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
         <BitmapImage x:Key="DeleteImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
+        <BitmapImage x:Key="FilterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/Funnel.png" />
 
         <LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
             <GradientStop Color="#FFD9F4FF" Offset="0"/>
@@ -267,7 +268,7 @@
             <Setter Property="Background" Value="DarkGray"/>
             <Setter Property="CornerRadius" Value="5"/>
         </Style>
-        <BitmapImage x:Key="FilterIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/Funnel.png" />
+        
         <Style TargetType="ScrollViewer">
             <Style.Setters>
                 <Setter Property="settings:ScrollViewerCorrector.FixScrolling" Value="True" />
@@ -285,7 +286,7 @@
                                 Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_InspectionSeveritySettingsLabel}" />
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
                                 <Label Content="-"/>
-                                <Image Source="{StaticResource FilterIcon}" />
+                                <Image Source="{StaticResource FilterImage}" />
                                 <Label Style="{StaticResource HeaderText}"
                                        Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionSettings_FilterByDescription}" />
                                 <TextBox MinWidth="125"