Skip to content

Commit dbbb002

Browse files
Thomas1664Thomas1664
authored
Display available keyboard shortcuts in context menus (#2163)
1 parent 559af78 commit dbbb002

File tree

6 files changed

+72
-0
lines changed

6 files changed

+72
-0
lines changed

‎Files/Interacts/Interaction.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,11 @@ public async Task<bool> RenameFileItemAsync(ListedItem item, string oldName, str
847847
}
848848
else
849849
{
850+
if (!AppSettings.ShowFileExtensions)
851+
{
852+
newName += item.FileExtension;
853+
}
854+
850855
renamed = await AssociatedInstance.FilesystemViewModel.GetFileFromPathAsync(item.ItemPath)
851856
.OnSuccess(t => t.RenameAsync(newName, NameCollisionOption.FailIfExists).AsTask());
852857
}

‎Files/UserControls/ModernNavigationToolbar.xaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,9 @@
10081008
<MenuFlyoutItem.Icon>
10091009
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF104;" />
10101010
</MenuFlyoutItem.Icon>
1011+
<MenuFlyoutItem.KeyboardAccelerators>
1012+
<KeyboardAccelerator Modifiers="Control" Key="T" IsEnabled="False" />
1013+
</MenuFlyoutItem.KeyboardAccelerators>
10111014
</MenuFlyoutItem>
10121015
<MenuFlyoutItem
10131016
x:Name="NavToolbarNewWindow"
@@ -1017,6 +1020,9 @@
10171020
<MenuFlyoutItem.Icon>
10181021
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE973;" />
10191022
</MenuFlyoutItem.Icon>
1023+
<MenuFlyoutItem.KeyboardAccelerators>
1024+
<KeyboardAccelerator Modifiers="Control" Key="N" IsEnabled="False" />
1025+
</MenuFlyoutItem.KeyboardAccelerators>
10201026
</MenuFlyoutItem>
10211027
<MenuFlyoutItem
10221028
x:Name="CopyPathButton"
@@ -1039,6 +1045,9 @@
10391045
<MenuFlyoutItem.Icon>
10401046
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE9B2;" />
10411047
</MenuFlyoutItem.Icon>
1048+
<MenuFlyoutItem.KeyboardAccelerators>
1049+
<KeyboardAccelerator Modifiers="Control" Key="V" IsEnabled="False" />
1050+
</MenuFlyoutItem.KeyboardAccelerators>
10421051
</MenuFlyoutItem>
10431052
<MenuFlyoutItem
10441053
x:Name="OpenInTerminalButton"

‎Files/UserControls/StatusBarControl.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262
<MenuFlyoutItem.Icon>
6363
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEB54;" />
6464
</MenuFlyoutItem.Icon>
65+
<MenuFlyoutItem.KeyboardAccelerators>
66+
<KeyboardAccelerator Modifiers="Control" Key="A" IsEnabled="False" />
67+
</MenuFlyoutItem.KeyboardAccelerators>
6568
</MenuFlyoutItem>
6669
<MenuFlyoutItem
6770
x:Name="InvertSelectionMFI"

‎Files/Views/LayoutModes/GenericFileBrowser.xaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@
134134
<MenuFlyoutItem.Icon>
135135
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
136136
</MenuFlyoutItem.Icon>
137+
<MenuFlyoutItem.KeyboardAccelerators>
138+
<KeyboardAccelerator Key="F5" IsEnabled="False" />
139+
</MenuFlyoutItem.KeyboardAccelerators>
137140
</MenuFlyoutItem>
138141
<MenuFlyoutSeparator />
139142
<MenuFlyoutItem
@@ -145,6 +148,9 @@
145148
<MenuFlyoutItem.Icon>
146149
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9b2;" />
147150
</MenuFlyoutItem.Icon>
151+
<MenuFlyoutItem.KeyboardAccelerators>
152+
<KeyboardAccelerator Modifiers="Control" Key="V" IsEnabled="False" />
153+
</MenuFlyoutItem.KeyboardAccelerators>
148154
</MenuFlyoutItem>
149155
<MenuFlyoutSeparator />
150156
<MenuFlyoutItem
@@ -165,6 +171,9 @@
165171
<MenuFlyoutSubItem.Icon>
166172
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe903;" />
167173
</MenuFlyoutSubItem.Icon>
174+
<MenuFlyoutSubItem.KeyboardAccelerators>
175+
<KeyboardAccelerator Modifiers="Control,Shift" Key="N" IsEnabled="False" />
176+
</MenuFlyoutSubItem.KeyboardAccelerators>
168177
<MenuFlyoutItem
169178
x:Name="NewFolder"
170179
x:Uid="BaseLayoutContextFlyoutNewFolder"
@@ -277,6 +286,9 @@
277286
<MenuFlyoutItem.Icon>
278287
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
279288
</MenuFlyoutItem.Icon>
289+
<MenuFlyoutItem.KeyboardAccelerators>
290+
<KeyboardAccelerator Key="F5" IsEnabled="False" />
291+
</MenuFlyoutItem.KeyboardAccelerators>
280292
</MenuFlyoutItem>
281293
<MenuFlyoutSeparator />
282294
<MenuFlyoutItem
@@ -411,6 +423,9 @@
411423
<MenuFlyoutItem.Icon>
412424
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF105;" />
413425
</MenuFlyoutItem.Icon>
426+
<MenuFlyoutItem.KeyboardAccelerators>
427+
<KeyboardAccelerator Modifiers="Control" Key="X" IsEnabled="False" />
428+
</MenuFlyoutItem.KeyboardAccelerators>
414429
</MenuFlyoutItem>
415430
<MenuFlyoutItem
416431
x:Name="CopyItem"
@@ -420,6 +435,9 @@
420435
<MenuFlyoutItem.Icon>
421436
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9d6;" />
422437
</MenuFlyoutItem.Icon>
438+
<MenuFlyoutItem.KeyboardAccelerators>
439+
<KeyboardAccelerator Modifiers="Control" Key="C" IsEnabled="False" />
440+
</MenuFlyoutItem.KeyboardAccelerators>
423441
</MenuFlyoutItem>
424442
<MenuFlyoutItem
425443
x:Name="CopyLocationItem"
@@ -448,6 +466,9 @@
448466
<MenuFlyoutItem.Icon>
449467
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ed;" />
450468
</MenuFlyoutItem.Icon>
469+
<MenuFlyoutItem.KeyboardAccelerators>
470+
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
471+
</MenuFlyoutItem.KeyboardAccelerators>
451472
</MenuFlyoutItem>
452473
<MenuFlyoutItem
453474
x:Name="RenameItem"
@@ -457,6 +478,9 @@
457478
<MenuFlyoutItem.Icon>
458479
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xeb3f;" />
459480
</MenuFlyoutItem.Icon>
481+
<MenuFlyoutItem.KeyboardAccelerators>
482+
<KeyboardAccelerator Key="F2" IsEnabled="False" />
483+
</MenuFlyoutItem.KeyboardAccelerators>
460484
</MenuFlyoutItem>
461485
<MenuFlyoutSeparator />
462486
<MenuFlyoutItem
@@ -519,6 +543,9 @@
519543
<MenuFlyoutItem.Icon>
520544
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ee;" />
521545
</MenuFlyoutItem.Icon>
546+
<MenuFlyoutItem.KeyboardAccelerators>
547+
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
548+
</MenuFlyoutItem.KeyboardAccelerators>
522549
</MenuFlyoutItem>
523550
<MenuFlyoutSeparator />
524551
<MenuFlyoutItem

‎Files/Views/LayoutModes/GridViewBrowser.xaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@
119119
<MenuFlyoutItem.Icon>
120120
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
121121
</MenuFlyoutItem.Icon>
122+
<MenuFlyoutItem.KeyboardAccelerators>
123+
<KeyboardAccelerator Key="F5" IsEnabled="False" />
124+
</MenuFlyoutItem.KeyboardAccelerators>
122125
</MenuFlyoutItem>
123126
<MenuFlyoutSeparator />
124127
<MenuFlyoutItem
@@ -130,6 +133,9 @@
130133
<MenuFlyoutItem.Icon>
131134
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9b2;" />
132135
</MenuFlyoutItem.Icon>
136+
<MenuFlyoutItem.KeyboardAccelerators>
137+
<KeyboardAccelerator Modifiers="Control" Key="V" IsEnabled="False" />
138+
</MenuFlyoutItem.KeyboardAccelerators>
133139
</MenuFlyoutItem>
134140
<MenuFlyoutSeparator />
135141
<MenuFlyoutItem
@@ -158,6 +164,9 @@
158164
<MenuFlyoutItem.Icon>
159165
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xea55;" />
160166
</MenuFlyoutItem.Icon>
167+
<MenuFlyoutItem.KeyboardAccelerators>
168+
<KeyboardAccelerator Modifiers="Control,Shift" Key="N" IsEnabled="False" />
169+
</MenuFlyoutItem.KeyboardAccelerators>
161170
</MenuFlyoutItem>
162171
<MenuFlyoutSeparator />
163172
<MenuFlyoutItem
@@ -250,6 +259,9 @@
250259
<MenuFlyoutItem.Icon>
251260
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
252261
</MenuFlyoutItem.Icon>
262+
<MenuFlyoutItem.KeyboardAccelerators>
263+
<KeyboardAccelerator Key="F5" IsEnabled="False" />
264+
</MenuFlyoutItem.KeyboardAccelerators>
253265
</MenuFlyoutItem>
254266
<MenuFlyoutSeparator />
255267
<MenuFlyoutItem
@@ -383,6 +395,9 @@
383395
<MenuFlyoutItem.Icon>
384396
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF105;" />
385397
</MenuFlyoutItem.Icon>
398+
<MenuFlyoutItem.KeyboardAccelerators>
399+
<KeyboardAccelerator Modifiers="Control" Key="X" IsEnabled="False" />
400+
</MenuFlyoutItem.KeyboardAccelerators>
386401
</MenuFlyoutItem>
387402
<MenuFlyoutItem
388403
x:Name="CopyItem"
@@ -392,6 +407,9 @@
392407
<MenuFlyoutItem.Icon>
393408
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9d6;" />
394409
</MenuFlyoutItem.Icon>
410+
<MenuFlyoutItem.KeyboardAccelerators>
411+
<KeyboardAccelerator Modifiers="Control" Key="C" IsEnabled="False" />
412+
</MenuFlyoutItem.KeyboardAccelerators>
395413
</MenuFlyoutItem>
396414
<MenuFlyoutItem
397415
x:Name="CopyLocationItem"
@@ -420,6 +438,9 @@
420438
<MenuFlyoutItem.Icon>
421439
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ed;" />
422440
</MenuFlyoutItem.Icon>
441+
<MenuFlyoutItem.KeyboardAccelerators>
442+
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
443+
</MenuFlyoutItem.KeyboardAccelerators>
423444
</MenuFlyoutItem>
424445
<MenuFlyoutItem
425446
x:Name="RenameItem"
@@ -429,6 +450,9 @@
429450
<MenuFlyoutItem.Icon>
430451
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xeb3f;" />
431452
</MenuFlyoutItem.Icon>
453+
<MenuFlyoutItem.KeyboardAccelerators>
454+
<KeyboardAccelerator Key="F2" IsEnabled="False" />
455+
</MenuFlyoutItem.KeyboardAccelerators>
432456
</MenuFlyoutItem>
433457
<MenuFlyoutSeparator />
434458
<MenuFlyoutItem
@@ -491,6 +515,9 @@
491515
<MenuFlyoutItem.Icon>
492516
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ee;" />
493517
</MenuFlyoutItem.Icon>
518+
<MenuFlyoutItem.KeyboardAccelerators>
519+
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
520+
</MenuFlyoutItem.KeyboardAccelerators>
494521
</MenuFlyoutItem>
495522
<MenuFlyoutSeparator />
496523
<MenuFlyoutItem

‎Files/Views/LayoutModes/GridViewBrowser.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
237237
else if (e.Key == VirtualKey.Enter)
238238
{
239239
TextBox textBox = sender as TextBox;
240+
textBox.LostFocus -= RenameTextBox_LostFocus;
240241
CommitRename(textBox);
241242
e.Handled = true;
242243
}

0 commit comments

Comments
 (0)