Skip to content

Add shortcut keys for layouts #4809

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 8 commits into from
May 21, 2021
Merged

Add shortcut keys for layouts #4809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3737c1
Add shortcut keys for layouts
cinqmilleans May 1, 2021
d8a85f8
Add shortcut for layouts
cinqmilleans May 13, 2021
c0f7796
Adapt CornerRadius
cinqmilleans May 13, 2021
8fc5e52
Disable key in context menu
cinqmilleans May 13, 2021
c5d6ce3
Merge branch 'main' into KeyLayout2
winston-de May 19, 2021
0e7814c
Merge branch 'files-community:main' into KeyLayout2
cinqmilleans May 20, 2021
f0b1c4d
Update layout order
cinqmilleans May 20, 2021
b92e902
Merge branch 'main' into KeyLayout2
cinqmilleans May 21, 2021
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
57 changes: 32 additions & 25 deletions Files/Helpers/ContextFlyoutItemHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Threading.Tasks;
using Windows.ApplicationModel.DataTransfer;
using Windows.Storage;
using Windows.System;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media.Imaging;

Expand Down Expand Up @@ -97,60 +98,66 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
ShowInRecycleBin = true,
Items = new List<ContextMenuFlyoutItemViewModel>()
{
// Grid view large
// Column view
new ContextMenuFlyoutItemViewModel()
{
Text = "BaseLayoutContextFlyoutGridViewLarge/Text".GetLocalized(),
Glyph = "\uE739",
Text = "BaseLayoutContextFlyoutColumn/Text".GetLocalized(),
Glyph = "\uF115",
GlyphFontFamilyName = "CustomGlyph",
ShowInRecycleBin = true,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeGridViewLarge,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeColumnView,
CommandParameter = true,
KeyboardAccelerator = new KeyboardAccelerator{Key = VirtualKey.Number1, Modifiers = VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift}
},
// Grid view medium
// Details view
new ContextMenuFlyoutItemViewModel()
{
Text = "BaseLayoutContextFlyoutGridViewMedium/Text".GetLocalized(),
Glyph = "\uF0E2",
Text = "BaseLayoutContextFlyoutDetails/Text".GetLocalized(),
Glyph = "\uE179",
ShowInRecycleBin = true,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeGridViewMedium,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeDetailsView,
CommandParameter = true,
KeyboardAccelerator = new KeyboardAccelerator{Key = VirtualKey.Number2, Modifiers = VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift}
},
// Grid view small
// Tiles view
new ContextMenuFlyoutItemViewModel()
{
Text = "BaseLayoutContextFlyoutGridViewSmall/Text".GetLocalized(),
Glyph = "\uE80A",
Text = "BaseLayoutContextFlyoutTilesView/Text".GetLocalized(),
Glyph = "\uE15C",
ShowInRecycleBin = true,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeGridViewSmall,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeTiles,
CommandParameter = true,
KeyboardAccelerator = new KeyboardAccelerator{Key = VirtualKey.Number3, Modifiers = VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift}
},
// Tiles view
// Grid view small
new ContextMenuFlyoutItemViewModel()
{
Text = "BaseLayoutContextFlyoutTilesView/Text".GetLocalized(),
Glyph = "\uE15C",
Text = "BaseLayoutContextFlyoutGridViewSmall/Text".GetLocalized(),
Glyph = "\uE80A",
ShowInRecycleBin = true,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeTiles,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeGridViewSmall,
CommandParameter = true,
KeyboardAccelerator = new KeyboardAccelerator{Key = VirtualKey.Number4, Modifiers = VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift}
},
// Details view
// Grid view medium
new ContextMenuFlyoutItemViewModel()
{
Text = "BaseLayoutContextFlyoutDetails/Text".GetLocalized(),
Glyph = "\uE179",
Text = "BaseLayoutContextFlyoutGridViewMedium/Text".GetLocalized(),
Glyph = "\uF0E2",
ShowInRecycleBin = true,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeDetailsView,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeGridViewMedium,
CommandParameter = true,
KeyboardAccelerator = new KeyboardAccelerator{Key = VirtualKey.Number5, Modifiers = VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift}
},
// Column view
// Grid view large
new ContextMenuFlyoutItemViewModel()
{
Text = "BaseLayoutContextFlyoutColumn/Text".GetLocalized(),
Glyph = "\uF115",
GlyphFontFamilyName = "CustomGlyph",
Text = "BaseLayoutContextFlyoutGridViewLarge/Text".GetLocalized(),
Glyph = "\uE739",
ShowInRecycleBin = true,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeColumnView,
Command = currentInstanceViewModel.FolderSettings.ToggleLayoutModeGridViewLarge,
CommandParameter = true,
KeyboardAccelerator = new KeyboardAccelerator{Key = VirtualKey.Number6, Modifiers = VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift}
},
}
},
Expand Down
12 changes: 6 additions & 6 deletions Files/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,7 @@
<value>Folders</value>
</data>
<data name="NavToolbarDetailsView.ToolTipService.ToolTip" xml:space="preserve">
<value>Details View</value>
<value>Details View (Ctrl+Shift+2)</value>
</data>
<data name="NavToolbarDetailsView.AutomationProperties.Name" xml:space="preserve">
<value>Details View</value>
Expand All @@ -1576,25 +1576,25 @@
<value>Grid View (Large)</value>
</data>
<data name="NavToolbarGridViewLarge.ToolTipService.ToolTip" xml:space="preserve">
<value>Grid View (Large)</value>
<value>Grid View (Large) (Ctrl+Shift+6)</value>
</data>
<data name="NavToolbarGridViewMedium.AutomationProperties.Name" xml:space="preserve">
<value>Grid View (Medium)</value>
</data>
<data name="NavToolbarGridViewMedium.ToolTipService.ToolTip" xml:space="preserve">
<value>Grid View (Medium)</value>
<value>Grid View (Medium) (Ctrl+Shift+5)</value>
</data>
<data name="NavToolbarGridViewSmall.AutomationProperties.Name" xml:space="preserve">
<value>Grid View (Small)</value>
</data>
<data name="NavToolbarGridViewSmall.ToolTipService.ToolTip" xml:space="preserve">
<value>Grid View (Small)</value>
<value>Grid View (Small) (Ctrl+Shift+4)</value>
</data>
<data name="NavToolbarTilesView.AutomationProperties.Name" xml:space="preserve">
<value>Tiles View</value>
</data>
<data name="NavToolbarTilesView.ToolTipService.ToolTip" xml:space="preserve">
<value>Tiles View</value>
<value>Tiles View (Ctrl+Shift+3)</value>
</data>
<data name="NavToolbarShowFileExtensions.Header" xml:space="preserve">
<value>Show file extensions</value>
Expand Down Expand Up @@ -1903,7 +1903,7 @@
<value>Column View</value>
</data>
<data name="NavToolbarColumnView.ToolTipService.ToolTip" xml:space="preserve">
<value>Column View</value>
<value>Column View (Ctrl+Shift+1)</value>
</data>
<data name="PinItemToStart.Text" xml:space="preserve">
<value>Pin to the Start Menu</value>
Expand Down
38 changes: 19 additions & 19 deletions Files/UserControls/NavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,25 @@
Text="Layout Mode" />

