Skip to content

Commit 8f185f3

Browse files
jvestelljvestell
committed
merge from main
1 parent cff98a7 commit 8f185f3

File tree

1 file changed

+2
-148
lines changed

1 file changed

+2
-148
lines changed

‎src/Files.App/Data/Commands/Manager/CommandManager.cs

Lines changed: 2 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ public CommandManager()
199199

200200
private static IDictionary<CommandCodes, IAction> CreateActions() => new Dictionary<CommandCodes, IAction>
201201
{
202-
<<<<<<< HEAD
203202
[CommandCodes.OpenHelp] = new DebouncedActionDecorator(new OpenHelpAction()),
204203
[CommandCodes.ToggleFullScreen] = new DebouncedActionDecorator(new ToggleFullScreenAction()),
205204
[CommandCodes.EnterCompactOverlay] = new DebouncedActionDecorator(new EnterCompactOverlayAction()),
@@ -260,7 +259,7 @@ public CommandManager()
260259
[CommandCodes.OpenItem] = new DebouncedActionDecorator(new OpenItemAction()),
261260
[CommandCodes.OpenItemWithApplicationPicker] = new DebouncedActionDecorator(new OpenItemWithApplicationPickerAction()),
262261
[CommandCodes.OpenParentFolder] = new DebouncedActionDecorator(new OpenParentFolderAction()),
263-
[CommandCodes.OpenInVS] = new DebouncedActionDecorator(new OpenInVSAction()),
262+
//[CommandCodes.OpenInVS] = new DebouncedActionDecorator(new OpenInVSAction()),
264263
[CommandCodes.OpenInVSCode] = new DebouncedActionDecorator(new OpenInVSCodeAction()),
265264
[CommandCodes.OpenProperties] = new DebouncedActionDecorator(new OpenPropertiesAction()),
266265
[CommandCodes.OpenSettings] = new DebouncedActionDecorator(new OpenSettingsAction()),
@@ -342,152 +341,7 @@ public CommandManager()
342341
[CommandCodes.GitPull] = new DebouncedActionDecorator(new GitPullAction()),
343342
[CommandCodes.GitPush] = new DebouncedActionDecorator(new GitPushAction()),
344343
[CommandCodes.GitSync] = new DebouncedActionDecorator(new GitSyncAction()),
345-
[CommandCodes.OpenAllTaggedItems] = new DebouncedActionDecorator(new OpenAllTaggedActions())
346-
=======
347-
[CommandCodes.OpenHelp] = new OpenHelpAction(),
348-
[CommandCodes.ToggleFullScreen] = new ToggleFullScreenAction(),
349-
[CommandCodes.EnterCompactOverlay] = new EnterCompactOverlayAction(),
350-
[CommandCodes.ExitCompactOverlay] = new ExitCompactOverlayAction(),
351-
[CommandCodes.ToggleCompactOverlay] = new ToggleCompactOverlayAction(),
352-
[CommandCodes.Search] = new SearchAction(),
353-
[CommandCodes.SearchUnindexedItems] = new SearchUnindexedItemsAction(),
354-
[CommandCodes.EditPath] = new EditPathAction(),
355-
[CommandCodes.Redo] = new RedoAction(),
356-
[CommandCodes.Undo] = new UndoAction(),
357-
[CommandCodes.ToggleShowHiddenItems] = new ToggleShowHiddenItemsAction(),
358-
[CommandCodes.ToggleShowFileExtensions] = new ToggleShowFileExtensionsAction(),
359-
[CommandCodes.TogglePreviewPane] = new TogglePreviewPaneAction(),
360-
[CommandCodes.SelectAll] = new SelectAllAction(),
361-
[CommandCodes.InvertSelection] = new InvertSelectionAction(),
362-
[CommandCodes.ClearSelection] = new ClearSelectionAction(),
363-
[CommandCodes.ToggleSelect] = new ToggleSelectAction(),
364-
[CommandCodes.ShareItem] = new ShareItemAction(),
365-
[CommandCodes.EmptyRecycleBin] = new EmptyRecycleBinAction(),
366-
[CommandCodes.RestoreRecycleBin] = new RestoreRecycleBinAction(),
367-
[CommandCodes.RestoreAllRecycleBin] = new RestoreAllRecycleBinAction(),
368-
[CommandCodes.RefreshItems] = new RefreshItemsAction(),
369-
[CommandCodes.Rename] = new RenameAction(),
370-
[CommandCodes.CreateShortcut] = new CreateShortcutAction(),
371-
[CommandCodes.CreateShortcutFromDialog] = new CreateShortcutFromDialogAction(),
372-
[CommandCodes.CreateFolder] = new CreateFolderAction(),
373-
[CommandCodes.CreateFolderWithSelection] = new CreateFolderWithSelectionAction(),
374-
[CommandCodes.AddItem] = new AddItemAction(),
375-
[CommandCodes.PinToStart] = new PinToStartAction(),
376-
[CommandCodes.UnpinFromStart] = new UnpinFromStartAction(),
377-
[CommandCodes.PinItemToFavorites] = new PinItemAction(),
378-
[CommandCodes.UnpinItemFromFavorites] = new UnpinItemAction(),
379-
[CommandCodes.SetAsWallpaperBackground] = new SetAsWallpaperBackgroundAction(),
380-
[CommandCodes.SetAsSlideshowBackground] = new SetAsSlideshowBackgroundAction(),
381-
[CommandCodes.SetAsLockscreenBackground] = new SetAsLockscreenBackgroundAction(),
382-
[CommandCodes.CopyItem] = new CopyItemAction(),
383-
[CommandCodes.CopyPath] = new CopyPathAction(),
384-
[CommandCodes.CutItem] = new CutItemAction(),
385-
[CommandCodes.PasteItem] = new PasteItemAction(),
386-
[CommandCodes.PasteItemToSelection] = new PasteItemToSelectionAction(),
387-
[CommandCodes.DeleteItem] = new DeleteItemAction(),
388-
[CommandCodes.DeleteItemPermanently] = new DeleteItemPermanentlyAction(),
389-
[CommandCodes.InstallFont] = new InstallFontAction(),
390-
[CommandCodes.InstallInfDriver] = new InstallInfDriverAction(),
391-
[CommandCodes.InstallCertificate] = new InstallCertificateAction(),
392-
[CommandCodes.RunAsAdmin] = new RunAsAdminAction(),
393-
[CommandCodes.RunAsAnotherUser] = new RunAsAnotherUserAction(),
394-
[CommandCodes.RunWithPowershell] = new RunWithPowershellAction(),
395-
[CommandCodes.LaunchPreviewPopup] = new LaunchPreviewPopupAction(),
396-
[CommandCodes.CompressIntoArchive] = new CompressIntoArchiveAction(),
397-
[CommandCodes.CompressIntoSevenZip] = new CompressIntoSevenZipAction(),
398-
[CommandCodes.CompressIntoZip] = new CompressIntoZipAction(),
399-
[CommandCodes.DecompressArchive] = new DecompressArchive(),
400-
[CommandCodes.DecompressArchiveHere] = new DecompressArchiveHere(),
401-
[CommandCodes.DecompressArchiveToChildFolder] = new DecompressArchiveToChildFolderAction(),
402-
[CommandCodes.RotateLeft] = new RotateLeftAction(),
403-
[CommandCodes.RotateRight] = new RotateRightAction(),
404-
[CommandCodes.OpenItem] = new OpenItemAction(),
405-
[CommandCodes.OpenItemWithApplicationPicker] = new OpenItemWithApplicationPickerAction(),
406-
[CommandCodes.OpenParentFolder] = new OpenParentFolderAction(),
407-
[CommandCodes.OpenInVSCode] = new OpenInVSCodeAction(),
408-
[CommandCodes.OpenRepoInVSCode] = new OpenRepoInVSCodeAction(),
409-
[CommandCodes.OpenProperties] = new OpenPropertiesAction(),
410-
[CommandCodes.OpenSettings] = new OpenSettingsAction(),
411-
[CommandCodes.OpenTerminal] = new OpenTerminalAction(),
412-
[CommandCodes.OpenTerminalAsAdmin] = new OpenTerminalAsAdminAction(),
413-
[CommandCodes.OpenCommandPalette] = new OpenCommandPaletteAction(),
414-
[CommandCodes.LayoutDecreaseSize] = new LayoutDecreaseSizeAction(),
415-
[CommandCodes.LayoutIncreaseSize] = new LayoutIncreaseSizeAction(),
416-
[CommandCodes.LayoutDetails] = new LayoutDetailsAction(),
417-
[CommandCodes.LayoutTiles] = new LayoutTilesAction(),
418-
[CommandCodes.LayoutGridSmall] = new LayoutGridSmallAction(),
419-
[CommandCodes.LayoutGridMedium] = new LayoutGridMediumAction(),
420-
[CommandCodes.LayoutGridLarge] = new LayoutGridLargeAction(),
421-
[CommandCodes.LayoutColumns] = new LayoutColumnsAction(),
422-
[CommandCodes.LayoutAdaptive] = new LayoutAdaptiveAction(),
423-
[CommandCodes.SortByName] = new SortByNameAction(),
424-
[CommandCodes.SortByDateModified] = new SortByDateModifiedAction(),
425-
[CommandCodes.SortByDateCreated] = new SortByDateCreatedAction(),
426-
[CommandCodes.SortBySize] = new SortBySizeAction(),
427-
[CommandCodes.SortByType] = new SortByTypeAction(),
428-
[CommandCodes.SortBySyncStatus] = new SortBySyncStatusAction(),
429-
[CommandCodes.SortByTag] = new SortByTagAction(),
430-
[CommandCodes.SortByPath] = new SortByPathAction(),
431-
[CommandCodes.SortByOriginalFolder] = new SortByOriginalFolderAction(),
432-
[CommandCodes.SortByDateDeleted] = new SortByDateDeletedAction(),
433-
[CommandCodes.SortAscending] = new SortAscendingAction(),
434-
[CommandCodes.SortDescending] = new SortDescendingAction(),
435-
[CommandCodes.ToggleSortDirection] = new ToggleSortDirectionAction(),
436-
[CommandCodes.ToggleSortDirectoriesAlongsideFiles] = new ToggleSortDirectoriesAlongsideFilesAction(),
437-
[CommandCodes.GroupByNone] = new GroupByNoneAction(),
438-
[CommandCodes.GroupByName] = new GroupByNameAction(),
439-
[CommandCodes.GroupByDateModified] = new GroupByDateModifiedAction(),
440-
[CommandCodes.GroupByDateCreated] = new GroupByDateCreatedAction(),
441-
[CommandCodes.GroupBySize] = new GroupBySizeAction(),
442-
[CommandCodes.GroupByType] = new GroupByTypeAction(),
443-
[CommandCodes.GroupBySyncStatus] = new GroupBySyncStatusAction(),
444-
[CommandCodes.GroupByTag] = new GroupByTagAction(),
445-
[CommandCodes.GroupByOriginalFolder] = new GroupByOriginalFolderAction(),
446-
[CommandCodes.GroupByDateDeleted] = new GroupByDateDeletedAction(),
447-
[CommandCodes.GroupByFolderPath] = new GroupByFolderPathAction(),
448-
[CommandCodes.GroupByDateModifiedYear] = new GroupByDateModifiedYearAction(),
449-
[CommandCodes.GroupByDateModifiedMonth] = new GroupByDateModifiedMonthAction(),
450-
[CommandCodes.GroupByDateCreatedYear] = new GroupByDateCreatedYearAction(),
451-
[CommandCodes.GroupByDateCreatedMonth] = new GroupByDateCreatedMonthAction(),
452-
[CommandCodes.GroupByDateDeletedYear] = new GroupByDateDeletedYearAction(),
453-
[CommandCodes.GroupByDateDeletedMonth] = new GroupByDateDeletedMonthAction(),
454-
[CommandCodes.GroupAscending] = new GroupAscendingAction(),
455-
[CommandCodes.GroupDescending] = new GroupDescendingAction(),
456-
[CommandCodes.ToggleGroupDirection] = new ToggleGroupDirectionAction(),
457-
[CommandCodes.GroupByYear] = new GroupByYearAction(),
458-
[CommandCodes.GroupByMonth] = new GroupByMonthAction(),
459-
[CommandCodes.ToggleGroupByDateUnit] = new ToggleGroupByDateUnitAction(),
460-
[CommandCodes.NewTab] = new NewTabAction(),
461-
[CommandCodes.FormatDrive] = new FormatDriveAction(),
462-
[CommandCodes.NavigateBack] = new NavigateBackAction(),
463-
[CommandCodes.NavigateForward] = new NavigateForwardAction(),
464-
[CommandCodes.NavigateUp] = new NavigateUpAction(),
465-
[CommandCodes.DuplicateCurrentTab] = new DuplicateCurrentTabAction(),
466-
[CommandCodes.DuplicateSelectedTab] = new DuplicateSelectedTabAction(),
467-
[CommandCodes.CloseTabsToTheLeftCurrent] = new CloseTabsToTheLeftCurrentAction(),
468-
[CommandCodes.CloseTabsToTheLeftSelected] = new CloseTabsToTheLeftSelectedAction(),
469-
[CommandCodes.CloseTabsToTheRightCurrent] = new CloseTabsToTheRightCurrentAction(),
470-
[CommandCodes.CloseTabsToTheRightSelected] = new CloseTabsToTheRightSelectedAction(),
471-
[CommandCodes.CloseOtherTabsCurrent] = new CloseOtherTabsCurrentAction(),
472-
[CommandCodes.CloseOtherTabsSelected] = new CloseOtherTabsSelectedAction(),
473-
[CommandCodes.OpenDirectoryInNewPane] = new OpenDirectoryInNewPaneAction(),
474-
[CommandCodes.OpenDirectoryInNewTab] = new OpenDirectoryInNewTabAction(),
475-
[CommandCodes.OpenInNewWindowItem] = new OpenInNewWindowItemAction(),
476-
[CommandCodes.ReopenClosedTab] = new ReopenClosedTabAction(),
477-
[CommandCodes.PreviousTab] = new PreviousTabAction(),
478-
[CommandCodes.NextTab] = new NextTabAction(),
479-
[CommandCodes.CloseSelectedTab] = new CloseSelectedTabAction(),
480-
[CommandCodes.OpenNewPane] = new OpenNewPaneAction(),
481-
[CommandCodes.ClosePane] = new ClosePaneAction(),
482-
[CommandCodes.OpenFileLocation] = new OpenFileLocationAction(),
483-
[CommandCodes.PlayAll] = new PlayAllAction(),
484-
[CommandCodes.GitFetch] = new GitFetchAction(),
485-
[CommandCodes.GitInit] = new GitInitAction(),
486-
[CommandCodes.GitPull] = new GitPullAction(),
487-
[CommandCodes.GitPush] = new GitPushAction(),
488-
[CommandCodes.GitSync] = new GitSyncAction(),
489-
[CommandCodes.OpenAllTaggedItems] = new OpenAllTaggedActions(),
490-
>>>>>>> origin/main
344+
[CommandCodes.OpenAllTaggedItems] = new DebouncedActionDecorator(new OpenAllTaggedActions()),
491345
};
492346

493347
private void UpdateHotKeys()

0 commit comments

Comments
 (0)