Feature: Apply show checkboxes option to the grid view as well (#12087)

hishitetsu · web-flow · commit 63352bf31c45 · 2023-04-16T22:54:45.000-04:00
diff --git a/src/Files.App/ServicesImplementation/Settings/FoldersSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/FoldersSettingsService.cs
@@ -274,7 +274,7 @@ public bool ShowFileExtensionWarning
 			set => Set(value);
 		}
 
-		public bool ShowCheckboxesInDetailsLayout
+		public bool ShowCheckboxesWhenSelectingItems
 		{
 			get => Get(true);
 			set => Set(value);
@@ -311,7 +311,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(SelectFilesOnHover):
 				case nameof(DoubleClickToGoUp):
 				case nameof(ShowFileExtensionWarning):
-				case nameof(ShowCheckboxesInDetailsLayout):
+				case nameof(ShowCheckboxesWhenSelectingItems):
 					Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
 					break;
 			}
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -3181,7 +3181,7 @@
   <data name="MoveFileWithoutProperties" xml:space="preserve">
     <value>Are you sure you want to move these files without their properties?</value>
   </data>
-  <data name="ShowCheckboxesInDetailsLayout" xml:space="preserve">
-    <value>Show checkboxes when selecting items in the details layout</value>
+  <data name="ShowCheckboxesWhenSelectingItems" xml:space="preserve">
+    <value>Show checkboxes when selecting items</value>
   </data>
 </root>
