From aab3aebfea40e9a50ff4761db262a8e67fd15c50 Mon Sep 17 00:00:00 2001 From: hishitetsu <66369541+hishitetsu@users.noreply.github.com> Date: Fri, 19 May 2023 09:50:53 +0900 Subject: [PATCH 1/2] Copy as path --- specs/RichCommand/CommandList.md | 7 +++++-- src/Files.App/Actions/FileSystem/CopyPathAction.cs | 4 ++-- src/Files.App/ResourceDictionaries/PathIcons.xaml | 2 +- src/Files.App/Strings/en-US/Resources.resw | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/specs/RichCommand/CommandList.md b/specs/RichCommand/CommandList.md index 9e88c6cc1401..254a5355fd1c 100644 --- a/specs/RichCommand/CommandList.md +++ b/specs/RichCommand/CommandList.md @@ -10,6 +10,7 @@ This is the list of all commands defined in `CommandCodes` enum except `None`. | | ExitCompactOverlay | Exit compact overlay | Exit compact overlay | Ctrl+Alt+Down | | | ToggleCompactOverlay | Toggle compact overlay | Toggle compact overlay | F12 | | | Search | Search | Go to search box | Ctrl+F, F3 | +| | SearchUnindexedItems | Search unindexed items | Search for unindexed items | | | | Redo | Redo | Redo the last file operation | Ctrl+Y | | | Undo | Undo | Undo the last file operation | Ctrl+Z | | | EditPath | Edit path | Focus path bar | Ctrl+L, Alt+D | @@ -18,13 +19,14 @@ This is the list of all commands defined in `CommandCodes` enum except `None`. | | TogglePreviewPane | Toggle the preview pane | Toggle whether to show preview pane | Ctrl+P | | | ToggleSidebar | Toggle the sidebar | Toggle whether to show sidebar | Ctrl+B | | File System | CopyItem | Copy | Copy item(s) to clipboard | Ctrl+C | -| | CopyPath | Copy location | Copy path of item to clipboard | Ctrl+Shift+C | +| | CopyPath | Copy as path | Copy path of item to clipboard | Ctrl+Shift+C | | | CutItem | Cut | Cut item(s) to clipboard | Ctrl+X | | | PasteItem | Paste | Paste item(s) from clipboard to current folder | Ctrl+V | | | PasteItemToSelection | Paste | Paste item(s) from clipboard to selected folder | Ctrl+Shift+V | | | DeleteItem | Delete | Delete item(s) | Delete, Ctrl+D | | | DeletemeItemPermanently | Delete permanently | Delete item(s) permanently | Shift+Delete | | | CreateFolder | Folder | Create new folder | | +| | CreateFolderWithSelection | Create folder with selection | Create a folder with the currently selected item(s) | | | | AddItem | New | Create new item | Ctrl+Shift+N | | | CreateShortcut | Create shortcut | Create new shortcut(s) to selected item(s) | | | | CreateShortcutFromDialog | Shortcut | Create new shortcut to any item | | @@ -65,7 +67,8 @@ This is the list of all commands defined in `CommandCodes` enum except `None`. | | DecompressArchiveToChildFolder | Extract to _NewFolderName_ | Extract items from selected archive(s) to new folder | | | Image Manipulation | RotateLeft | Rotate left | Rotate selected image(s) to the left | | | | RotateRight | Rotate right | Rotate selected image(s) to the right | | -| Open | OpenSettings | Settings | Open settings page | Ctrl+, | +| Open | OpenProperties | Open properties | Open properties window | Alt+Enter | +| | OpenSettings | Settings | Open settings page | Ctrl+, | | | OpenTerminal | Open in terminal | Open folder in terminal | Ctrl+\` | | | OpenTerminalAsAdmin | Open in terminal as administrator | Open folder in terminal as administrator | Ctrl+Shift+\` | | Layout | LayoutDecreaseSize | Decrease size | Decrease icon size in grid view | Ctrl+- | diff --git a/src/Files.App/Actions/FileSystem/CopyPathAction.cs b/src/Files.App/Actions/FileSystem/CopyPathAction.cs index 4131f057b7f0..70d6e0ba4dbc 100644 --- a/src/Files.App/Actions/FileSystem/CopyPathAction.cs +++ b/src/Files.App/Actions/FileSystem/CopyPathAction.cs @@ -16,11 +16,11 @@ internal class CopyPathAction : IAction { private readonly IContentPageContext context = Ioc.Default.GetRequiredService(); - public string Label { get; } = "CopyLocation".GetLocalizedResource(); + public string Label { get; } = "CopyAsPath".GetLocalizedResource(); public string Description => "CopyPathDescription".GetLocalizedResource(); - public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconCopyLocation"); + public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconCopyPath"); public HotKey HotKey { get; } = new(Keys.C, KeyModifiers.CtrlShift); diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml index 6c8046ffa69a..9909239ae5e8 100644 --- a/src/Files.App/ResourceDictionaries/PathIcons.xaml +++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml @@ -960,7 +960,7 @@ -