Cleanup

yaira2 · yaira2 · commit 34c4ec785454 · 2024-11-18T16:37:53.000-05:00
diff --git a/src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs b/src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs
@@ -18,8 +18,7 @@ public string Description
 
 		public virtual bool IsExecutable =>
 			ContentPageContext.SelectedItem is not null &&
-			ContentPageContext.SelectedItem.IsFolder &&
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewPane;
+			ContentPageContext.SelectedItem.IsFolder;
 
 		public virtual bool IsAccessibleGlobally
 			=> true;
diff --git a/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromHomeAction.cs b/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromHomeAction.cs
@@ -6,7 +6,6 @@ namespace Files.App.Actions
 	internal sealed class OpenInNewPaneFromHomeAction : BaseOpenInNewPaneAction
 	{
 		public override bool IsExecutable =>
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewPane &&
 			HomePageContext.IsAnyItemRightClicked &&
 			HomePageContext.RightClickedItem is not null &&
 			(HomePageContext.RightClickedItem is WidgetFileTagCardItem fileTagItem
diff --git a/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewPane/OpenInNewPaneFromSidebarAction.cs
@@ -6,7 +6,6 @@ namespace Files.App.Actions
 	internal sealed class OpenInNewPaneFromSidebarAction : BaseOpenInNewPaneAction
 	{
 		public override bool IsExecutable =>
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewPane &&
 			SidebarContext.IsItemRightClicked &&
 			SidebarContext.RightClickedItem is not null &&
 			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem;
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs
@@ -27,8 +27,7 @@ ContentPageContext.ShellPage is not null &&
 			ContentPageContext.ShellPage.SlimContentPage is not null &&
 			ContentPageContext.SelectedItems.Count is not 0 &&
 			ContentPageContext.SelectedItems.Count <= 5 &&
-			ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count &&
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewTab;
+			ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;
 
 		public BaseOpenInNewTabAction()
 		{
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromHomeAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromHomeAction.cs
@@ -6,7 +6,6 @@ namespace Files.App.Actions
 	internal sealed class OpenInNewTabFromHomeAction : BaseOpenInNewTabAction
 	{
 		public override bool IsExecutable =>
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewTab &&
 			HomePageContext.IsAnyItemRightClicked &&
 			HomePageContext.RightClickedItem is not null &&
 			(HomePageContext.RightClickedItem is WidgetFileTagCardItem fileTagItem
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs
@@ -6,7 +6,6 @@ namespace Files.App.Actions
 	internal sealed class OpenInNewTabFromSidebarAction : BaseOpenInNewTabAction
 	{
 		public override bool IsExecutable =>
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewTab &&
 			SidebarContext.IsItemRightClicked &&
 			SidebarContext.RightClickedItem is not null &&
 			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem;
diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs
@@ -32,8 +32,7 @@ ContentPageContext.ShellPage is not null &&
 			ContentPageContext.ShellPage.SlimContentPage is not null &&
 			ContentPageContext.SelectedItems.Count is not 0 &&
 			ContentPageContext.SelectedItems.Count <= 5 &&
-			ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count &&
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow;
+			ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;
 
 		public BaseOpenInNewWindowAction()
 		{
diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromHomeAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromHomeAction.cs
@@ -9,7 +9,6 @@ public override HotKey HotKey
 			=> HotKey.None;
 
 		public override bool IsExecutable =>
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow &&
 			HomePageContext.IsAnyItemRightClicked &&
 			HomePageContext.RightClickedItem is not null &&
 			(HomePageContext.RightClickedItem is WidgetFileTagCardItem fileTagItem
diff --git a/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewWindow/OpenInNewWindowFromSidebarAction.cs
@@ -9,7 +9,6 @@ public override HotKey HotKey
 			=> HotKey.None;
 
 		public override bool IsExecutable =>
-			UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow &&
 			SidebarContext.IsItemRightClicked &&
 			SidebarContext.RightClickedItem is not null &&
 			SidebarContext.RightClickedItem.MenuOptions.IsLocationItem;
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -407,9 +407,18 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					ShowItem = itemsSelected && showOpenItemWith
 				},
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenFileLocation).Build(),
-				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabAction).Build(),
-				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowAction).Build(),
-				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneAction).Build(),
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabAction)
+				{
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+				}.Build(),
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowAction)
+				{
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+				}.Build(),
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneAction)
+				{
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+				}.Build(),
 				new ContextMenuFlyoutItemViewModel()
 				{
 					Text = "BaseLayoutItemContextFlyoutSetAs/Text".GetLocalizedResource(),

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace Files.App.Actions`
`6`	`6`	`internal sealed class OpenInNewPaneFromHomeAction : BaseOpenInNewPaneAction`
`7`	`7`	`{`
`8`	`8`	`public override bool IsExecutable =>`
`9`		`- UserSettingsService.GeneralSettingsService.ShowOpenInNewPane &&`
`10`	`9`	`HomePageContext.IsAnyItemRightClicked &&`
`11`	`10`	`HomePageContext.RightClickedItem is not null &&`
`12`	`11`	`(HomePageContext.RightClickedItem is WidgetFileTagCardItem fileTagItem`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ ContentPageContext.ShellPage is not null &&`
`27`	`27`	`ContentPageContext.ShellPage.SlimContentPage is not null &&`
`28`	`28`	`ContentPageContext.SelectedItems.Count is not 0 &&`
`29`	`29`	`ContentPageContext.SelectedItems.Count <= 5 &&`
`30`		`- ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count &&`
`31`		`- UserSettingsService.GeneralSettingsService.ShowOpenInNewTab;`
	`30`	`+ ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;`
`32`	`31`
`33`	`32`	`public BaseOpenInNewTabAction()`
`34`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace Files.App.Actions`
`6`	`6`	`internal sealed class OpenInNewTabFromHomeAction : BaseOpenInNewTabAction`
`7`	`7`	`{`
`8`	`8`	`public override bool IsExecutable =>`
`9`		`- UserSettingsService.GeneralSettingsService.ShowOpenInNewTab &&`
`10`	`9`	`HomePageContext.IsAnyItemRightClicked &&`
`11`	`10`	`HomePageContext.RightClickedItem is not null &&`
`12`	`11`	`(HomePageContext.RightClickedItem is WidgetFileTagCardItem fileTagItem`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace Files.App.Actions`
`6`	`6`	`internal sealed class OpenInNewTabFromSidebarAction : BaseOpenInNewTabAction`
`7`	`7`	`{`
`8`	`8`	`public override bool IsExecutable =>`
`9`		`- UserSettingsService.GeneralSettingsService.ShowOpenInNewTab &&`
`10`	`9`	`SidebarContext.IsItemRightClicked &&`
`11`	`10`	`SidebarContext.RightClickedItem is not null &&`
`12`	`11`	`SidebarContext.RightClickedItem.MenuOptions.IsLocationItem;`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ ContentPageContext.ShellPage is not null &&`
`32`	`32`	`ContentPageContext.ShellPage.SlimContentPage is not null &&`
`33`	`33`	`ContentPageContext.SelectedItems.Count is not 0 &&`
`34`	`34`	`ContentPageContext.SelectedItems.Count <= 5 &&`
`35`		`- ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count &&`
`36`		`- UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow;`
	`35`	`+ ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;`
`37`	`36`
`38`	`37`	`public BaseOpenInNewWindowAction()`
`39`	`38`	`{`