Skip to content

Commit fb2e545

Browse files
IvenBachIvenBach
committed
Convert images to resources
1 parent 5916a4a commit fb2e545

File tree

7 files changed

+57
-25
lines changed

7 files changed

+57
-25
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
d:DesignHeight="300" d:DesignWidth="300">
1010
<UserControl.Resources>
1111
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
12+
13+
<BitmapImage x:Key="InvalidEntryImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
1214
</UserControl.Resources>
1315
<Grid>
1416
<Grid.RowDefinitions>
@@ -49,7 +51,7 @@
4951
VerticalContentAlignment="Center"
5052
Text="{Binding PropertyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
5153
<Image Grid.Row="1"
52-
Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
54+
Source="{StaticResource InvalidEntryImage}"
5355
Height="16"
5456
Margin="0,-10,-8,0"
5557
HorizontalAlignment="Right"
@@ -69,7 +71,7 @@
6971
VerticalContentAlignment="Center"
7072
Text="{Binding ParameterName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
7173
<Image Grid.Row="1"
72-
Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
74+
Source="{StaticResource InvalidEntryImage}"
7375
Height="16"
7476
Margin="0,-10,-8,0"
7577
HorizontalAlignment="Right"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
</MultiTrigger>
5353
</Style.Triggers>
5454
</Style>
55+
56+
<BitmapImage x:Key="InvalidInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
5557
</UserControl.Resources>
5658
<Grid>
5759
<Grid.RowDefinitions>
@@ -78,7 +80,7 @@
7880
VerticalContentAlignment="Center"
7981
Text="{Binding InterfaceName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
8082
<Image Grid.Row="1"
81-
Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
83+
Source="{StaticResource InvalidInterfaceImage}"
8284
Height="16"
8385
Margin="0,-10,-8,0"
8486
HorizontalAlignment="Right"

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<converters:InvertBoolValueConverter x:Key="InvertedBool" />
1313
<removeParameters:ParameterTextDecorationConverter x:Key="ParameterTextDecoration" />
1414

15+
<BitmapImage x:Key="RemoveParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
16+
<BitmapImage x:Key="RestoreParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" />
17+
1518
<Style x:Key="FocusVisual">
1619
<Setter Property="Control.Template">
1720
<Setter.Value>
@@ -139,7 +142,7 @@
139142
Command="{Binding RemoveParameterCommand}"
140143
CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
141144
<StackPanel Orientation="Horizontal">
142-
<Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" Margin="0,0,5,0" />
145+
<Image Height="10" Source="{StaticResource RemoveParameterImage" Margin="0,0,5,0" />
143146
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Remove}" />
144147
</StackPanel>
145148
</Button>
@@ -152,7 +155,7 @@
152155
Command="{Binding RestoreParameterCommand}"
153156
CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
154157
<StackPanel Orientation="Horizontal">
155-
<Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" Margin="0,0,5,0" />
158+
<Image Height="10" Source="{StaticResource RestoreParameterImage}" Margin="0,0,5,0" />
156159
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Restore}" />
157160
</StackPanel>
158161
</Button>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
d:DesignHeight="300" d:DesignWidth="300">
99
<UserControl.Resources>
1010
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
11+
12+
<BitmapImage x:Key="InvalidNameImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
1113
</UserControl.Resources>
1214
<Grid>
1315
<Grid.RowDefinitions>
@@ -35,7 +37,7 @@
3537
VerticalContentAlignment="Center"
3638
HorizontalAlignment="Stretch" />
3739
<Image Grid.Column="1"
38-
Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png"
40+
Source="{StaticResource InvalidNameImage}"
3941
Height="16"
4042
Margin="0,-8,-8,0"
4143
HorizontalAlignment="Right"

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<reorderParameters:IndexIsNotZeroConverter x:Key="IndexIsNotZero" />
1212
<reorderParameters:IndexIsNotLastConverter x:Key="IndexIsNotLast" />
1313

