Change "Friendly name" to just "Name"

ferrariofilippo · ferrariofilippo · commit 61c95db81475 · 2025-02-23T22:37:21.000+01:00
diff --git a/src/Files.App/Actions/Open/OpenInIDEAction.cs b/src/Files.App/Actions/Open/OpenInIDEAction.cs
@@ -12,12 +12,12 @@ internal sealed partial class OpenInIDEAction : ObservableObject, IAction
 		public string Label
 			=> string.Format(
 				"OpenInIDE".GetLocalizedResource(),
-				_devToolsSettingsService.IDEFriendlyName);
+				_devToolsSettingsService.IDEName);
 
 		public string Description
 			=> string.Format(
 				"OpenInIDEDescription".GetLocalizedResource(),
-				_devToolsSettingsService.IDEFriendlyName);
+				_devToolsSettingsService.IDEName);
 
 		public bool IsExecutable =>
 			_context.Folder is not null &&
@@ -39,7 +39,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			);
 
 			if (!res)
-				await DynamicDialogFactory.ShowFor_IDEErrorDialog(_devToolsSettingsService.IDEFriendlyName);
+				await DynamicDialogFactory.ShowFor_IDEErrorDialog(_devToolsSettingsService.IDEName);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -54,7 +54,7 @@ private void DevSettings_PropertyChanged(object? sender, PropertyChangedEventArg
 			{
 				OnPropertyChanged(nameof(IsExecutable));
 			}
-			else if (e.PropertyName == nameof(IDevToolsSettingsService.IDEFriendlyName))
+			else if (e.PropertyName == nameof(IDevToolsSettingsService.IDEName))
 			{
 				OnPropertyChanged(nameof(Label));
 				OnPropertyChanged(nameof(Description));
diff --git a/src/Files.App/Actions/Open/OpenRepoInIDEAction.cs b/src/Files.App/Actions/Open/OpenRepoInIDEAction.cs
@@ -10,10 +10,10 @@ internal sealed partial class OpenRepoInIDEAction : ObservableObject, IAction
 		private readonly IContentPageContext _context;
 
 		public string Label
-			=> string.Format("OpenRepoInIDE".GetLocalizedResource(), _devToolsSettingsService.IDEFriendlyName);
+			=> string.Format("OpenRepoInIDE".GetLocalizedResource(), _devToolsSettingsService.IDEName);
 
 		public string Description
-			=> string.Format("OpenRepoInIDEDescription".GetLocalizedResource(), _devToolsSettingsService.IDEFriendlyName);
+			=> string.Format("OpenRepoInIDEDescription".GetLocalizedResource(), _devToolsSettingsService.IDEName);
 
 		public bool IsExecutable =>
 			_context.Folder is not null &&
@@ -36,7 +36,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			);
 
 			if (!res)
-				await DynamicDialogFactory.ShowFor_IDEErrorDialog(_devToolsSettingsService.IDEFriendlyName);
+				await DynamicDialogFactory.ShowFor_IDEErrorDialog(_devToolsSettingsService.IDEName);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -51,7 +51,7 @@ private void DevSettings_PropertyChanged(object? sender, PropertyChangedEventArg
 			{
 				OnPropertyChanged(nameof(IsExecutable));
 			}
-			else if (e.PropertyName == nameof(IDevToolsSettingsService.IDEFriendlyName))
+			else if (e.PropertyName == nameof(IDevToolsSettingsService.IDEName))
 			{
 				OnPropertyChanged(nameof(Label));
 				OnPropertyChanged(nameof(Description));
diff --git a/src/Files.App/Data/Contracts/IDevToolsSettingsService.cs b/src/Files.App/Data/Contracts/IDevToolsSettingsService.cs
@@ -16,8 +16,8 @@ public interface IDevToolsSettingsService : IBaseSettingsService, INotifyPropert
 		string IDEPath { get; set; }
 
 		/// <summary>
-		/// Gets or sets the friendly name of the chosen IDE.
+		/// Gets or sets the name of the chosen IDE.
 		/// </summary>
-		string IDEFriendlyName { get; set; }
+		string IDEName { get; set; }
 	}
 }
diff --git a/src/Files.App/Services/Settings/DevToolsSettingsService.cs b/src/Files.App/Services/Settings/DevToolsSettingsService.cs
@@ -26,7 +26,7 @@ public string IDEPath
 		}
 
 		/// <inheritdoc/>
