Skip to content

Commit bf5c9ee

Browse files
IvenBachIvenBach
committed
Reorder filters.
1 parent e074e45 commit bf5c9ee

File tree

1 file changed

+42
-47
lines changed

1 file changed

+42
-47
lines changed

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

Lines changed: 42 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@
5858
<Setter Property="Height" Value="16"/>
5959
<Setter Property="Width" Value="16" />
6060
</Style>
61-
61+
62+
63+
<Style TargetType="MenuItem">
64+
<Setter Property="VerticalAlignment" Value="Center"/>
65+
</Style>
66+
6267
</ResourceDictionary>
6368
</UserControl.Resources>
6469

@@ -96,7 +101,7 @@
96101
</Menu>
97102

98103
<Menu>
99-
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}" VerticalAlignment="Center">
104+
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
100105
<MenuItem.Icon>
101106
<Image Source="{StaticResource GroupByImage}" />
102107
</MenuItem.Icon>
@@ -122,57 +127,47 @@
122127
</MenuItem>
123128
</Menu>
124129

130+
<Separator />
131+
125132
<Menu>
126-
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI , Key=GroupingGrid_FilterBy}" VerticalAlignment="Center">
133+
<MenuItem x:Name="FilterInspectionByError"
134+
Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterByError}"
135+
IsChecked="{Binding FilterInspectionsByError, UpdateSourceTrigger=PropertyChanged}"
136+
IsCheckable="True"
137+
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
127138
<MenuItem.Icon>
128-
<Image Source="{StaticResource FilterByImage}"/>
139+
<Image Source="{StaticResource FilterByErrorImage}" />
129140
</MenuItem.Icon>
141+
</MenuItem>
130142

131-
<MenuItem x:Name="FilterInspectionByHint"
132-
Style="{DynamicResource MenuItemStyle}"
133-
Header="{Resx ResxName=Rubberduck.Resources.Inspections.InspectionsUI, Key=CodeInspectionSeverity_Hint}"
134-
IsChecked="{Binding FilterInspectionsByHint, UpdateSourceTrigger=PropertyChanged}"
135-
IsCheckable="True"
136-
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
137-
<MenuItem.Icon>
138-
<Image Source="{StaticResource FilterByHintImage}" />
139-
</MenuItem.Icon>
140-
</MenuItem>
141-
142-
<MenuItem x:Name="FilterInspectionBySuggestion"
143-
Style="{DynamicResource MenuItemStyle}"
144-
Header="{Resx ResxName=Rubberduck.Resources.Inspections.InspectionsUI, Key=CodeInspectionSeverity_Suggestion}"
145-
IsChecked="{Binding FilterInspectionsBySuggestion, UpdateSourceTrigger=PropertyChanged}"
146-
IsCheckable="True"
147-
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
148-
<MenuItem.Icon>
149-
<Image Source="{StaticResource FilterBySuggestionImage}" />
150-
</MenuItem.Icon>
151-
</MenuItem>
152-
153-
<MenuItem x:Name="FilterInspectionByWarning"
154-
Style="{DynamicResource MenuItemStyle}"
155-
VerticalAlignment="Center"
156-
Header="{Resx ResxName=Rubberduck.Resources.Inspections.InspectionsUI, Key=CodeInspectionSeverity_Warning}"
157-
IsChecked="{Binding FilterInspectionsByWarning, UpdateSourceTrigger=PropertyChanged}"
158-
IsCheckable="True"
159-
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
160-
<MenuItem.Icon>
161-
<Image Source="{StaticResource FilterByWarningImage}" />
162-
</MenuItem.Icon>
163-
</MenuItem>
143+
<MenuItem x:Name="FilterInspectionByWarning"
144+
Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterByWarning}"
145+
IsChecked="{Binding FilterInspectionsByWarning, UpdateSourceTrigger=PropertyChanged}"
146+
IsCheckable="True"
147+
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
148+
<MenuItem.Icon>
149+
<Image Source="{StaticResource FilterByWarningImage}" />
150+
</MenuItem.Icon>
151+
</MenuItem>
164152

165-
<MenuItem x:Name="FilterInspectionByError"
166-
Style="{DynamicResource MenuItemStyle}"
167-
Header="{Resx ResxName=Rubberduck.Resources.Inspections.InspectionsUI, Key=CodeInspectionSeverity_Error}"
168-
IsChecked="{Binding FilterInspectionsByError, UpdateSourceTrigger=PropertyChanged}"
169-
IsCheckable="True"
170-
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
171-
<MenuItem.Icon>
172-
<Image Source="{StaticResource FilterByErrorImage}" />
173-
</MenuItem.Icon>
174-
</MenuItem>
153+
<MenuItem x:Name="FilterInspectionBySuggestion"
154+
Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterBySuggestion}"
155+
IsChecked="{Binding FilterInspectionsBySuggestion, UpdateSourceTrigger=PropertyChanged}"
156+
IsCheckable="True"
157+
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
158+
<MenuItem.Icon>
159+
<Image Source="{StaticResource FilterBySuggestionImage}" />
160+
</MenuItem.Icon>
161+
</MenuItem>
175162

163+
<MenuItem x:Name="FilterInspectionByHint"
164+
Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_FilterByHint}"
165+
IsChecked="{Binding FilterInspectionsByHint, UpdateSourceTrigger=PropertyChanged}"
166+
IsCheckable="True"
167+
controls:MenuItemGroup.GroupName="InspectionResults_FilterBy">
168+
<MenuItem.Icon>
169+
<Image Source="{StaticResource FilterByHintImage}" />
170+
</MenuItem.Icon>
176171
</MenuItem>
177172
</Menu>
178173

0 commit comments

Comments
 (0)