A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added FluentSystemIcon font
Etienne Baudoux11bce53c9cc1
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xamlindex 132fcaa23..f0e88c725 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml@@ -19,6 +19,7 @@<BrushTransition /></Grid.BackgroundTransition>+ <!-- Title and icon in the title bar --><BorderVerticalAlignment="Top"Height="48"@@ -38,6 +39,8 @@Style="{StaticResource CaptionTextBlockStyle}" /></StackPanel></Border>++ <!-- Draggable part of the title bar --><Borderx:Name="AppTitleBar"Background="Transparent"@@ -45,6 +48,8 @@Height="32"Margin="48,0,0,0"Canvas.ZIndex="1"/>++ <!-- Navigation view --><muxc:NavigationViewx:Name="nvSample"IsTitleBarAutoPaddingEnabled="False"@@ -60,7 +65,7 @@IsTabStop="False"><muxc:NavigationView.AutoSuggestBox>- <AutoSuggestBox QueryIcon="Find" AutomationProperties.Name="Search" />+ <AutoSuggestBox QueryIcon="Find" PlaceholderText="Search" /></muxc:NavigationView.AutoSuggestBox><muxc:NavigationView.MenuItems>@@ -69,7 +74,7 @@<SymbolIcon Symbol="Play" /></muxc:NavigationViewItem.Icon></muxc:NavigationViewItem>- <muxc:NavigationViewItem Content="Menu Item2" Tag="SamplePage2" x:Name="SamplePage2Item" SelectsOnInvoked="True">+ <muxc:NavigationViewItem Content="Menu Item2" Tag="SamplePage2" x:Name="SamplePage2Item"><muxc:NavigationViewItem.Icon><SymbolIcon Symbol="Save" /></muxc:NavigationViewItem.Icon>@@ -81,22 +86,20 @@</muxc:NavigationViewItem></muxc:NavigationView.MenuItems>- <muxc:NavigationView.PaneFooter>- <StackPanel x:Name="FooterStackPanel" Orientation="Vertical">- <muxc:NavigationViewItem Content="Settings">- <muxc:NavigationViewItem.Icon>- <muxc:AnimatedIcon x:Name='AnimatedIcon'>- <muxc:AnimatedIcon.Source>- <animatedvisuals:AnimatedSettingsVisualSource/>- </muxc:AnimatedIcon.Source>- <muxc:AnimatedIcon.FallbackIconSource>- <muxc:FontIconSource FontFamily="Segoe MDL2 Assets" Glyph=""/>- </muxc:AnimatedIcon.FallbackIconSource>- </muxc:AnimatedIcon>- </muxc:NavigationViewItem.Icon>- </muxc:NavigationViewItem>- </StackPanel>- </muxc:NavigationView.PaneFooter>+ <muxc:NavigationView.FooterMenuItems>+ <muxc:NavigationViewItem Content="Settings" SelectsOnInvoked="True">+ <muxc:NavigationViewItem.Icon>+ <muxc:AnimatedIcon>+ <muxc:AnimatedIcon.Source>+ <animatedvisuals:AnimatedSettingsVisualSource/>+ </muxc:AnimatedIcon.Source>+ <muxc:AnimatedIcon.FallbackIconSource>+ <muxc:FontIconSource FontFamily="FluentSystemIcons-Regular" Glyph="" />+ </muxc:AnimatedIcon.FallbackIconSource>+ </muxc:AnimatedIcon>+ </muxc:NavigationViewItem.Icon>+ </muxc:NavigationViewItem>+ </muxc:NavigationView.FooterMenuItems><Frame x:Name="contentFrame" /></muxc:NavigationView>diff --git a/src/dev/impl/DevTools.Localization/Assets/FluentSystemIcons-Regular.ttf b/src/dev/impl/DevTools.Localization/Assets/FluentSystemIcons-Regular.ttfnew file mode 100644index 000000000..7d21b656fBinary files /dev/null and b/src/dev/impl/DevTools.Localization/Assets/FluentSystemIcons-Regular.ttf differdiff --git a/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj b/src/dev/impl/DevTools.Localization/DevTools.Localization.csprojindex 711fbe15c..3b6ed56c9 100644--- a/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj+++ b/src/dev/impl/DevTools.Localization/DevTools.Localization.csproj@@ -93,6 +93,15 @@<ItemGroup><Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /></ItemGroup>+ <ItemGroup>+ <Content Include="Assets\FluentSystemIcons-Regular.ttf" />+ </ItemGroup>+ <ItemGroup>+ <Page Include="Resources.xaml">+ <SubType>Designer</SubType>+ <Generator>MSBuild:Compile</Generator>+ </Page>+ </ItemGroup><Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.Other similar extension points exist, see Microsoft.Common.targets.diff --git a/src/dev/impl/DevTools.Localization/Resources.xaml b/src/dev/impl/DevTools.Localization/Resources.xamlnew file mode 100644index 000000000..b0037d22c--- /dev/null+++ b/src/dev/impl/DevTools.Localization/Resources.xaml@@ -0,0 +1,7 @@+<ResourceDictionary+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">++ <FontFamily x:Key="FluentSystemIcons-Regular">/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>++</ResourceDictionary>diff --git a/src/dev/startup/DevTools/App.xaml b/src/dev/startup/DevTools/App.xamlindex fc0b72917..48a539c2a 100644--- a/src/dev/startup/DevTools/App.xaml+++ b/src/dev/startup/DevTools/App.xaml@@ -6,7 +6,10 @@<Application.Resources><controls:XamlControlsResources><controls:XamlControlsResources.MergedDictionaries>+<!-- Other app resources here -->+ <ResourceDictionary Source="ms-appx:///DevTools.Localization/Resources.xaml"/>+</controls:XamlControlsResources.MergedDictionaries></controls:XamlControlsResources></Application.Resources>