diff --git a/src/Files.App/ViewModels/ItemViewModel.cs b/src/Files.App/ViewModels/ItemViewModel.cs
@@ -505,7 +505,7 @@ private async void UserSettingsService_OnSettingChangedEvent(object? sender, Set
 				case nameof(UserSettingsService.FoldersSettingsService.ShowDotFiles):
 				case nameof(UserSettingsService.FoldersSettingsService.CalculateFolderSizes):
 				case nameof(UserSettingsService.FoldersSettingsService.SelectFilesOnHover):
-				case nameof(UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout):
+				case nameof(UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems):
 					await dispatcherQueue.EnqueueAsync(() =>
 					{
 						if (WorkingDirectory != "Home")
diff --git a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
@@ -421,14 +421,14 @@ public bool ShowFileExtensionWarning
 			}
 		}
 
-		public bool ShowCheckboxesInDetailsLayout
+		public bool ShowCheckboxesWhenSelectingItems
 		{
-			get => UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout;
+			get => UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems;
 			set
 			{
-				if (value != UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout)
+				if (value != UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems)
 				{
-					UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout = value;
+					UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems = value;
 
 					OnPropertyChanged();
 				}
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
@@ -814,9 +814,9 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
 			if (sender is ListViewItem control && control.FindDescendant<UserControl>() is UserControl userControl)
 			{
 				// Handle visual states
-				// Show checkboxes when hovering of the thumbnail as long as one item is selected (regardless of the setting to hide them)
 				// Show checkboxes when items are selected (as long as the setting is enabled)
-				if (UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout && control.IsSelected
+				// Show checkboxes when hovering of the thumbnail (regardless of the setting to hide them)
+				if (UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems && control.IsSelected
 					|| isPointerOver || (control.FindDescendant("SelectionCheckbox") as CheckBox)!.IsPointerOver)
 					VisualStateManager.GoToState(userControl, "ShowCheckbox", true);
 				else
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
@@ -507,7 +507,10 @@ private void UpdateCheckboxVisibility(object sender, bool? isPointerOver = null)
 				if (isPointerOver.HasValue)
 					control.SetValue(IsPointerOverProperty, isPointerOver);
 				// Handle visual states
-				if (control.IsSelected || control.GetValue(IsPointerOverProperty) is not false)
+				// Show checkboxes when items are selected (as long as the setting is enabled)
+				// Show checkboxes when hovering of the item (regardless of the setting to hide them)
+				if (UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems && control.IsSelected
+					|| control.GetValue(IsPointerOverProperty) is not false)
 					VisualStateManager.GoToState(userControl, "ShowCheckbox", true);
 				else
 					VisualStateManager.GoToState(userControl, "HideCheckbox", true);
diff --git a/src/Files.App/Views/Settings/FoldersPage.xaml b/src/Files.App/Views/Settings/FoldersPage.xaml
@@ -238,14 +238,14 @@
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</local:SettingsBlockControl>
 
-			<!--  Show Checkboxes in the Details Layout  -->
-			<local:SettingsBlockControl Title="{helpers:ResourceString Name=ShowCheckboxesInDetailsLayout}" HorizontalAlignment="Stretch">
+			<!--  Show Checkboxes When Selecting Items  -->
+			<local:SettingsBlockControl Title="{helpers:ResourceString Name=ShowCheckboxesWhenSelectingItems}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
 					<FontIcon Glyph="&#xE73A;" />
 				</local:SettingsBlockControl.Icon>
 				<ToggleSwitch
-					AutomationProperties.Name="{helpers:ResourceString Name=ShowCheckboxesInDetailsLayout}"
-					IsOn="{x:Bind ViewModel.ShowCheckboxesInDetailsLayout, Mode=TwoWay}"
+					AutomationProperties.Name="{helpers:ResourceString Name=ShowCheckboxesWhenSelectingItems}"
+					IsOn="{x:Bind ViewModel.ShowCheckboxesWhenSelectingItems, Mode=TwoWay}"
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</local:SettingsBlockControl>
 
diff --git a/src/Files.Backend/Services/Settings/IFoldersSettingsService.cs b/src/Files.Backend/Services/Settings/IFoldersSettingsService.cs
@@ -196,8 +196,8 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty
 		bool ShowFileExtensionWarning { get; set; }
 
 		/// <summary>
-		/// Gets or sets a value indicating whether or not to show checkboxes when selecting items in the details layout.
+		/// Gets or sets a value indicating whether or not to show checkboxes when selecting items.
 		/// </summary>
-		bool ShowCheckboxesInDetailsLayout { get; set; }
+		bool ShowCheckboxesWhenSelectingItems { get; set; }
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public bool ShowFileExtensionWarning`
`274`	`274`	`set => Set(value);`
`275`	`275`	`}`
`276`	`276`
`277`		`- public bool ShowCheckboxesInDetailsLayout`
	`277`	`+ public bool ShowCheckboxesWhenSelectingItems`
`278`	`278`	`{`
`279`	`279`	`get => Get(true);`
`280`	`280`	`set => Set(value);`
`@@ -311,7 +311,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged`
`311`	`311`	`case nameof(SelectFilesOnHover):`
`312`	`312`	`case nameof(DoubleClickToGoUp):`
`313`	`313`	`case nameof(ShowFileExtensionWarning):`
`314`		`- case nameof(ShowCheckboxesInDetailsLayout):`
	`314`	`+ case nameof(ShowCheckboxesWhenSelectingItems):`
`315`	`315`	`Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");`
`316`	`316`	`break;`
`317`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ private async void UserSettingsService_OnSettingChangedEvent(object? sender, Set`
`505`	`505`	`case nameof(UserSettingsService.FoldersSettingsService.ShowDotFiles):`
`506`	`506`	`case nameof(UserSettingsService.FoldersSettingsService.CalculateFolderSizes):`
`507`	`507`	`case nameof(UserSettingsService.FoldersSettingsService.SelectFilesOnHover):`
`508`		`- case nameof(UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout):`
	`508`	`+ case nameof(UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems):`
`509`	`509`	`await dispatcherQueue.EnqueueAsync(() =>`
`510`	`510`	`{`
`511`	`511`	`if (WorkingDirectory != "Home")`
Original file line number	Diff line number	Diff line change
`@@ -421,14 +421,14 @@ public bool ShowFileExtensionWarning`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`
`424`		`- public bool ShowCheckboxesInDetailsLayout`
	`424`	`+ public bool ShowCheckboxesWhenSelectingItems`
`425`	`425`	`{`
`426`		`- get => UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout;`
	`426`	`+ get => UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems;`
`427`	`427`	`set`
`428`	`428`	`{`
`429`		`- if (value != UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout)`
	`429`	`+ if (value != UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems)`
`430`	`430`	`{`
`431`		`- UserSettingsService.FoldersSettingsService.ShowCheckboxesInDetailsLayout = value;`
	`431`	`+ UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems = value;`
`432`	`432`
`433`	`433`	`OnPropertyChanged();`
`434`	`434`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,8 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty`
`196`	`196`	`bool ShowFileExtensionWarning { get; set; }`
`197`	`197`
`198`	`198`	`/// <summary>`
`199`		`- /// Gets or sets a value indicating whether or not to show checkboxes when selecting items in the details layout.`
	`199`	`+ /// Gets or sets a value indicating whether or not to show checkboxes when selecting items.`
`200`	`200`	`/// </summary>`
`201`		`- bool ShowCheckboxesInDetailsLayout { get; set; }`
	`201`	`+ bool ShowCheckboxesWhenSelectingItems { get; set; }`
`202`	`202`	`}`
`203`	`203`	`}`