A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Main menu now has basic items presentation
Etienne Baudoux6e4311f97600
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs b/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.csindex c7caf5935..b3f88e93d 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/GuiToolGroup.cs@@ -13,7 +13,7 @@/// [ImportingConstructor]/// internal MyGroup()/// {-/// IconFontName = "Fluent System-Regular";+/// IconFontName = "FluentSystemIcons";/// IconGlyph = "\u0108";/// DisplayTitle = Sample.CommandDescription;/// AccessibleName = Sample.CommandDescription;diff --git a/src/app/dev/DevToys.Api/Tool/GUI/IGuiTool.cs b/src/app/dev/DevToys.Api/Tool/GUI/IGuiTool.csindex 6b055cef6..50e2e82c2 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/IGuiTool.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/IGuiTool.cs@@ -13,7 +13,7 @@/// [Name("Base64 Encoder / Decoder")]/// [Author("John Doe")]/// [ToolDisplayInformation(-/// IconFontName = "Fluent System-Regular",+/// IconFontName = "FluentSystemIcons",/// IconGlyph = "\u0108",/// GroupName = "Encoders / Decoders", // <seealso cref="GuiToolGroup"/>/// ResourceManagerAssemblyIdentifier = nameof(MyResourceManagerAssemblyIdentifier), // <seealso cref="IResourceManagerAssemblyIdentifier"/>diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.csindex 6a497778e..c1d24e726 100644--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs@@ -263,7 +263,7 @@ public sealed partial class GuiToolProvider{// "All tools" menu item.yield return new GroupViewItem(- iconFontName: "FluentSystemIcons-Regular",+ iconFontName: "FluentSystemIcons",iconGlyph: "\uF480",displayTitle: MainMenu.AllToolsDisplayTitle,accessibleName: MainMenu.AllToolsAccessibleName);@@ -403,7 +403,7 @@ public sealed partial class GuiToolProviderGuard.IsNull(_favoriteToolsGroupViewItem);_favoriteToolsGroupViewItem= new GroupViewItem(- iconFontName: "FluentSystemIcons-Regular",+ iconFontName: "FluentSystemIcons",iconGlyph: "\uF70F",displayTitle: MainMenu.FavoriteToolsDisplayTitle,accessibleName: MainMenu.FavoriteToolsAccessibleName,diff --git a/src/app/dev/DevToys.Tools/Sample/SampleToolFactory.cs b/src/app/dev/DevToys.Tools/Sample/SampleToolFactory.csindex b34da1e90..ebfd56081 100644--- a/src/app/dev/DevToys.Tools/Sample/SampleToolFactory.cs+++ b/src/app/dev/DevToys.Tools/Sample/SampleToolFactory.cs@@ -39,7 +39,7 @@ internal sealed class SampleCommandLineTool : ICommandLineTool[Name("Sample tool")][Author("John Doe")][ToolDisplayInformation(- IconFontName = "Fluent System-Regular",+ IconFontName = "FluentSystemIcons",IconGlyph = "\u0108",GroupName = "Encoders / Decoders",ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),@@ -65,7 +65,7 @@ internal sealed class EncodersDecodersGroup : GuiToolGroup[ImportingConstructor]internal EncodersDecodersGroup(){- IconFontName = "Fluent System-Regular";+ IconFontName = "FluentSystemIcons";IconGlyph = "\u0108";DisplayTitle = Sample.CommandDescription;AccessibleName = Sample.CommandDescription;diff --git a/src/app/dev/DevToys.UI.Framework/Converters/StringToStaticResourceConverter.cs b/src/app/dev/DevToys.UI.Framework/Converters/StringToStaticResourceConverter.csnew file mode 100644index 000000000..83f53e8ea--- /dev/null+++ b/src/app/dev/DevToys.UI.Framework/Converters/StringToStaticResourceConverter.cs@@ -0,0 +1,33 @@+using Microsoft.UI.Xaml;+using Microsoft.UI.Xaml.Data;++namespace DevToys.UI.Framework.Converters;++/// <summary>+/// Convert a <see cref="string"/> to a static resource declared in the app.+/// </summary>+public sealed class StringToStaticResourceConverter : IValueConverter+{+ public object Convert(object value, Type targetType, object parameter, string language)+ {+ string? valueString = value as string;+ if (!string.IsNullOrEmpty(valueString))+ {+ if (Application.Current.Resources.TryGetValue(valueString, out object? result))+ {+ Guard.IsNotNull(result);+ Guard.IsAssignableToType(result, targetType);+ return result;+ }++ ThrowHelper.ThrowInvalidDataException($"{nameof(StringToStaticResourceConverter)}: Trying to load a XAML static resource '{valueString}' but it can't be found.");+ }++ return DependencyProperty.UnsetValue;+ }++ public object ConvertBack(object value, Type targetType, object parameter, string language)+ {+ throw new NotImplementedException();+ }+}diff --git a/src/app/dev/DevToys.UI.Framework/Themes/Generic.xaml b/src/app/dev/DevToys.UI.Framework/Themes/Generic.xamlindex be7ae2212..ca6501987 100644--- a/src/app/dev/DevToys.UI.Framework/Themes/Generic.xaml+++ b/src/app/dev/DevToys.UI.Framework/Themes/Generic.xaml@@ -23,7 +23,7 @@</ResourceDictionary></ResourceDictionary.ThemeDictionaries>- <FontFamily x:Key="FluentSystemIcons">ms-appx:///Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>+ <FontFamily x:Key="FluentSystemIcons">ms-appx:///DevToys.UI.Framework/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily><!-- Icons. Most of them are from https://github.com/microsoft/fluentui-system-icons/blob/master/icons.md --><x:String x:Key="EnterCompactOverlayPathIconData">M41.6339 8.13376C42.122 7.64561 42.122 6.85415 41.6339 6.36599C41.1457 5.87784 40.3543 5.87784 39.8661 6.36599L29.5002 16.732V7.25C29.5002 6.55964 28.9405 6 28.2502 6C27.5598 6 27.0002 6.55964 27.0002 7.25V19.75C27.0002 20.4404 27.5598 21 28.2502 21H40.75C41.4404 21 42 20.4404 42 19.75C42 19.0596 41.4404 18.5 40.75 18.5H31.2676L41.6339 8.13376ZM8.5 12.25C8.5 10.1789 10.1789 8.5 12.25 8.5H20.1346C20.825 8.5 21.3846 7.94036 21.3846 7.25C21.3846 6.55964 20.825 6 20.1346 6H12.25C8.79822 6 6 8.79822 6 12.25V35.75C6 39.2018 8.79822 42 12.25 42H35.75C39.2018 42 42 39.2018 42 35.75V27.8654C42 27.175 41.4404 26.6154 40.75 26.6154C40.0596 26.6154 39.5 27.175 39.5 27.8654V35.75C39.5 37.8211 37.8211 39.5 35.75 39.5H24V29.2499C24 26.3504 21.6495 23.9999 18.75 23.9999H8.5V12.25ZM8.5 26.4999H18.75C20.2688 26.4999 21.5 27.7311 21.5 29.2499V39.5H12.25C10.1789 39.5 8.5 37.8211 8.5 35.75V26.4999Z</x:String>diff --git a/src/app/dev/DevToys.UI/DataTemplateSelectors/MainMenuNavigationViewMenuItemSelector.cs b/src/app/dev/DevToys.UI/DataTemplateSelectors/MainMenuNavigationViewMenuItemSelector.csnew file mode 100644index 000000000..97335537f--- /dev/null+++ b/src/app/dev/DevToys.UI/DataTemplateSelectors/MainMenuNavigationViewMenuItemSelector.cs@@ -0,0 +1,32 @@+using DevToys.Core.Tools.ViewItems;+using Microsoft.UI.Xaml;+using Microsoft.UI.Xaml.Controls;++namespace DevToys.UI.DataTemplateSelectors;++public sealed class MainMenuNavigationViewMenuItemSelector : DataTemplateSelector+{+ public DataTemplate GuiToolViewItem { get; set; } = null!;++ public DataTemplate GroupViewItem { get; set; } = null!;++ public DataTemplate Separator { get; set; } = null!;++ protected override DataTemplate SelectTemplateCore(object item)+ {+ if (item is GuiToolViewItem)+ {+ return GuiToolViewItem;+ }+ else if (item is GroupViewItem)+ {+ return GroupViewItem;+ }+ else if (item is SeparatorViewItem)+ {+ return Separator;+ }++ throw new NotSupportedException();+ }+}diff --git a/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.csindex 2bd5ccb23..7a918b750 100644--- a/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs+++ b/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs@@ -1,14 +1,29 @@-using CommunityToolkit.Mvvm.ComponentModel;+using System.Collections.ObjectModel;+using CommunityToolkit.Mvvm.ComponentModel;using DevToys.Core.Tools;+using DevToys.Core.Tools.ViewItems;namespace DevToys.UI.ViewModels;[Export(typeof(MainWindowViewModel))]internal sealed class MainWindowViewModel : ObservableRecipient{+ private readonly GuiToolProvider _guiToolProvider;+[ImportingConstructor]public MainWindowViewModel(GuiToolProvider guiToolProvider){-+ _guiToolProvider = guiToolProvider;}++ /// <summary>+ /// Gets a hierarchical list containing all the tools available, ordered, to display in the top and body menu.+ /// This includes "All tools" menu item, recents and favorites.+ /// </summary>+ public ReadOnlyObservableCollection<INotifyPropertyChanged> HeaderAndBodyToolViewItems => _guiToolProvider.HeaderAndBodyToolViewItems;++ /// <summary>+ /// Gets a flat list containing all the footer tools available, ordered.+ /// </summary>+ public ReadOnlyObservableCollection<GuiToolViewItem> FooterToolViewItems => _guiToolProvider.FooterToolViewItems;}diff --git a/src/app/dev/DevToys.UI/Views/MainWindow.xaml b/src/app/dev/DevToys.UI/Views/MainWindow.xamlindex 2a3101242..037c500fa 100644--- a/src/app/dev/DevToys.UI/Views/MainWindow.xaml+++ b/src/app/dev/DevToys.UI/Views/MainWindow.xaml@@ -1,25 +1,30 @@<controls:BackdropPagex:Class="DevToys.UI.Views.MainWindow"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:controls="using:DevToys.UI.Framework.Controls"- xmlns:strings="using:DevToys.Localization.Strings.MainWindow"- xmlns:i="using:Microsoft.Xaml.Interactivity"- xmlns:ix="using:Microsoft.Xaml.Interactions.Core"- xmlns:muxc="using:Microsoft.UI.Xaml.Controls"- xmlns:wasm="http://uno.ui/wasm"- xmlns:macos="http://uno.ui/macos"xmlns:ios="http://uno.ui/ios"- xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:macos="http://uno.ui/macos"xmlns:not_win="http://uno.ui/not_win"+ xmlns:wasm="http://uno.ui/wasm"+ xmlns:tools="using:DevToys.Core.Tools.ViewItems"+ xmlns:dts="using:DevToys.UI.DataTemplateSelectors"+ xmlns:strings="using:DevToys.Localization.Strings.MainWindow"+ xmlns:controls="using:DevToys.UI.Framework.Controls"+ xmlns:converters="using:DevToys.UI.Framework.Converters"+ xmlns:muxc="using:Microsoft.UI.Xaml.Controls"+ xmlns:ix="using:Microsoft.Xaml.Interactions.Core"+ xmlns:i="using:Microsoft.Xaml.Interactivity"mc:Ignorable="d wasm not_win macos ios"><Page.Resources><!--This top margin is the height of the custom TitleBar--><Thickness x:Key="NavigationViewContentMargin">0,46,0,0</Thickness><Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness><CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>++ <converters:StringToStaticResourceConverter x:Key="StringToStaticResourceConverter"/></Page.Resources><Grid not_win:Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" ios:Margin="0,38,0,0">@@ -40,7 +45,9 @@ExpandedModeThresholdWidth="1008"IsTabStop="False"AlwaysShowHeader="True"- IsPaneToggleButtonVisible="True">+ IsPaneToggleButtonVisible="True"+ MenuItemsSource="{x:Bind ViewModel.HeaderAndBodyToolViewItems}"+ FooterMenuItemsSource="{x:Bind ViewModel.FooterToolViewItems}"><NavigationView.AutoSuggestBox><AutoSuggestBox@@ -85,12 +92,119 @@</AutoSuggestBox></NavigationView.AutoSuggestBox>- <NavigationView.MenuItems>- <NavigationViewItem- x:Name="NewControlsItem"- Content="Home"- Icon="Home" />- </NavigationView.MenuItems>+ <NavigationView.MenuItemTemplateSelector>+ <dts:MainMenuNavigationViewMenuItemSelector>+ <dts:MainMenuNavigationViewMenuItemSelector.GroupViewItem>+ <DataTemplate x:DataType="tools:GroupViewItem">+ <NavigationViewItem+ AutomationProperties.Name="{x:Bind AccessibleName}"+ MenuItemsSource="{x:Bind Children}">+ <NavigationViewItem.Icon>+ <FontIcon+ FontSize="16"+ FontFamily="{x:Bind IconFontName, Converter={StaticResource StringToStaticResourceConverter}}"+ Glyph="{x:Bind IconGlyph}"/>+ </NavigationViewItem.Icon>+ <NavigationViewItem.Content>+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock+ Grid.Column="0"+ HorizontalAlignment="Stretch"+ TextWrapping="NoWrap"+ TextTrimming="CharacterEllipsis"+ Text="{x:Bind DisplayTitle}"/>+ </Grid>+ </NavigationViewItem.Content>+ </NavigationViewItem>+ </DataTemplate>+ </dts:MainMenuNavigationViewMenuItemSelector.GroupViewItem>+ <dts:MainMenuNavigationViewMenuItemSelector.GuiToolViewItem>+ <DataTemplate x:DataType="tools:GuiToolViewItem">+ <NavigationViewItem+ AutomationProperties.Name="{x:Bind ToolInstance.AccessibleName}">+ <NavigationViewItem.Icon>+ <FontIcon+ FontSize="16"+ FontFamily="{x:Bind ToolInstance.IconFontName, Converter={StaticResource StringToStaticResourceConverter}}"+ Glyph="{x:Bind ToolInstance.IconGlyph}"/>+ </NavigationViewItem.Icon>+ <!--<NavigationViewItem.ContextFlyout>+ <MenuFlyout>+ <MenuFlyoutItem+ Text="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"+ Command="{Binding OpenToolInNewWindowCommand}"+ CommandParameter="{x:Bind Metadata}">+ <MenuFlyoutItem.Icon>+ <FontIcon Glyph="" />+ </MenuFlyoutItem.Icon>+ </MenuFlyoutItem>+ <MenuFlyoutItem+ x:Name="AddToFavoritesButton"+ x:Load="{x:Bind IsFavorite, Mode=OneWay, Converter={StaticResource InvertedBooleanConverter}}"+ Visibility="{x:Bind Metadata.NotFavorable, Mode=OneTime, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"+ Text="{Binding Instance.MainPage.AddToFavorites, Source={StaticResource LanguageManager}}"+ Command="{Binding AddToFavoritesCommand}"+ CommandParameter="{x:Bind}">+ <MenuFlyoutItem.Icon>+ <FontIcon Glyph="" />+ </MenuFlyoutItem.Icon>+ </MenuFlyoutItem>+ <MenuFlyoutItem+ x:Name="RemoveFromFavoritesButton"+ x:Load="{x:Bind IsFavorite, Mode=OneWay}"+ Visibility="{x:Bind Metadata.NotFavorable, Mode=OneTime, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"+ Text="{Binding Instance.MainPage.RemoveFromFavorites, Source={StaticResource LanguageManager}}"+ Command="{Binding RemoveFromFavoritesCommand}"+ CommandParameter="{x:Bind}">+ <MenuFlyoutItem.Icon>+ <FontIcon Glyph="" />+ </MenuFlyoutItem.Icon>+ </MenuFlyoutItem>+ <MenuFlyoutItem+ Text="{Binding Instance.MainPage.PinToolToStart, Source={StaticResource LanguageManager}}"+ Command="{Binding PinToolToStartCommand}"+ CommandParameter="{x:Bind Metadata}">+ <MenuFlyoutItem.Icon>+ <FontIcon Glyph="" />+ </MenuFlyoutItem.Icon>+ </MenuFlyoutItem>+ </MenuFlyout>+ </NavigationViewItem.ContextFlyout>-->+ <NavigationViewItem.Content>+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock+ Grid.Column="0"+ HorizontalAlignment="Stretch"+ TextWrapping="NoWrap"+ TextTrimming="CharacterEllipsis"+ Text="{x:Bind MenuDisplayTitle}"/>+ <ImageIcon+ x:Name="NavigationViewItemRecommendedIcon"+ x:Load="{x:Bind IsRecommended, Mode=OneWay}"+ Grid.Column="1"+ Source="/Assets/Icons/Idea.svg"+ Height="16"+ Width="16"/>+ </Grid>+ </NavigationViewItem.Content>+ </NavigationViewItem>+ </DataTemplate>+ </dts:MainMenuNavigationViewMenuItemSelector.GuiToolViewItem>+ <dts:MainMenuNavigationViewMenuItemSelector.Separator>+ <DataTemplate>+ <NavigationViewItemSeparator/>+ </DataTemplate>+ </dts:MainMenuNavigationViewMenuItemSelector.Separator>+ </dts:MainMenuNavigationViewMenuItemSelector>+ </NavigationView.MenuItemTemplateSelector></NavigationView></Grid></controls:BackdropPage>diff --git a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockGuiToolGroup.cs b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockGuiToolGroup.csindex 2888b9e81..fd9ef233d 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockGuiToolGroup.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockGuiToolGroup.cs@@ -9,7 +9,7 @@ internal sealed class MockGuiToolGroup : GuiToolGroup[ImportingConstructor]internal MockGuiToolGroup(){- IconFontName = "Fluent System-Regular";+ IconFontName = "FluentSystemIcons";IconGlyph = "\u0108";DisplayTitle = "Group title";AccessibleName = "Group title";diff --git a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockIGuiTool.cs b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockIGuiTool.csindex 46d60b47d..118102105 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockIGuiTool.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockIGuiTool.cs@@ -7,7 +7,7 @@ namespace DevToys.UnitTests.Mocks.Tools;[Order(After = "MockTool")][Author("John Doe")][ToolDisplayInformation(- IconFontName = "Fluent System-Regular",+ IconFontName = "FluentSystemIcons",IconGlyph = "\u0108",GroupName = "MockGroup",ResourceManagerAssemblyIdentifier = nameof(MockResourceManagerAssemblyIdentifier),@@ -26,7 +26,7 @@ internal sealed class MockIGuiTool2 : IGuiTool[Name("MockTool")][Author("John Doe")][ToolDisplayInformation(- IconFontName = "Fluent System-Regular",+ IconFontName = "FluentSystemIcons",IconGlyph = "\u0108",GroupName = "MockGroup",ResourceManagerAssemblyIdentifier = nameof(MockResourceManagerAssemblyIdentifier),