Skip to content

Commit a830af6

Browse files
IvenBachIvenBach
committed
Consolidate image resources
1 parent 24729b6 commit a830af6

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

‎Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333
<BitmapImage x:Key="AddUserDocumentImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/AddUserDocument.png" />
3434
<BitmapImage x:Key="AddTestModuleImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ListOfTests.png" />
3535
<BitmapImage x:Key="SearchImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/magnifier-medium.png" />
36+
<BitmapImage x:Key="OpenDesignerImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ProjectForm.png" />
37+
<BitmapImage x:Key="AddModuleImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
38+
<BitmapImage x:Key="FindImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/magnifier--arrow.png" />
39+
<BitmapImage x:Key="RemoveImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/minus-circle.png" />
40+
<BitmapImage x:Key="SortImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/edit-list-order.png" />
41+
<BitmapImage x:Key="ShowSignaturesImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/DisplayFullSignature.png" />
42+
<BitmapImage x:Key="CopyResultsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
3643

3744
<BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
3845
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
@@ -156,7 +163,7 @@
156163
CommandParameter="{Binding SelectedItem}"
157164
Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
158165
<MenuItem.Icon>
159-
<Image Style="{StaticResource IconStyle}" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ProjectForm.png" />
166+
<Image Style="{StaticResource IconStyle}" Source="{StaticResource OpenDesignerImage}" />
160167
</MenuItem.Icon>
161168
</MenuItem>
162169
<Separator />
@@ -180,7 +187,7 @@
180187
<Separator />
181188
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddModule}">
182189
<MenuItem.Icon>
183-
<Image Style="{StaticResource IconStyle}" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
190+
<Image Style="{StaticResource IconStyle}" Source="{StaticResource AddModuleImage}" />
184191
</MenuItem.Icon>
185192
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddVBFormText}"
186193
Command="{Binding AddVBFormCommand}"
@@ -262,7 +269,7 @@
262269
</MenuItem>
263270
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Find}">
264271
<MenuItem.Icon>
265-
<Image Style="{StaticResource IconStyle}" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/magnifier--arrow.png" />
272+
<Image Style="{StaticResource IconStyle}" Source="{StaticResource FindImage}" />
266273
</MenuItem.Icon>
267274
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_FindAllReferencesText}"
268275
Command="{Binding FindAllReferencesCommand}"
@@ -307,7 +314,7 @@
307314
CommandParameter="{Binding SelectedItem}"
308315
Visibility="{Binding VBAVisibility}">
309316
<MenuItem.Icon>
310-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/minus-circle.png">
317+
<Image Source="{StaticResource RemoveImage}">
311318
<Image.Style>
312319
<Style BasedOn="{StaticResource IconStyle}" TargetType="Image">
313320
<Style.Triggers>
@@ -427,7 +434,7 @@
427434
<ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
428435

429436
<Button Command="{Binding RefreshCommand}">
430-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png">
437+
<Image Source="{StaticResource RefreshImage}">
431438
<Image.Style>
432439
<Style BasedOn="{StaticResource IconStyle}" TargetType="Image">
433440
<Style.Triggers>
@@ -449,7 +456,7 @@
449456
VerticalContentAlignment="Center" >
450457
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Add}" VerticalContentAlignment="Center">
451458
<MenuItem.Icon>
452-
<Image Style="{StaticResource IconStyle}" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
459+
<Image Style="{StaticResource IconStyle}" Source="{StaticResource AddModuleImage}" />
453460
</MenuItem.Icon>
454461
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddVBFormText}"
455462
Command="{Binding AddVBFormCommand}"
@@ -530,7 +537,7 @@
530537
<MenuItem Style="{StaticResource fontSizeStyle}"
531538
Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Sort}" VerticalContentAlignment="Center">
532539
<MenuItem.Icon>
533-
<Image Style="{StaticResource IconStyle}" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/edit-list-order.png" />
540+
<Image Style="{StaticResource IconStyle}" Source="{StaticResource SortImage}" />
534541
</MenuItem.Icon>
535542

536543
<MenuItem Name="SortByName"
@@ -558,13 +565,13 @@
558565
</Menu>
559566

560567
<ToggleButton Name="DisplaySignatures" ToolTip="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_ShowSignaturesToolTip}" IsChecked="True">
561-
<Image Style="{StaticResource IconStyle}" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/DisplayFullSignature.png" />
568+
<Image Style="{StaticResource IconStyle}" Source="{StaticResource ShowSignaturesImage}" />
562569
</ToggleButton>
563570

564571
<Separator />
565572

566573
<Button Command="{Binding OpenDesignerCommand}" CommandParameter="{Binding SelectedItem}">
567-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ProjectForm.png">
574+
<Image Source="{StaticResource OpenDesignerImage}">
568575
<Image.Style>
569576
<Style BasedOn="{StaticResource IconStyle}" TargetType="Image">
570577
<Style.Triggers>
@@ -583,7 +590,7 @@
583590
<Separator />
584591

585592
<Button Command="{Binding CopyResultsCommand}" CommandParameter="{Binding ElementName=ProjectTree}">
586-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png">
593+
<Image Source="{StaticResource CopyResultsImage}">
587594
<Image.Style>
588595
<Style BasedOn="{StaticResource IconStyle}" TargetType="Image">
589596
<Style.Triggers>
@@ -648,6 +655,7 @@
648655
Style="{StaticResource CodeExplorerTreeViewStyle}" BorderThickness="0,1"
649656
VirtualizingPanel.IsVirtualizing="False"
650657
Visibility="{Binding Path=TreeViewVisibility}">
658+
651659
<i:Interaction.Behaviors>
652660
<controls:BindableSelectedItemBehavior SelectedItem="{Binding SelectedItem, Mode=TwoWay}" />
653661
</i:Interaction.Behaviors>

0 commit comments

Comments
 (0)