<StackPanel Orientation="Horizontal" Spacing="4">
<RadioButton
x:Uid="NavToolbarColumnView"
Width="36"
Height="32"
MinWidth="0"
Padding="0"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Command="{x:Bind ToggleLayoutModeColumnView}"
CommandParameter="{xh:SystemTypeToXaml Bool=True}"
CornerRadius="4"
IsChecked="{x:Bind LayoutModeInformation, Converter={StaticResource LayoutModeConverter}, Mode=OneWay, ConverterParameter=ColumnInfo}"
Style="{StaticResource ToggleButtonRevealStyle}"
ToolTipService.ToolTip="Column View">
<FontIcon
FontFamily="{StaticResource CustomGlyph}"
FontSize="16"
Glyph="&#xF115;" />
</RadioButton>
<RadioButton
x:Uid="NavToolbarDetailsView"
Width="36"
Expand Down Expand Up @@ -1143,25 +1162,6 @@
ToolTipService.ToolTip="Grid View (Large)">
<FontIcon FontSize="16" Glyph="&#xE739;" />
</RadioButton>
<RadioButton
x:Uid="NavToolbarColumnView"
Width="36"
Height="32"
MinWidth="0"
Padding="0"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Command="{x:Bind ToggleLayoutModeColumnView}"
CommandParameter="{xh:SystemTypeToXaml Bool=True}"
CornerRadius="4"
IsChecked="{x:Bind LayoutModeInformation, Converter={StaticResource LayoutModeConverter}, Mode=OneWay, ConverterParameter=ColumnInfo}"
Style="{StaticResource ToggleButtonRevealStyle}"
ToolTipService.ToolTip="Column View">
<FontIcon
FontFamily="{StaticResource CustomGlyph}"
FontSize="16"
Glyph="&#xF115;" />
</RadioButton>
</StackPanel>
</StackPanel>
</Flyout>
Expand Down
24 changes: 24 additions & 0 deletions Files/Views/ModernShellPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,30 @@
Key="F1"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
<KeyboardAccelerator
Key="Number1" Modifiers="Control,Shift"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
<KeyboardAccelerator
Key="Number2" Modifiers="Control,Shift"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
<KeyboardAccelerator
Key="Number3" Modifiers="Control,Shift"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
<KeyboardAccelerator
Key="Number4" Modifiers="Control,Shift"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
<KeyboardAccelerator
Key="Number5" Modifiers="Control,Shift"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
<KeyboardAccelerator
Key="Number6" Modifiers="Control,Shift"
Invoked="KeyboardAccelerator_Invoked"
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
</Page.KeyboardAccelerators>
<Grid
x:Name="RootGrid"
Expand Down
19 changes: 19 additions & 0 deletions Files/Views/ModernShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,25 @@ await FilesystemHelpers.DeleteItemsAsync(
case (false, false, false, _, VirtualKey.F1): // F1, open Files wiki
await Launcher.LaunchUriAsync(new Uri(@"https://files-community.github.io/docs"));
break;

case (true, true, false, _, VirtualKey.Number1): // ctrl+shift+1, column view
InstanceViewModel.FolderSettings.ToggleLayoutModeColumnView.Execute(true);
break;
case (true, true, false, _, VirtualKey.Number2): // ctrl+shift+2, details view
InstanceViewModel.FolderSettings.ToggleLayoutModeDetailsView.Execute(true);
break;
case (true, true, false, _, VirtualKey.Number3): // ctrl+shift+3, tiles view
InstanceViewModel.FolderSettings.ToggleLayoutModeTiles.Execute(true);
break;
case (true, true, false, _, VirtualKey.Number4): // ctrl+shift+4, grid small view
InstanceViewModel.FolderSettings.ToggleLayoutModeGridViewSmall.Execute(true);
break;
case (true, true, false, _, VirtualKey.Number5): // ctrl+shift+5, grid medium view
InstanceViewModel.FolderSettings.ToggleLayoutModeGridViewMedium.Execute(true);
break;
case (true, true, false, _, VirtualKey.Number6): // ctrl+shift+6, grid large view
InstanceViewModel.FolderSettings.ToggleLayoutModeGridViewLarge.Execute(true);
break;
};

switch (args.KeyboardAccelerator.Key)
Expand Down