From 4b415a4c7994605405e9460e66ce4bb9afb80664 Mon Sep 17 00:00:00 2001 From: Archit Bajpai Date: Wed, 22 Jul 2020 17:09:06 +0530 Subject: [PATCH 1/4] Separate Directory and DirectoryBackground --- src/DesktopIntegration/Windows/ContextMenu.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/DesktopIntegration/Windows/ContextMenu.cs b/src/DesktopIntegration/Windows/ContextMenu.cs index 61dc5d7ff..3860e4b95 100644 --- a/src/DesktopIntegration/Windows/ContextMenu.cs +++ b/src/DesktopIntegration/Windows/ContextMenu.cs @@ -31,6 +31,9 @@ public static class ContextMenu /// The HKCU registry key for registering things for all directories. public const string RegKeyClassesDirectories = "Directory"; + + /// The HKCU registry key for registering things for all directories backgrounds. + public const string RegKeyClassesDirectoriesBackground = RegKeyClassesDirectories + @"\Background"; /// The HKCU registry key for registering things for all filesystem objects (files and directories). public const string RegKeyClassesAll = "AllFilesystemObjects"; @@ -43,7 +46,8 @@ private static IEnumerable GetKeyName(ContextMenuTarget target) { ContextMenuTarget.Files => new[] {RegKeyClassesFiles}, ContextMenuTarget.ExecutableFiles => RegKeyClassesExecutableFiles, - ContextMenuTarget.Directories => new[] {RegKeyClassesDirectories, RegKeyClassesDirectories + @"\Background"}, + ContextMenuTarget.Directories => RegKeyClassesDirectories, + ContextMenuTarget.DirectoriesBackground => RegKeyClassesDirectoriesBackground, ContextMenuTarget.All => new[] {RegKeyClassesAll}, _ => new[] {RegKeyClassesFiles} }; From aef12981165b9b5c491cb512cfd756d7c19b3b63 Mon Sep 17 00:00:00 2001 From: Archit Bajpai Date: Thu, 23 Jul 2020 15:21:00 +0530 Subject: [PATCH 2/4] Add background option Add background option for separate directory and background. --- src/Model/Capabilities/ContextMenu.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Model/Capabilities/ContextMenu.cs b/src/Model/Capabilities/ContextMenu.cs index 45c78a472..5bb21ed9a 100644 --- a/src/Model/Capabilities/ContextMenu.cs +++ b/src/Model/Capabilities/ContextMenu.cs @@ -27,6 +27,10 @@ public enum ContextMenuTarget /// The context menu entry is displayed for all directories. [XmlEnum("directories")] Directories, + + /// The context menu entry is displayed for all directories. + [XmlEnum("background")] + Background, /// The context menu entry is displayed for all filesystem objects (files and directories). [XmlEnum("all")] From 25d5fa8c64b9efc46b4c86285c9abbbbaacda2ae Mon Sep 17 00:00:00 2001 From: Archit Bajpai Date: Thu, 23 Jul 2020 15:22:50 +0530 Subject: [PATCH 3/4] Change TargetName Change target name from directorybackground to only background to keep naming consistent across the source code. --- src/DesktopIntegration/Windows/ContextMenu.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DesktopIntegration/Windows/ContextMenu.cs b/src/DesktopIntegration/Windows/ContextMenu.cs index 3860e4b95..d644ce76e 100644 --- a/src/DesktopIntegration/Windows/ContextMenu.cs +++ b/src/DesktopIntegration/Windows/ContextMenu.cs @@ -33,7 +33,7 @@ public static class ContextMenu public const string RegKeyClassesDirectories = "Directory"; /// The HKCU registry key for registering things for all directories backgrounds. - public const string RegKeyClassesDirectoriesBackground = RegKeyClassesDirectories + @"\Background"; + public const string RegKeyClassesBackground = RegKeyClassesDirectories + @"\Background"; /// The HKCU registry key for registering things for all filesystem objects (files and directories). public const string RegKeyClassesAll = "AllFilesystemObjects"; @@ -47,7 +47,7 @@ private static IEnumerable GetKeyName(ContextMenuTarget target) ContextMenuTarget.Files => new[] {RegKeyClassesFiles}, ContextMenuTarget.ExecutableFiles => RegKeyClassesExecutableFiles, ContextMenuTarget.Directories => RegKeyClassesDirectories, - ContextMenuTarget.DirectoriesBackground => RegKeyClassesDirectoriesBackground, + ContextMenuTarget.Background => RegKeyClassesBackground, ContextMenuTarget.All => new[] {RegKeyClassesAll}, _ => new[] {RegKeyClassesFiles} }; From 349cd208de341148287ebadd3f7c80e95629b97c Mon Sep 17 00:00:00 2001 From: Archit Bajpai Date: Fri, 24 Jul 2020 18:12:05 +0530 Subject: [PATCH 4/4] string error update --- src/DesktopIntegration/Windows/ContextMenu.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DesktopIntegration/Windows/ContextMenu.cs b/src/DesktopIntegration/Windows/ContextMenu.cs index d644ce76e..fdf474aa5 100644 --- a/src/DesktopIntegration/Windows/ContextMenu.cs +++ b/src/DesktopIntegration/Windows/ContextMenu.cs @@ -46,8 +46,8 @@ private static IEnumerable GetKeyName(ContextMenuTarget target) { ContextMenuTarget.Files => new[] {RegKeyClassesFiles}, ContextMenuTarget.ExecutableFiles => RegKeyClassesExecutableFiles, - ContextMenuTarget.Directories => RegKeyClassesDirectories, - ContextMenuTarget.Background => RegKeyClassesBackground, + ContextMenuTarget.Directories => new[] {RegKeyClassesDirectories}, + ContextMenuTarget.Background => new[] {RegKeyClassesBackground}, ContextMenuTarget.All => new[] {RegKeyClassesAll}, _ => new[] {RegKeyClassesFiles} };