Skip to content

Commit 811e79c

Browse files
committed
Group Hide* settings together in the settings panel
Puts "Hide access-key markers" next to "Hide disabled items" and "Hide system store items", so the three Hide* rows cluster by shared intent. Dim inferred icons moves to the end.
1 parent b34f4b5 commit 811e79c

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

ContextMenuManager/Views/AppSettingView.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,17 +323,17 @@
323323
<ColumnDefinition Width="Auto" />
324324
</Grid.ColumnDefinitions>
325325
<StackPanel Margin="0,0,20,0" VerticalAlignment="Center">
326-
<TextBlock x:Name="DimInferredIconsLabel" Style="{StaticResource SettingNameStyle}" />
326+
<TextBlock x:Name="StripMenuMnemonicsLabel" Style="{StaticResource SettingNameStyle}" />
327327
</StackPanel>
328328
<ui:ToggleSwitch
329-
x:Name="DimInferredIconsCheckBox"
329+
x:Name="StripMenuMnemonicsCheckBox"
330330
Grid.Column="1"
331331
MinWidth="0"
332332
HorizontalAlignment="Right"
333333
VerticalAlignment="Center"
334334
OffContent=""
335335
OnContent=""
336-
Toggled="DimInferredIconsCheckBox_OnChanged" />
336+
Toggled="StripMenuMnemonicsCheckBox_OnChanged" />
337337
</Grid>
338338

339339
<Separator Margin="0,0,0,16" />
@@ -344,17 +344,17 @@
344344
<ColumnDefinition Width="Auto" />
345345
</Grid.ColumnDefinitions>
346346
<StackPanel Margin="0,0,20,0" VerticalAlignment="Center">
347-
<TextBlock x:Name="StripMenuMnemonicsLabel" Style="{StaticResource SettingNameStyle}" />
347+
<TextBlock x:Name="DimInferredIconsLabel" Style="{StaticResource SettingNameStyle}" />
348348
</StackPanel>
349349
<ui:ToggleSwitch
350-
x:Name="StripMenuMnemonicsCheckBox"
350+
x:Name="DimInferredIconsCheckBox"
351351
Grid.Column="1"
352352
MinWidth="0"
353353
HorizontalAlignment="Right"
354354
VerticalAlignment="Center"
355355
OffContent=""
356356
OnContent=""
357-
Toggled="StripMenuMnemonicsCheckBox_OnChanged" />
357+
Toggled="DimInferredIconsCheckBox_OnChanged" />
358358
</Grid>
359359
</StackPanel>
360360
</Border>

ContextMenuManager/Views/AppSettingView.xaml.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public void RefreshFromConfig()
4040
OpenMoreExplorerCheckBox.IsOn = AppConfig.OpenMoreExplorer;
4141
HideDisabledItemsCheckBox.IsOn = AppConfig.HideDisabledItems;
4242
HideSysStoreItemsCheckBox.IsOn = AppConfig.HideSysStoreItems;
43-
DimInferredIconsCheckBox.IsOn = AppConfig.DimInferredIcons;
4443
StripMenuMnemonicsCheckBox.IsOn = AppConfig.StripMenuMnemonics;
44+
DimInferredIconsCheckBox.IsOn = AppConfig.DimInferredIcons;
4545

4646
var showHideSysStore = WinOsVersion.Current >= WinOsVersion.Win7;
4747
HideSysStoreRow.Visibility = showHideSysStore ? Visibility.Visible : Visibility.Collapsed;
@@ -112,10 +112,10 @@ private void LoadLabels()
112112

113113
HideSysStoreItemsLabel.Text = AppString.Other.HideSysStoreItems;
114114

115-
DimInferredIconsLabel.Text = AppString.Other.DimInferredIcons;
116-
117115
StripMenuMnemonicsLabel.Text = AppString.Other.StripMenuMnemonics;
118116

117+
DimInferredIconsLabel.Text = AppString.Other.DimInferredIcons;
118+
119119
LoadDynamicOptions();
120120
}
121121

@@ -288,19 +288,19 @@ private void HideSysStoreItemsCheckBox_OnChanged(object sender, RoutedEventArgs
288288
}
289289
}
290290

291-
private void DimInferredIconsCheckBox_OnChanged(object sender, RoutedEventArgs e)
291+
private void StripMenuMnemonicsCheckBox_OnChanged(object sender, RoutedEventArgs e)
292292
{
293293
if (!isLoading)
294294
{
295-
AppConfig.DimInferredIcons = DimInferredIconsCheckBox.IsOn;
295+
AppConfig.StripMenuMnemonics = StripMenuMnemonicsCheckBox.IsOn;
296296
}
297297
}
298298

299-
private void StripMenuMnemonicsCheckBox_OnChanged(object sender, RoutedEventArgs e)
299+
private void DimInferredIconsCheckBox_OnChanged(object sender, RoutedEventArgs e)
300300
{
301301
if (!isLoading)
302302
{
303-
AppConfig.StripMenuMnemonics = StripMenuMnemonicsCheckBox.IsOn;
303+
AppConfig.DimInferredIcons = DimInferredIconsCheckBox.IsOn;
304304
}
305305
}
306306

0 commit comments

Comments
 (0)