Skip to content

Display available keyboard shortcuts in context menus #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 17, 2020
Merged

Display available keyboard shortcuts in context menus #2163

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
af3d8f2
Display available keyboard shortcuts in flyouts
Thomas1664 Oct 27, 2020
c5b91d5
Fixed double call of refresh method
Thomas1664 Nov 15, 2020
bb5f1c5
Don't trigger rename twice after exiting rename box using enter key
Thomas1664 Nov 16, 2020
c68f368
Add file extension to the end of the new file name if show file exten…
Thomas1664 Nov 16, 2020
ede8de9
Merge branch 'master' into keyboard-accelerators
Thomas1664 Nov 16, 2020
cc8c5fe
Fix crash after dismissing rename text box in grid view
Thomas1664 Nov 16, 2020
8081329
Fix crash using delete shortcut
Thomas1664 Nov 16, 2020
be96268
Fix issues when deleting an item
Thomas1664 Nov 17, 2020
189f56a
Merge branch 'keyboard-accelerators' of https://github.com/Thomas1664…
Thomas1664 Nov 17, 2020
94ca808
revert
Thomas1664 Nov 17, 2020
b9db080
Fix double call of cut, copy, paste
Thomas1664 Nov 17, 2020
c2febd2
Add braces
Thomas1664 Nov 17, 2020
380bdd4
Other aproach fixing rename
Thomas1664 Nov 17, 2020
168e0fe
Fix indentation
Thomas1664 Nov 17, 2020
112c327
Set IsEnabled="False"
Thomas1664 Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Files/Interacts/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,9 @@ public async Task<bool> RenameFileItemAsync(ListedItem item, string oldName, str
}
else
{
if (!AppSettings.ShowFileExtensions)
newName += item.FileExtension;

renamed = await AssociatedInstance.FilesystemViewModel.GetFileFromPathAsync(item.ItemPath)
.OnSuccess(t => t.RenameAsync(newName, NameCollisionOption.FailIfExists).AsTask());
}
Expand Down
9 changes: 9 additions & 0 deletions Files/UserControls/ModernNavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF104;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="T" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="NavToolbarNewWindow"
Expand All @@ -1017,6 +1020,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE973;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="N" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="CopyPathButton"
Expand All @@ -1039,6 +1045,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE9B2;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="V" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="OpenInTerminalButton"
Expand Down
5 changes: 5 additions & 0 deletions Files/UserControls/StatusBarControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEB54;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator
Modifiers="Control"
Key="A" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="InvertSelectionMFI"
Expand Down
27 changes: 27 additions & 0 deletions Files/Views/LayoutModes/GenericFileBrowser.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="F5" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand All @@ -145,6 +148,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9b2;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="V" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand All @@ -165,6 +171,9 @@
<MenuFlyoutSubItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe903;" />
</MenuFlyoutSubItem.Icon>
<MenuFlyoutSubItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control,Shift" Key="N" />
</MenuFlyoutSubItem.KeyboardAccelerators>
<MenuFlyoutItem
x:Name="NewFolder"
x:Uid="BaseLayoutContextFlyoutNewFolder"
Expand Down Expand Up @@ -277,6 +286,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="F5" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down Expand Up @@ -411,6 +423,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF105;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="X" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="CopyItem"
Expand All @@ -420,6 +435,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9d6;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="C" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="CopyLocationItem"
Expand Down Expand Up @@ -448,6 +466,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ed;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="RenameItem"
Expand All @@ -457,6 +478,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xeb3f;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="F2" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down Expand Up @@ -519,6 +543,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ee;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down
27 changes: 27 additions & 0 deletions Files/Views/LayoutModes/GridViewBrowser.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="F5" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand All @@ -130,6 +133,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9b2;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="V" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down Expand Up @@ -158,6 +164,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xea55;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control,Shift" Key="N" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down Expand Up @@ -250,6 +259,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe916;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="F5" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down Expand Up @@ -383,6 +395,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF105;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="X" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="CopyItem"
Expand All @@ -392,6 +407,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9d6;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Modifiers="Control" Key="C" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="CopyLocationItem"
Expand Down Expand Up @@ -420,6 +438,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ed;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="RenameItem"
Expand All @@ -429,6 +450,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xeb3f;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="F2" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down Expand Up @@ -491,6 +515,9 @@
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xe9ee;" />
</MenuFlyoutItem.Icon>
<MenuFlyoutItem.KeyboardAccelerators>
<KeyboardAccelerator Key="Delete" IsEnabled="False" />
</MenuFlyoutItem.KeyboardAccelerators>
</MenuFlyoutItem>
<MenuFlyoutSeparator />
<MenuFlyoutItem
Expand Down
1 change: 1 addition & 0 deletions Files/Views/LayoutModes/GridViewBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
else if (e.Key == VirtualKey.Enter)
{
TextBox textBox = sender as TextBox;
textBox.LostFocus -= RenameTextBox_LostFocus;
CommitRename(textBox);
e.Handled = true;
}
Expand Down
13 changes: 0 additions & 13 deletions Files/Views/ModernShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,19 +978,6 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
NavigationToolbar.IsEditModeEnabled = true;
break;
};

if (CurrentPageType == typeof(GridViewBrowser))
{
switch (args.KeyboardAccelerator.Key)
{
case VirtualKey.F2: //F2, rename
if (ContentPage.IsItemSelected)
{
InteractionOperations.RenameItem_Click(null, null);
}
break;
}
}
}

public async void Refresh_Click()
Expand Down