Skip to content

Commit 5f4496e

Browse files
retailcoderretailcoder
committed
revert 42a4787 
1 parent f13297c commit 5f4496e

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</Setter.Value>
4949
</Setter>
5050
<Setter Property="ItemsSource" Value="{Binding Commands}" />
51-
<Setter Property="ItemContainerStyle" Value="{DynamicResource QuickFixCommandStyle}" />
51+
<Setter Property="ItemContainerStyle" Value="{StaticResource QuickFixCommandStyle}" />
5252
</Style>
5353

5454
<Style x:Key="IconMargin" TargetType="Image">
@@ -71,10 +71,10 @@
7171
<RowDefinition Height="Auto" MinHeight="48"/>
7272
</Grid.RowDefinitions>
7373

74-
<Border Grid.Row="0" Grid.RowSpan="3" Background="{DynamicResource ToolBarSubMenuBackgroundBrush}" />
74+
<Border Grid.Row="0" Grid.RowSpan="3" Background="{StaticResource ToolBarSubMenuBackgroundBrush}" />
7575

7676
<ToolBarTray Grid.Row="0" IsLocked="True">
77-
<ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
77+
<ToolBar Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
7878
<ToolBar.Resources>
7979
<codeInspections:InspectionFilterToBooleanConverter x:Key="InspectionTypeToBooleanConverter" />
8080
<codeInspections:InspectionResultGroupingToBooleanConverter x:Key="GroupingToBooleanConverter" />
@@ -100,18 +100,18 @@
100100
</ToolBar.Resources>
101101

102102
<Button Command="{Binding RefreshCommand}">
103-
<Image Source="{DynamicResource RefreshImage}" />
103+
<Image Source="{StaticResource RefreshImage}" />
104104
</Button>
105105

106106
<Separator />
107107
<Menu Background="Transparent">
108108
<MenuItem VerticalAlignment="Center"
109-
HeaderTemplate="{DynamicResource MenuItemHeaderDropdownIndicatorTemplate}"
109+
HeaderTemplate="{StaticResource MenuItemHeaderDropdownIndicatorTemplate}"
110110
ItemsSource="{Binding QuickFixes}"
111111
Background="Transparent"
112112
ItemContainerStyle="{StaticResource QuickFixItemStyle}">
113113
<MenuItem.Icon>
114-
<Image Source="{DynamicResource FixImage}" />
114+
<Image Source="{StaticResource FixImage}" />
115115
</MenuItem.Icon>
116116
<MenuItem.Header>
117117
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Fix}" />
@@ -123,33 +123,33 @@
123123

124124
<Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalContentAlignment="Center" />
125125

126-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
126+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
127127
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByInspectionType}"
128128
IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Type}}">
129-
<Image Source="{DynamicResource GroupByInspectionTypeImage}" />
129+
<Image Source="{StaticResource GroupByInspectionTypeImage}" />
130130
</ToggleButton>
131131

132-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
132+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
133133
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByName}"
134134
IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Name}}">
135-
<Image Source="{DynamicResource GroupByInspectionImage}" />
135+
<Image Source="{StaticResource GroupByInspectionImage}" />
136136
</ToggleButton>
137137

138-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
138+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
139139
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_ByLocation}"
140140
IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Location}}">
141-
<Image Source="{DynamicResource GroupByLocationImage}" />
141+
<Image Source="{StaticResource GroupByLocationImage}" />
142142
</ToggleButton>
143143

144-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
144+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
145145
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingStyle_BySeverity}"
146146
IsChecked="{Binding Path=Grouping, Converter={StaticResource GroupingToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultGrouping.Severity}}">
147-
<Image Source="{DynamicResource GroupBySeverityImage}" />
147+
<Image Source="{StaticResource GroupBySeverityImage}" />
148148
</ToggleButton>
149149

150150
<Separator />
151151

152-
<Image Source="{DynamicResource FilterImage}" />
152+
<Image Source="{StaticResource FilterImage}" />
153153

154154
<Label Content="{Resx ResxName=Rubberduck.CodeAnalysis.CodeAnalysisUI, Key=GroupingGrid_Filter}" VerticalContentAlignment="Center" />
155155

@@ -158,46 +158,46 @@
158158

159159
<Label Content="{Resx ResxName=Rubberduck.Resources.Inspections.InspectionsUI ,Key=CodeInspection_SeverityFilter}" />
160160