14+
<BitmapImage x:Key="MoveUpImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-090.png" />
15+
<BitmapImage x:Key="MoveDownImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-270.png" />
16+
1417
<Style x:Key="FocusVisual">
1518
<Setter Property="Control.Template">
1619
<Setter.Value>
@@ -141,7 +144,7 @@
141144
Command="{Binding MoveParameterUpCommand}"
142145
CommandParameter="{Binding ElementName=ParameterGrid, Path=SelectedItem}">
143146
<StackPanel Orientation="Horizontal">
144-
<Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-090.png" Margin="0,0,5,0" />
147+
<Image Source="{StaticResource MoveUpImage}" />
145148
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_MoveUpButtonText}" />
146149
</StackPanel>
147150
</Button>
@@ -165,7 +168,7 @@
165168
</Style>
166169
</Button.Style>
167170
<StackPanel Orientation="Horizontal">
168-
<Image Height="10" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-270.png" Margin="0,0,5,0" />
171+
<Image Source="{StaticResource MoveDownImage}" />
169172
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=ReorderParamsDialog_MoveDownButtonText}" />
170173
</StackPanel>
171174
</Button>

‎Rubberduck.Core/UI/ToDoItems/ToDoExplorerControl.xaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
2020
<BitmapImage x:Key="DeleteImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
2121
<BitmapImage x:Key="SettingsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/gear.png" />
22+
<BitmapImage x:Key="GroupByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
23+
<BitmapImage x:Key="CopyResultsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
2224

2325
<LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
2426
<GradientStop Color="#FFD9F4FF" Offset="0"/>
@@ -488,7 +490,7 @@
488490
<Menu>
489491
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
490492
<MenuItem.Icon>
491-
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
493+
<Image Height="16" Source="{StaticResource GroupByImage}" />
492494
</MenuItem.Icon>
493495

494496
<MenuItem x:Name="GroupByMarker"
@@ -512,7 +514,7 @@
512514
</MenuItem>
513515
</Menu>
514516
<Button Command="{Binding CopyResultsCommand}">
515-
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
517+
<Image Height="16" Source="{StaticResource CopyResultsImage}" />
516518
<Button.ToolTip>
517519
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.ToDoExplorer.ToDoExplorerUI, Key=ToDoExplorer_CopyToolTip}" />
518520
</Button.ToolTip>

‎Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,24 @@
1616

1717
<UserControl.Resources>
1818
<BitmapImage x:Key="SettingsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/gear.png" />
19+
20+
<BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
21+
<BitmapImage x:Key="RunImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/control.png" />
22+
<BitmapImage x:Key="RunAllTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
23+
<BitmapImage x:Key="RunNotRunTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/question-white.png" />
24+
<BitmapImage x:Key="RunSelectedTestImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
25+
<BitmapImage x:Key="RunSelectedCategoryImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
26+
<BitmapImage x:Key="RunInconclusiveTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
27+
<BitmapImage x:Key="RunPassedTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/tick-circle.png" />
28+
<BitmapImage x:Key="RunFailedTestsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
29+
<BitmapImage x:Key="RepeatLastRunImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-repeat.png" />
30+
31+
<BitmapImage x:Key="AddIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--plus.png" />
32+
<BitmapImage x:Key="AddTestMethodIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask.png" />
33+
<BitmapImage x:Key="AddErrorTestMethodIcon" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
34+
35+
<BitmapImage x:Key="GroupByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
36+
<BitmapImage x:Key="CopyResultsImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
1937

2038
<local:TestOutcomeImageSourceConverter x:Key="OutcomeIconConverter" />
2139
<local:TestResultToOutcomeTextConverter x:Key="OutcomeTextConverter" />
@@ -488,74 +506,74 @@
488506
</ToolBar.Resources>
489507

490508
<Button Command="{Binding RefreshCommand}">
491-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
509+
<Image Source="{StaticResource RefreshImage}" />
492510
</Button>
493511