-		public string IDEFriendlyName
+		public string IDEName
 		{
 			get => Get(SoftwareHelpers.IsVSCodeInstalled() ? Strings.VisualStudioCode.GetLocalizedResource() : string.Empty) ?? string.Empty;
 			set => Set(value);
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -4043,9 +4043,6 @@
     <value>Add to shelf</value>
     <comment>Tooltip that displays when dragging items to the Shelf Pane</comment>
   </data>
-  <data name="FriendlyName" xml:space="preserve">
-    <value>Friendly name</value>
-  </data>
   <data name="PathOrAlias" xml:space="preserve">
     <value>Path or alias</value>
   </data>
@@ -4070,7 +4067,7 @@
   <data name="IDEPathPlaceholder" xml:space="preserve">
     <value>Enter a path or launch alias</value>
   </data>
-  <data name="InvalidFriendlyNameError" xml:space="preserve">
+  <data name="InvalidIDENameError" xml:space="preserve">
     <value>Please, enter a name for the IDE</value>
   </data>
 </root>
diff --git a/src/Files.App/ViewModels/Settings/DevToolsViewModel.cs b/src/Files.App/ViewModels/Settings/DevToolsViewModel.cs
@@ -37,7 +37,7 @@ public bool IsEditingIDEConfig
 		}
 
 		public bool CanSaveIDEChanges =>
-			IsFriendlyNameValid && IsIDEPathValid;
+			IsIDENameValid && IsIDEPathValid;
 
 		private bool _IsIDEPathValid;
 		public bool IsIDEPathValid
@@ -46,11 +46,11 @@ public bool IsIDEPathValid
 			set => SetProperty(ref _IsIDEPathValid, value);
 		}
 
-		private bool _IsFriendlyNameValid;
-		public bool IsFriendlyNameValid
+		private bool _IsIDENameValid;
+		public bool IsIDENameValid
 		{
-			get => _IsFriendlyNameValid;
-			set => SetProperty(ref _IsFriendlyNameValid, value);
+			get => _IsIDENameValid;
+			set => SetProperty(ref _IsIDENameValid, value);
 		}
 
 		private string _IDEPath;
@@ -72,15 +72,15 @@ public string IDEPath
 			}
 		}
 
