Convert images to resources

rubberduck-vba · Nov 13, 2018 · ec75efb · ec75efb
1 parent 5916a4a
commit ec75efb
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 25 deletions.
diff --git a/Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml b/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"

diff --git a/Rubberduck.Core/UI/Refactorings/ExtractInterface/ExtractInterfaceView.xaml b/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>
@@ -78,7 +80,7 @@
                          VerticalContentAlignment="Center"
                          Text="{Binding InterfaceName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 <Image Grid.Row="1"
-                       Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
+                       Source="{StaticResource InvalidInterfaceImage}"
                        Height="16"
                        Margin="0,-10,-8,0"
                        HorizontalAlignment="Right"

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml b/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>

diff --git a/Rubberduck.Core/UI/Refactorings/Rename/RenameView.xaml b/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"

diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml b/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>

diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml
@@ -19,6 +19,8 @@
         <BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
         <BitmapImage x:Key="DeleteImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
         <BitmapImage x:Key="SettingsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/gear.png" />
+        <BitmapImage x:Key="GroupByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
+        <BitmapImage x:Key="CopyResultsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
 
         <LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
             <GradientStop Color="#FFD9F4FF" Offset="0"/>
@@ -488,7 +490,7 @@
                 <Menu>
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
                         <MenuItem.Icon>
-                            <Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
+                            <Image Height="16" Source="{StaticResource GroupByImage}" />
                         </MenuItem.Icon>
 
                         <MenuItem x:Name="GroupByMarker"
@@ -512,7 +514,7 @@
                     </MenuItem>
                 </Menu>
                 <Button Command="{Binding CopyResultsCommand}">
-                    <Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
+                    <Image Height="16" Source="{StaticResource CopyResultsImage}" />
                     <Button.ToolTip>
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI, Key=ToDoExplorer_CopyToolTip}" />
                     </Button.ToolTip>

diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml b/Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml
@@ -16,6 +16,24 @@
 
     <UserControl.Resources>
         <BitmapImage x:Key="SettingsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/gear.png" />
+
+        <BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
+        <BitmapImage x:Key="RunImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/control.png" />
+        <BitmapImage x:Key="RunAllTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
+        <BitmapImage x:Key="RunNotRunTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/question-white.png" />
+        <BitmapImage x:Key="RunSelectedTestImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
+        <BitmapImage x:Key="RunSelectedCategoryImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
+        <BitmapImage x:Key="RunInconclusiveTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
+        <BitmapImage x:Key="RunPassedTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/tick-circle.png" />
+        <BitmapImage x:Key="RunFailedTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
+        <BitmapImage x:Key="RepeatLastRunImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-repeat.png" />
+
+        <BitmapImage x:Key="AddIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--plus.png" />
+        <BitmapImage x:Key="AddTestMethodIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask.png" />
+        <BitmapImage x:Key="AddErrorTestMethodIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
+
+        <BitmapImage x:Key="GroupByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
+        <BitmapImage x:Key="CopyResultsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
 
         <local:TestOutcomeImageSourceConverter x:Key="OutcomeIconConverter" />
         <local:TestResultToOutcomeTextConverter x:Key="OutcomeTextConverter" />
@@ -488,74 +506,74 @@
                 </ToolBar.Resources>
 
                 <Button Command="{Binding RefreshCommand}">
-                    <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
+                    <Image Source="{StaticResource RefreshImage}" />
                 </Button>
 
                 <Separator />
                 <Menu>
                     <MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunButtonText}">
                         <MenuItem.Icon>
-                            <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/control.png" />
+                            <Image Source="{StaticResource RunImage}" />
                         </MenuItem.Icon>
                         <MenuItem Command="{Binding RunAllTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunAllTests}">
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
+                                <Image Source="{StaticResource RunAllTestsImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator />
                         <MenuItem Command="{Binding RunNotExecutedTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunNotRunTests}" >
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/question-white.png" />
+                                <Image Source="{StaticResource RunNotRunTestsImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Command="{Binding RunSelectedTestCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedTests}" >
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
+                                <Image Source="{StaticResource RunSelectedTestImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Command="{Binding RunSelectedCategoryTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedCategoryTests}" >
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
+                                <Image Source="{StaticResource RunSelectedCategoryImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Command="{Binding RunInconclusiveTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunInconclusiveTests}" >
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
+                                <Image Source="{StaticResource RunInconclusiveTestsImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Command="{Binding RunPassedTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunPassedTests}" >
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/tick-circle.png" />
+                                <Image Source="{StaticResource RunPassedTestsImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Command="{Binding RunFailedTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunFailedTests}">
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
+                                <Image Source="{StaticResource RunFailedTestsImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator />
                         <MenuItem Command="{Binding RepeatLastRunCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunLastRunTests}">
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-repeat.png" />
+                                <Image Source="{StaticResource RepeatLastRunImage}" />
                             </MenuItem.Icon>
                         </MenuItem>
 
                     </MenuItem>
                     <MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}">
                         <MenuItem.Icon>
-                            <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--plus.png" />
+                            <Image Source="{StaticResource AddIcon}" />
                         </MenuItem.Icon>
                         <MenuItem Command="{Binding AddTestModuleCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_AddTestModule}">
                         </MenuItem>
                         <Separator />
                         <MenuItem Command="{Binding AddTestMethodCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_AddTestMethod}">
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask.png" />
+                                <Image Source="{StaticResource AddTestMethodIcon}" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Command="{Binding AddErrorTestMethodCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_AddExpectedErrorTestMethod}">
                             <MenuItem.Icon>
-                                <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
+                                <Image Source="{StaticResource AddErrorTestMethodIcon}" />
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
@@ -565,7 +583,7 @@
                 <Menu>
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
                         <MenuItem.Icon>
-                            <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
+                            <Image Source="{StaticResource GroupByImage}" />
                         </MenuItem.Icon>
 
                         <MenuItem x:Name="GroupByOutcome"
@@ -599,7 +617,7 @@
                 </Menu>
 
                 <Button Command="{Binding CopyResultsCommand}">
-                    <Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
+                    <Image Source="{StaticResource CopyResultsImage}" />
                     <Button.ToolTip>
                         <TextBlock Text="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_CopyToolTip}" />
                     </Button.ToolTip>