|
23 | 23 | <codeInspections:InspectionImageSourceConverter x:Key="InspectionIconConverter" />
|
24 | 24 | <codeInspections:InspectionTypeConverter x:Key="InspectionTypeConverter" />
|
25 | 25 |
|
26 |
| - <Style x:Key="IconStyle" TargetType="Image"> |
27 |
| - <Setter Property="Height" Value="16" /> |
28 |
| - <Setter Property="Width" Value="16" /> |
| 26 | + <Style x:Key="IconMargin" TargetType="Image"> |
29 | 27 | <Setter Property="Margin" Value="4" />
|
30 | 28 | </Style>
|
31 | 29 |
|
|
50 | 48 |
|
51 | 49 | <BitmapImage x:Key="GroupByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/GroupBy.png" />
|
52 | 50 |
|
53 |
| - <BitmapImage x:Key="FilterByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/DisplayName.png" /> |
| 51 | + <BitmapImage x:Key="FilterByImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/Funnel.png" /> |
54 | 52 | <BitmapImage x:Key="FilterByHintImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/information-white.png" />
|
55 | 53 | <BitmapImage x:Key="FilterBySuggestionImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/information.png" />
|
56 | 54 | <BitmapImage x:Key="FilterByWarningImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/exclamation.png" />
|
57 | 55 | <BitmapImage x:Key="FilterByErrorImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
|
| 56 | + |
| 57 | + <Style TargetType="Image"> |
| 58 | + <Setter Property="Height" Value="16"/> |
| 59 | + <Setter Property="Width" Value="16" /> |
| 60 | + </Style> |
| 61 | + |
58 | 62 | </ResourceDictionary>
|
59 | 63 | </UserControl.Resources>
|
60 | 64 |
|
|
70 | 74 | <ToolBar Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
|
71 | 75 |
|
72 | 76 | <Button Command="{Binding RefreshCommand}">
|
73 |
| - <Image Height="16" Source="{StaticResource RefreshImage}" /> |
| 77 | + <Image Source="{StaticResource RefreshImage}" /> |
74 | 78 | </Button>
|
75 | 79 |
|
76 | 80 | <Separator />
|
|
79 | 83 | Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Fix}"
|
80 | 84 | ItemsSource="{Binding QuickFixes}">
|
81 | 85 | <MenuItem.Icon>
|
82 |
| - <Image Height="16" Source="{StaticResource FixImage}" /> |
| 86 | + <Image Source="{StaticResource FixImage}" /> |
83 | 87 | </MenuItem.Icon>
|
84 | 88 | <MenuItem.ItemContainerStyle>
|
85 | 89 | <Style TargetType="{x:Type MenuItem}">
|
|
94 | 98 | <Menu>
|
95 | 99 | <MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalAlignment="Center">
|
96 | 100 | <MenuItem.Icon>
|
97 |
| - <Image Height="16" Source="{StaticResource GroupByImage}" /> |
| 101 | + <Image Source="{StaticResource GroupByImage}" /> |
98 | 102 | </MenuItem.Icon>
|
99 | 103 |
|
100 | 104 | <MenuItem x:Name="GroupByInspectionType"
|
|
175 | 179 | <Separator />
|
176 | 180 |
|
177 | 181 | <Button Command="{Binding CopyResultsCommand}">
|
178 |
| - <Image Height="16" Source="{StaticResource CopyResultsImage}" /> |
| 182 | + <Image Source="{StaticResource CopyResultsImage}" /> |
179 | 183 | <Button.ToolTip>
|
180 | 184 | <TextBlock Text="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_CopyToolTip}" />
|
181 | 185 | </Button.ToolTip>
|
182 | 186 | </Button>
|
183 | 187 | <Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Settings}" Command="{Binding OpenInspectionSettings}" BorderThickness="0" Background="Transparent">
|
184 |
| - <Image Height="16" Source="{StaticResource SettingsImage}" /> |
| 188 | + <Image Source="{StaticResource SettingsImage}" /> |
185 | 189 | </Button>
|
186 | 190 | </ToolBar>
|
187 | 191 | </ToolBarTray>
|
|
197 | 201 | <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Type}" SortDirection="{Binding}">
|
198 | 202 | <DataGridTemplateColumn.CellTemplate>
|
199 | 203 | <DataTemplate DataType="abstract1:IInspectionResult">
|
200 |
| - <Image Source="{Binding Inspection, Converter={StaticResource InspectionIconConverter}}" Height="16" /> |
| 204 | + <Image Source="{Binding Inspection, Converter={StaticResource InspectionIconConverter}}" /> |
201 | 205 | </DataTemplate>
|
202 | 206 | </DataGridTemplateColumn.CellTemplate>
|
203 | 207 | </DataGridTemplateColumn>
|
|
216 | 220 | <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Type}">
|
217 | 221 | <DataGridTemplateColumn.CellTemplate>
|
218 | 222 | <DataTemplate DataType="abstract1:IInspectionResult">
|
219 |
| - <Image Source="{Binding Inspection, Converter={StaticResource InspectionIconConverter}}" Height="16" /> |
| 223 | + <Image Source="{Binding Inspection, Converter={StaticResource InspectionIconConverter}}" /> |
220 | 224 | </DataTemplate>
|
221 | 225 | </DataGridTemplateColumn.CellTemplate>
|
222 | 226 | </DataGridTemplateColumn>
|
|
240 | 244 | <ColumnDefinition Width="25" />
|
241 | 245 | <ColumnDefinition />
|
242 | 246 | </Grid.ColumnDefinitions>
|
243 |
| - <Image Style="{StaticResource IconStyle}" VerticalAlignment="Top" Grid.Column="0" |
| 247 | + <Image Style="{StaticResource IconMargin}" VerticalAlignment="Top" Grid.Column="0" |
244 | 248 | Source="{Binding SelectedItem.Inspection.Severity, Converter={StaticResource SeverityIconConverter}}"/>
|
245 | 249 | <TextBlock Grid.Column="1" Margin="4" Text="{Binding SelectedItem.Inspection.Description}" FontWeight="Bold" TextWrapping="WrapWithOverflow"/>
|
246 | 250 | </Grid>
|
|
0 commit comments