-		private string _IDEFriendlyName;
-		public string IDEFriendlyName
+		private string _IDEName;
+		public string IDEName
 		{
-			get => _IDEFriendlyName;
+			get => _IDEName;
 			set
 			{
-				if (SetProperty(ref _IDEFriendlyName, value))
+				if (SetProperty(ref _IDEName, value))
 				{
-					IsFriendlyNameValid = !string.IsNullOrEmpty(value);
+					IsIDENameValid = !string.IsNullOrEmpty(value);
 					OnPropertyChanged(nameof(CanSaveIDEChanges));
 				}
 			}
@@ -94,9 +94,9 @@ public DevToolsViewModel()
 			SelectedOpenInIDEOption = OpenInIDEOptions[DevToolsSettingsService.OpenInIDEOption];
 
 			IDEPath = DevToolsSettingsService.IDEPath;
-			IDEFriendlyName = DevToolsSettingsService.IDEFriendlyName;
+			IDEName = DevToolsSettingsService.IDEName;
 			IsIDEPathValid = true;
-			IsFriendlyNameValid = true;
+			IsIDENameValid = true;
 
 			IsLogoutEnabled = GitHelpers.GetSavedCredentials() != string.Empty;
 
@@ -141,18 +141,18 @@ private void DoCancelIDEChanges()
 		{
 			IsEditingIDEConfig = false;
 			IDEPath = DevToolsSettingsService.IDEPath;
-			IDEFriendlyName = DevToolsSettingsService.IDEFriendlyName;
+			IDEName = DevToolsSettingsService.IDEName;
 			IsIDEPathValid = true;
-			IsFriendlyNameValid = true;
+			IsIDENameValid = true;
 		}
 
 		private void DoSaveIDEChanges()
 		{
 			IsEditingIDEConfig = false;
 			IsIDEPathValid = true;
-			IsFriendlyNameValid = true;
+			IsIDENameValid = true;
 			DevToolsSettingsService.IDEPath = IDEPath;
-			DevToolsSettingsService.IDEFriendlyName = IDEFriendlyName;
+			DevToolsSettingsService.IDEName = IDEName;
 		}
 
 		private void DoStartEditingIDE()
diff --git a/src/Files.App/Views/Settings/DevToolsPage.xaml b/src/Files.App/Views/Settings/DevToolsPage.xaml
@@ -77,44 +77,44 @@
 								<RowDefinition Height="*" />
 							</Grid.RowDefinitions>
 
-							<!--  IDE Friendly Name  -->
+							<!--  IDE Name  -->
 							<TextBlock
-								x:Name="IDEFriendlyName"
+								x:Name="IDEName"
 								MaxWidth="200"
 								VerticalAlignment="Center"
 								x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
 								LineHeight="18"
-								Text="{helpers:ResourceString Name=FriendlyName}"
+								Text="{helpers:ResourceString Name=Name}"
 								TextTrimming="CharacterEllipsis" />
 
 							<TextBlock
 								Grid.Column="1"
 								VerticalAlignment="Center"
 								FontWeight="SemiBold"
-								Text="{x:Bind ViewModel.IDEFriendlyName, Mode=TwoWay}"
+								Text="{x:Bind ViewModel.IDEName, Mode=TwoWay}"
 								Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource InvertedBoolVisibilityConverter}, Mode=OneWay}" />
 
 							<TextBox
-								x:Name="IDEFriendlyNameTextBox"
+								x:Name="IDENameTextBox"
 								Grid.ColumnSpan="2"
 								Width="300"
 								HorizontalAlignment="Left"
 								VerticalAlignment="Center"
-								PlaceholderText="{helpers:ResourceString Name=FriendlyName}"
-								Text="{x:Bind ViewModel.IDEFriendlyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+								PlaceholderText="{helpers:ResourceString Name=Name}"
+								Text="{x:Bind ViewModel.IDEName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
 								Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
 								<TextBox.Resources>
 									<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 									<TeachingTip
-										x:Name="InvalidFriendlyNameWarning"
-										Title="{helpers:ResourceString Name=InvalidFriendlyNameError}"
+										x:Name="InvalidIDENameWarning"
+										Title="{helpers:ResourceString Name=InvalidIDENameError}"
 										IsLightDismissEnabled="True"