494512
<Separator />
495513
<Menu>
496514
<MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunButtonText}">
497515
<MenuItem.Icon>
498-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/control.png" />
516+
<Image Source="{StaticResource RunImage}" />
499517
</MenuItem.Icon>
500518
<MenuItem Command="{Binding RunAllTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunAllTests}">
501519
<MenuItem.Icon>
502-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
520+
<Image Source="{StaticResource RunAllTestsImage}" />
503521
</MenuItem.Icon>
504522
</MenuItem>
505523
<Separator />
506524
<MenuItem Command="{Binding RunNotExecutedTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunNotRunTests}" >
507525
<MenuItem.Icon>
508-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/question-white.png" />
526+
<Image Source="{StaticResource RunNotRunTestsImage}" />
509527
</MenuItem.Icon>
510528
</MenuItem>
511529
<MenuItem Command="{Binding RunSelectedTestCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedTests}" >
512530
<MenuItem.Icon>
513-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
531+
<Image Source="{StaticResource RunSelectedTestImage}" />
514532
</MenuItem.Icon>
515533
</MenuItem>
516534
<MenuItem Command="{Binding RunSelectedCategoryTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer ,Key=TestExplorer_RunSelectedCategoryTests}" >
517535
<MenuItem.Icon>
518-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--arrow.png" />
536+
<Image Source="{StaticResource RunSelectedCategoryImage}" />
519537
</MenuItem.Icon>
520538
</MenuItem>
521539
<MenuItem Command="{Binding RunInconclusiveTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunInconclusiveTests}" >
522540
<MenuItem.Icon>
523-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
541+
<Image Source="{StaticResource RunInconclusiveTestsImage}" />
524542
</MenuItem.Icon>
525543
</MenuItem>
526544
<MenuItem Command="{Binding RunPassedTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunPassedTests}" >
527545
<MenuItem.Icon>
528-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/tick-circle.png" />
546+
<Image Source="{StaticResource RunPassedTestsImage}" />
529547
</MenuItem.Icon>
530548
</MenuItem>
531549
<MenuItem Command="{Binding RunFailedTestsCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunFailedTests}">
532550
<MenuItem.Icon>
533-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
551+
<Image Source="{StaticResource RunFailedTestsImage}" />
534552
</MenuItem.Icon>
535553
</MenuItem>
536554
<Separator />
537555
<MenuItem Command="{Binding RepeatLastRunCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_RunLastRunTests}">
538556
<MenuItem.Icon>
539-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-repeat.png" />
557+
<Image Source="{StaticResource RepeatLastRunImage}" />
540558
</MenuItem.Icon>
541559
</MenuItem>
542560

543561
</MenuItem>
544562
<MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}">
545563
<MenuItem.Icon>
546-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--plus.png" />
564+
<Image Source="{StaticResource AddIcon}" />
547565
</MenuItem.Icon>
548566
<MenuItem Command="{Binding AddTestModuleCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_AddTestModule}">
549567
</MenuItem>
550568
<Separator />
551569
<MenuItem Command="{Binding AddTestMethodCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_AddTestMethod}">
552570
<MenuItem.Icon>
553-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask.png" />
571+
<Image Source="{StaticResource AddTestMethodIcon}" />
554572
</MenuItem.Icon>
555573
</MenuItem>
556574
<MenuItem Command="{Binding AddErrorTestMethodCommand}" Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_AddExpectedErrorTestMethod}">
557575
<MenuItem.Icon>
558-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/flask--exclamation.png" />
576+
<Image Source="{StaticResource AddErrorTestMethodIcon}" />
559577
</MenuItem.Icon>
560578
</MenuItem>
561579
</MenuItem>
@@ -565,7 +583,7 @@
565583
<Menu>
566584
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
567585
<MenuItem.Icon>
568-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
586+
<Image Source="{StaticResource GroupByImage}" />
569587
</MenuItem.Icon>
570588

571589
<MenuItem x:Name="GroupByOutcome"
@@ -599,7 +617,7 @@
599617
</Menu>
600618

601619
<Button Command="{Binding CopyResultsCommand}">
602-
<Image Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png" />
620+
<Image Source="{StaticResource CopyResultsImage}" />
603621
<Button.ToolTip>
604622
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_CopyToolTip}" />
605623
</Button.ToolTip>

0 commit comments

Comments
 (0)