A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed bug
Etienne Baudouxc62752b575af
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.csindex ce530d755..c20c6358c 100644--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs@@ -33,7 +33,7 @@ public sealed partial class GuiToolProvidershortDisplayTitleResourceName: "N/A",longDisplayTitleResourceName: nameof(MainMenu.SearchNoResultsFound),resourceManagerAssemblyIdentifier: nameof(DevToysLocalizationResourceManagerAssemblyIdentifier),- resourceManagerBaseName: "DevToys.Localization.Strings.MainWindow.MainWindow")),+ resourceManagerBaseName: "DevToys.Localization.Strings.MainMenu.MainMenu")),typeof(DevToysLocalizationResourceManagerAssemblyIdentifier).Assembly),showLongDisplayTitle: true);diff --git a/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs b/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.csindex fa178e72d..587039c2f 100644--- a/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs+++ b/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs@@ -22,15 +22,15 @@ public sealed class GuiToolMetadata : IOrderableMetadatareturn new GuiToolMetadata(new Dictionary<string, object>{- { nameof(NameAttribute.InternalComponentName), "NoSearchResult" },- { nameof(AuthorAttribute.Author), "DevToys" },- { nameof(ToolDisplayInformationAttribute.IconFontName), "FluentSystemIcons" },- { nameof(ToolDisplayInformationAttribute.IconGlyph), "\uF3E9" },- { nameof(ToolDisplayInformationAttribute.GroupName), "N/A" },- { nameof(ToolDisplayInformationAttribute.ShortDisplayTitleResourceName), "N/A" },- { nameof(ToolDisplayInformationAttribute.LongDisplayTitleResourceName), nameof(MainMenu.SearchNoResultsFound) },- { nameof(ToolDisplayInformationAttribute.ResourceManagerAssemblyIdentifier), nameof(DevToysLocalizationResourceManagerAssemblyIdentifier) },- { nameof(ToolDisplayInformationAttribute.ResourceManagerBaseName), "DevToys.Localization.Strings.MainWindow.MainWindow" }+ { nameof(NameAttribute.InternalComponentName), internalComponentName },+ { nameof(AuthorAttribute.Author), author },+ { nameof(ToolDisplayInformationAttribute.IconFontName), iconFontName },+ { nameof(ToolDisplayInformationAttribute.IconGlyph), iconGlyph },+ { nameof(ToolDisplayInformationAttribute.GroupName),groupName },+ { nameof(ToolDisplayInformationAttribute.ShortDisplayTitleResourceName), shortDisplayTitleResourceName },+ { nameof(ToolDisplayInformationAttribute.LongDisplayTitleResourceName), longDisplayTitleResourceName },+ { nameof(ToolDisplayInformationAttribute.ResourceManagerAssemblyIdentifier), resourceManagerAssemblyIdentifier },+ { nameof(ToolDisplayInformationAttribute.ResourceManagerBaseName), resourceManagerBaseName }});}@@ -61,8 +61,11 @@ public sealed class GuiToolMetadata : IOrderableMetadataGuard.IsNotNullOrWhiteSpace(Author);Guard.IsNotNullOrWhiteSpace(IconFontName);Guard.IsNotNullOrWhiteSpace(IconGlyph);- Guard.IsNotNullOrWhiteSpace(GroupName);Guard.IsNotNullOrWhiteSpace(ShortDisplayTitleResourceName);+ if (MenuPlacement != Api.MenuPlacement.Footer)+ {+ Guard.IsNotNullOrWhiteSpace(GroupName);+ }if (!string.IsNullOrEmpty(ShortDisplayTitleResourceName)|| !string.IsNullOrEmpty(LongDisplayTitleResourceName)diff --git a/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.csindex b8cc95dea..da30d3388 100644--- a/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs+++ b/src/app/dev/DevToys.UI/ViewModels/ToolPageViewModel.cs@@ -35,7 +35,15 @@ internal sealed partial class ToolPageViewModel : ObservableRecipientGuard.IsNotNull(guiToolViewItem);_guiToolViewItem = guiToolViewItem;- HeaderText = guiToolViewItem.ToolInstance.LongDisplayTitle;++ if (string.IsNullOrWhiteSpace(guiToolViewItem.ToolInstance.LongDisplayTitle))+ {+ HeaderText = guiToolViewItem.ToolInstance.ShortDisplayTitle;+ }+ else+ {+ HeaderText = guiToolViewItem.ToolInstance.LongDisplayTitle;+ }}/// <summary>