-										IsOpen="{x:Bind ViewModel.IsFriendlyNameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+										IsOpen="{x:Bind ViewModel.IsIDENameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
 										PreferredPlacement="Bottom"
-										Target="{x:Bind IDEFriendlyNameTextBox}" />
+										Target="{x:Bind IDENameTextBox}" />
 								</TextBox.Resources>
 								<TextBox.Header>
-									<TextBlock Text="{helpers:ResourceString Name=FriendlyName}" />
+									<TextBlock Text="{helpers:ResourceString Name=Name}" />
 								</TextBox.Header>
 							</TextBox>
 
@@ -254,9 +254,9 @@
 						<Setter Target="IDEPathTextBox.Width" Value="300" />
 						<Setter Target="IDEPathTextBox.HorizontalAlignment" Value="Left" />
 						<Setter Target="IDEPathTextBox.(Grid.Column)" Value="0" />
-						<Setter Target="IDEFriendlyNameTextBox.Width" Value="300" />
-						<Setter Target="IDEFriendlyNameTextBox.HorizontalAlignment" Value="Left" />
-						<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="2" />
+						<Setter Target="IDENameTextBox.Width" Value="300" />
+						<Setter Target="IDENameTextBox.HorizontalAlignment" Value="Left" />
+						<Setter Target="IDENameTextBox.(Grid.ColumnSpan)" Value="2" />
 						<Setter Target="PickIDEExe.(Grid.Column)" Value="1" />
 						<Setter Target="PickIDEExe.(Grid.Row)" Value="0" />
 						<Setter Target="IDEPathGrid.Spacing" Value="8" />
@@ -268,9 +268,9 @@
 						<Setter Target="IDEPathTextBox.Width" Value="Auto" />
 						<Setter Target="IDEPathTextBox.HorizontalAlignment" Value="Stretch" />
 						<Setter Target="IDEPathTextBox.(Grid.Column)" Value="3" />
-						<Setter Target="IDEFriendlyNameTextBox.Width" Value="Auto" />
-						<Setter Target="IDEFriendlyNameTextBox.HorizontalAlignment" Value="Stretch" />
-						<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="3" />
+						<Setter Target="IDENameTextBox.Width" Value="Auto" />
+						<Setter Target="IDENameTextBox.HorizontalAlignment" Value="Stretch" />
+						<Setter Target="IDENameTextBox.(Grid.ColumnSpan)" Value="3" />
 						<Setter Target="PickIDEExe.(Grid.Column)" Value="3" />
 						<Setter Target="PickIDEExe.(Grid.Row)" Value="1" />
 						<Setter Target="IDEPathGrid.Spacing" Value="12" />

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ internal sealed partial class OpenRepoInIDEAction : ObservableObject, IAction`
`10`	`10`	`private readonly IContentPageContext _context;`
`11`	`11`
`12`	`12`	`public string Label`
`13`		`- => string.Format("OpenRepoInIDE".GetLocalizedResource(), _devToolsSettingsService.IDEFriendlyName);`
	`13`	`+ => string.Format("OpenRepoInIDE".GetLocalizedResource(), _devToolsSettingsService.IDEName);`
`14`	`14`
`15`	`15`	`public string Description`
`16`		`- => string.Format("OpenRepoInIDEDescription".GetLocalizedResource(), _devToolsSettingsService.IDEFriendlyName);`
	`16`	`+ => string.Format("OpenRepoInIDEDescription".GetLocalizedResource(), _devToolsSettingsService.IDEName);`
`17`	`17`
`18`	`18`	`public bool IsExecutable =>`
`19`	`19`	`_context.Folder is not null &&`
`@@ -36,7 +36,7 @@ public async Task ExecuteAsync(object? parameter = null)`
`36`	`36`	`);`
`37`	`37`
`38`	`38`	`if (!res)`
`39`		`- await DynamicDialogFactory.ShowFor_IDEErrorDialog(_devToolsSettingsService.IDEFriendlyName);`
	`39`	`+ await DynamicDialogFactory.ShowFor_IDEErrorDialog(_devToolsSettingsService.IDEName);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`@@ -51,7 +51,7 @@ private void DevSettings_PropertyChanged(object? sender, PropertyChangedEventArg`
`51`	`51`	`{`
`52`	`52`	`OnPropertyChanged(nameof(IsExecutable));`
`53`	`53`	`}`
`54`		`- else if (e.PropertyName == nameof(IDevToolsSettingsService.IDEFriendlyName))`
	`54`	`+ else if (e.PropertyName == nameof(IDevToolsSettingsService.IDEName))`
`55`	`55`	`{`
`56`	`56`	`OnPropertyChanged(nameof(Label));`
`57`	`57`	`OnPropertyChanged(nameof(Description));`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public interface IDevToolsSettingsService : IBaseSettingsService, INotifyPropert`
`16`	`16`	`string IDEPath { get; set; }`
`17`	`17`
`18`	`18`	`/// <summary>`
`19`		`- /// Gets or sets the friendly name of the chosen IDE.`
	`19`	`+ /// Gets or sets the name of the chosen IDE.`
`20`	`20`	`/// </summary>`
`21`		`- string IDEFriendlyName { get; set; }`
	`21`	`+ string IDEName { get; set; }`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public string IDEPath`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// <inheritdoc/>`
`29`		`- public string IDEFriendlyName`
	`29`	`+ public string IDEName`