161-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
161+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
162162
ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterByError}"
163163
IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Error}}">
164-
<Image Source="{DynamicResource FilterByErrorImage}" />
164+
<Image Source="{StaticResource FilterByErrorImage}" />
165165
</ToggleButton>
166166

167-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
167+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
168168
ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterByWarning}"
169169
IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Warning}}">
170-
<Image Source="{DynamicResource FilterByWarningImage}" />
170+
<Image Source="{StaticResource FilterByWarningImage}" />
171171
</ToggleButton>
172172

173-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
173+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
174174
ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterBySuggestion}"
175175
IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Suggestion}}">
176-
<Image Source="{DynamicResource FilterBySuggestionImage}" />
176+
<Image Source="{StaticResource FilterBySuggestionImage}" />
177177
</ToggleButton>
178178

179-
<ToggleButton Style="{DynamicResource ToolBarToggleStyle}"
179+
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
180180
ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=FilterByHint}"
181181
IsChecked="{Binding Path=SelectedFilters, Converter={StaticResource InspectionTypeToBooleanConverter}, ConverterParameter={x:Static codeInspections:InspectionResultsFilter.Hint}}">
182-
<Image Source="{DynamicResource FilterByHintImage}" />
182+
<Image Source="{StaticResource FilterByHintImage}" />
183183
</ToggleButton>
184184

185185
<Separator />
186186

187187
<Button Name="CollapseAll" Command="{Binding CollapseAllCommand}" Margin="2"
188188
ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=CollapseAll}">
189-
<Image Source="{DynamicResource CollapseAllImage}" />
189+
<Image Source="{StaticResource CollapseAllImage}" />
190190
</Button>
191191

192192
<Button Name="ExpandAll" Command="{Binding ExpandAllCommand}" Margin="2"
193193
ToolTip="{Resx ResxName=Rubberduck.UI.Inspections.InspectionResultsUI, Key=ExpandAll}">
194-
<Image Source="{DynamicResource ExpandAllImage}" />
194+
<Image Source="{StaticResource ExpandAllImage}" />
195195
</Button>
196196

197197
<Separator />
198198

199199
<Button Command="{Binding CopyResultsCommand}">
200-
<Image Source="{DynamicResource CopyResultsImage}" />
200+
<Image Source="{StaticResource CopyResultsImage}" />
201201
<Button.ToolTip>
202202
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_CopyToolTip}" />
203203
</Button.ToolTip>
@@ -206,7 +206,7 @@
206206
<Separator />
207207

208208
<Button ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Settings}" Command="{Binding OpenInspectionSettings}" BorderThickness="0" Background="Transparent">
209-
<Image Source="{DynamicResource SettingsImage}" />
209+
<Image Source="{StaticResource SettingsImage}" />
210210
</Button>
211211
</ToolBar>
212212
</ToolBarTray>
@@ -258,15 +258,15 @@
258258

259259
<GridSplitter Grid.Row="2" Height="5" ShowsPreview="True" Cursor="SizeNS" HorizontalAlignment="Stretch"/>
260260

261-
<Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource GrayBrush}">
261+
<Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{StaticResource GrayBrush}">
262262
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
263-
<StackPanel Orientation="Vertical" MinHeight="48" Background="{DynamicResource BackgroundLightBrush}">
263+
<StackPanel Orientation="Vertical" MinHeight="48" Background="{StaticResource BackgroundLightBrush}">
264264
<Grid Margin="4" HorizontalAlignment="Stretch">
265265
<Grid.ColumnDefinitions>
266266
<ColumnDefinition Width="25" />
267267
<ColumnDefinition />
268268
</Grid.ColumnDefinitions>
269-
<Image Style="{DynamicResource IconMargin}" VerticalAlignment="Top" Grid.Column="0"
269+
<Image Style="{StaticResource IconMargin}" VerticalAlignment="Top" Grid.Column="0"
270270
Source="{Binding SelectedInspection.Severity, Converter={StaticResource SeverityIconConverter}}"/>
271271
<TextBlock Grid.Column="1" Margin="4" Text="{Binding SelectedInspection.Description}" FontWeight="Bold" TextWrapping="WrapWithOverflow"/>
272272
</Grid>

0 commit comments

Comments
 (0)