`30`	`30`	`{`
`31`	`31`	`get => Get(SoftwareHelpers.IsVSCodeInstalled() ? Strings.VisualStudioCode.GetLocalizedResource() : string.Empty) ?? string.Empty;`
`32`	`32`	`set => Set(value);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public bool IsEditingIDEConfig`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public bool CanSaveIDEChanges =>`
`40`		`- IsFriendlyNameValid && IsIDEPathValid;`
	`40`	`+ IsIDENameValid && IsIDEPathValid;`
`41`	`41`
`42`	`42`	`private bool _IsIDEPathValid;`
`43`	`43`	`public bool IsIDEPathValid`
`@@ -46,11 +46,11 @@ public bool IsIDEPathValid`
`46`	`46`	`set => SetProperty(ref _IsIDEPathValid, value);`
`47`	`47`	`}`
`48`	`48`
`49`		`- private bool _IsFriendlyNameValid;`
`50`		`- public bool IsFriendlyNameValid`
	`49`	`+ private bool _IsIDENameValid;`
	`50`	`+ public bool IsIDENameValid`
`51`	`51`	`{`
`52`		`- get => _IsFriendlyNameValid;`
`53`		`- set => SetProperty(ref _IsFriendlyNameValid, value);`
	`52`	`+ get => _IsIDENameValid;`
	`53`	`+ set => SetProperty(ref _IsIDENameValid, value);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`private string _IDEPath;`
`@@ -72,15 +72,15 @@ public string IDEPath`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- private string _IDEFriendlyName;`
`76`		`- public string IDEFriendlyName`
	`75`	`+ private string _IDEName;`
	`76`	`+ public string IDEName`
`77`	`77`	`{`
`78`		`- get => _IDEFriendlyName;`
	`78`	`+ get => _IDEName;`
`79`	`79`	`set`
`80`	`80`	`{`
`81`		`- if (SetProperty(ref _IDEFriendlyName, value))`
	`81`	`+ if (SetProperty(ref _IDEName, value))`
`82`	`82`	`{`
`83`		`- IsFriendlyNameValid = !string.IsNullOrEmpty(value);`
	`83`	`+ IsIDENameValid = !string.IsNullOrEmpty(value);`
`84`	`84`	`OnPropertyChanged(nameof(CanSaveIDEChanges));`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -94,9 +94,9 @@ public DevToolsViewModel()`
`94`	`94`	`SelectedOpenInIDEOption = OpenInIDEOptions[DevToolsSettingsService.OpenInIDEOption];`
`95`	`95`
`96`	`96`	`IDEPath = DevToolsSettingsService.IDEPath;`
`97`		`- IDEFriendlyName = DevToolsSettingsService.IDEFriendlyName;`
	`97`	`+ IDEName = DevToolsSettingsService.IDEName;`
`98`	`98`	`IsIDEPathValid = true;`
`99`		`- IsFriendlyNameValid = true;`
	`99`	`+ IsIDENameValid = true;`
`100`	`100`
`101`	`101`	`IsLogoutEnabled = GitHelpers.GetSavedCredentials() != string.Empty;`
`102`	`102`
`@@ -141,18 +141,18 @@ private void DoCancelIDEChanges()`
`141`	`141`	`{`
`142`	`142`	`IsEditingIDEConfig = false;`
`143`	`143`	`IDEPath = DevToolsSettingsService.IDEPath;`
`144`		`- IDEFriendlyName = DevToolsSettingsService.IDEFriendlyName;`
	`144`	`+ IDEName = DevToolsSettingsService.IDEName;`
`145`	`145`	`IsIDEPathValid = true;`
`146`		`- IsFriendlyNameValid = true;`
	`146`	`+ IsIDENameValid = true;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`private void DoSaveIDEChanges()`
`150`	`150`	`{`
`151`	`151`	`IsEditingIDEConfig = false;`
`152`	`152`	`IsIDEPathValid = true;`
`153`		`- IsFriendlyNameValid = true;`
	`153`	`+ IsIDENameValid = true;`
`154`	`154`	`DevToolsSettingsService.IDEPath = IDEPath;`
`155`		`- DevToolsSettingsService.IDEFriendlyName = IDEFriendlyName;`
	`155`	`+ DevToolsSettingsService.IDEName = IDEName;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`private void DoStartEditingIDE()`