New FontIcon uses

iNKORE-NET · Apr 14, 2024 · ad6a585 · ad6a585
1 parent e097882
commit ad6a585
Show file tree

Hide file tree

Showing 32 changed files with 35,105 additions and 1,465 deletions.
diff --git a/assets/misc/FluentSystemIcons-Filled.json b/assets/misc/FluentSystemIcons-Filled.json
diff --git a/assets/misc/FluentSystemIcons-Regular.json b/assets/misc/FluentSystemIcons-Regular.json
diff --git a/assets/misc/Segoe Fluent Icons.txt b/assets/misc/Segoe Fluent Icons.txt
diff --git a/iNKORE.UI.WPF.Modern.sln b/iNKORE.UI.WPF.Modern.sln
@@ -47,7 +47,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StarterKit", "samples\Start
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsPageExample", "samples\SettingsPageExample\SettingsPageExample.csproj", "{677DAAFA-C061-4C79-BAAE-5639BCD80448}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowExample", "samples\WindowExample\WindowExample.csproj", "{936F7656-B5E8-44A8-8560-D954E1E68383}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowExample", "samples\WindowExample\WindowExample.csproj", "{936F7656-B5E8-44A8-8560-D954E1E68383}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconKeyFileMaker", "tools\IconKeyFileMaker\IconKeyFileMaker.csproj", "{6561632F-0B5A-4869-8C82-E05238326B32}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -283,6 +285,26 @@ Global
 		{936F7656-B5E8-44A8-8560-D954E1E68383}.Release|x64.Build.0 = Release|Any CPU
 		{936F7656-B5E8-44A8-8560-D954E1E68383}.Release|x86.ActiveCfg = Release|Any CPU
 		{936F7656-B5E8-44A8-8560-D954E1E68383}.Release|x86.Build.0 = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|x64.Build.0 = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Debug|x86.Build.0 = Debug|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|ARM.Build.0 = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|ARM64.Build.0 = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|x64.ActiveCfg = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|x64.Build.0 = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|x86.ActiveCfg = Release|Any CPU
+		{6561632F-0B5A-4869-8C82-E05238326B32}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -298,6 +320,7 @@ Global
 		{B13E16CB-55E0-42CB-B761-216D82273473} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 		{677DAAFA-C061-4C79-BAAE-5639BCD80448} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 		{936F7656-B5E8-44A8-8560-D954E1E68383} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
+		{6561632F-0B5A-4869-8C82-E05238326B32} = {07337569-6CA9-4BB0-9C8F-962D981CB5F4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6251E140-0FAA-4DE9-B245-1C5BE188E578}

diff --git a/samples/FlyoutExample/MainWindow.xaml b/samples/FlyoutExample/MainWindow.xaml
@@ -48,7 +48,7 @@
                 <ui:CommandBar HorizontalAlignment="Center">
                     <ui:AppBarButton Label="Click me!" ChevronStyle="Down">
                         <ui:AppBarButton.Icon>
-                            <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.GiftboxOpen}"/>
+                            <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.GiftboxOpen}"/>
                         </ui:AppBarButton.Icon>
                         <ui:AppBarButton.Flyout>
                             <ui:Flyout Placement="Bottom">
@@ -59,7 +59,7 @@
                     </ui:AppBarButton>
                     <ui:AppBarButton Label="Arrowless!">
                         <ui:AppBarButton.Icon>
-                            <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Hide}"/>
+                            <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Hide}"/>
                         </ui:AppBarButton.Icon>
                         <ui:AppBarButton.Flyout>
                             <ui:Flyout Placement="Bottom">
@@ -71,7 +71,7 @@
 
                     <ui:AppBarButton Label="Right click" Click="DropDownButton_3_Click" ChevronStyle="Right" FlyoutOpeningMode="RightMouseButtonUp">
                         <ui:AppBarButton.Icon>
-                            <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Forward}"/>
+                            <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Forward}"/>
                         </ui:AppBarButton.Icon>
                         <ui:AppBarButton.Flyout>
                             <ui:Flyout Placement="Bottom">

diff --git a/samples/SettingsPageExample/MainWindow.xaml b/samples/SettingsPageExample/MainWindow.xaml
@@ -56,7 +56,7 @@
                             <ColumnDefinition/>
                             <ColumnDefinition Width="200"/>
                         </Grid.ColumnDefinitions>
-                        <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.LocaleLanguage}" Grid.RowSpan="2" Margin="5,15,20,15"/>
+                        <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.LocaleLanguage}" Grid.RowSpan="2" Margin="5,15,20,15"/>
                         <TextBlock x:Name="TextBlock_Language" Text="Language" Grid.Column="1" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
                         <TextBlock x:Name="TextBlock_Language_Description" Text="The primary language that displays on the UI" Grid.Column="1" VerticalAlignment="Top" Grid.Row="1" Margin="0,2,20,5" Opacity="0.615" FontSize="12" TextTrimming="CharacterEllipsis" TextWrapping="WrapWithOverflow"/>
 
@@ -94,7 +94,7 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="200"/>
                     </Grid.ColumnDefinitions>
-                    <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Light}" Grid.RowSpan="2" Margin="5,15,20,15"/>
+                    <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Light}" Grid.RowSpan="2" Margin="5,15,20,15"/>
                     <TextBlock x:Name="TextBlock_ThemeMode" Text="Theme mode" Grid.Column="1" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
                     <TextBlock x:Name="TextBlock_ThemeMode_Description" Text="Lorem ipsum dolor sit amet." Grid.Column="1" VerticalAlignment="Top" Grid.Row="1" Margin="0,2,20,5" Opacity="0.615" FontSize="12" TextTrimming="CharacterEllipsis" TextWrapping="WrapWithOverflow"/>
 
@@ -118,7 +118,7 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Draw}" Grid.RowSpan="2" Margin="5,15,20,15"/>
+                    <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Draw}" Grid.RowSpan="2" Margin="5,15,20,15"/>
                     <TextBlock x:Name="TextBlock_StylusToDraw" Text="Draw with stylus" Grid.Column="1" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
                     <TextBlock x:Name="TextBlock_StylusToDraw_Description" Text="Draw with your stylus while using your fingers to move the viewport" Grid.Column="1" VerticalAlignment="Top" Grid.Row="1" Margin="0,2,20,5" Opacity="0.615" FontSize="12" TextTrimming="CharacterEllipsis" TextWrapping="WrapWithOverflow"/>
 

diff --git a/samples/WpfApp1/MainWindow.xaml b/samples/WpfApp1/MainWindow.xaml
@@ -97,11 +97,13 @@
             <ComboBoxItem Content="Item19"/>
             <ComboBoxItem Content="Item20"/>
         </ComboBox>
+
+        <ui:FontIcon FontFamily="{StaticResource {x:Static ui:ThemeKeys.FluentSystemIconsKey}}" Glyph="d"/>
         <!--<ui:NavigationView x:Name="naview" PaneDisplayMode="Top">
             <ui:NavigationView.MenuItems>
                 <ui:NavigationViewItem Content="Home">
                     <ui:NavigationViewItem.Icon>
-                        <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Home}" FontSize="16"/>
+                        <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Home}" FontSize="16"/>
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
                 <ui:NavigationViewItem x:Name="sgsac" Content="Rectangle">
@@ -115,12 +117,12 @@
         <ui:CommandBar VerticalAlignment="Bottom">
             <ui:AppBarButton Label="Aaaa" IsCompact="True" Click="AppBarButton_Click">
                 <ui:AppBarButton.Icon>
-                    <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Accept}" FontSize="16"/>
+                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" FontSize="16"/>
                 </ui:AppBarButton.Icon>
             </ui:AppBarButton>
             <ui:AppBarButton Label="Accept" ChevronStyle="Down" FlyoutOpeningMode="RightMouseButtonUp">
                 <ui:AppBarButton.Icon>
-                    <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Accept}" FontSize="16"/>
+                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Accept}" FontSize="16"/>
                 </ui:AppBarButton.Icon>
                 <ui:AppBarButton.Flyout>
                     <ui:MenuFlyout>
@@ -130,7 +132,7 @@
             </ui:AppBarButton>
             <ui:AppBarToggleButton x:Name="AppBarToggleButton1" Label="Aaaa" LabelPosition="Collapsed" IsCompact="True" HorizontalAlignment="Center" Height="32">
                 <ui:AppBarToggleButton.Icon>
-                    <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Accept}" FontSize="16"/>
+                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Accident}" FontSize="16"/>
                 </ui:AppBarToggleButton.Icon>
             </ui:AppBarToggleButton>
         </ui:CommandBar>
@@ -142,13 +144,13 @@
             </ui:DropDownButton.Flyout>
         </ui:DropDownButton>
         <ToggleButton x:Name="ToggleButton1" Click="ToggleButton_Click">
-            <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Accounts}"/>
+            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Accept}"/>
         </ToggleButton>
         <RichTextBox HorizontalAlignment="Left" VerticalAlignment="Top" Margin="539,110,0,0" Height="86"/>
         <PasswordBox HorizontalAlignment="Left" VerticalAlignment="Top" Margin="622,127,0,0" Height="200"/>
         <Button x:Name="Button_MessageBox" Click="Button_MessageBox_Click" Canvas.Left="152" Canvas.Top="145" VerticalAlignment="Top">
             <ui:SimpleStackPanel Spacing="5" Orientation="Horizontal">
-                <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Message}"/>
+                <ui:FontIcon Icon="{x:Static ui:FluentSystemIcons.WindowSettings_20_Regular}"/>
                 <TextBlock Text="MessageBox"/>
             </ui:SimpleStackPanel>
         </Button>

diff --git a/samples/WpfApp1/MainWindow.xaml.cs b/samples/WpfApp1/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using iNKORE.UI.WPF.Modern;
+using iNKORE.UI.WPF.Modern.Common.IconKeys;
 using iNKORE.UI.WPF.Modern.Controls;
 using iNKORE.UI.WPF.Modern.Controls.Primitives;
 using iNKORE.UI.WPF.Modern.Helpers.Styles;
@@ -94,8 +95,8 @@ private void Button_MessageBox_Click(object sender, RoutedEventArgs e)
             MessageBoxEx.DefaultBackdropType = BackdropType.Acrylic;
 
             MessageBoxEx.Show(message, title, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
-            MessageBoxEx.Show("redadwada", null, MessageBoxButton.OK, ((char)Symbol.Admin).ToString());
-            MessageBoxEx.Show("redadwada", null, MessageBoxButton.OK, SegoeIcons.Airplane);
+            MessageBoxEx.Show("redadwada", null, MessageBoxButton.OK, FluentSystemIcons.HomeAdd_20_Regular);
+            MessageBoxEx.Show("redadwada", null, MessageBoxButton.OK, SegoeFluentIcons.Airplane);
 
             MessageBoxEx.DefaultBackdropType = BackdropType.Mica;
 

diff --git a/samples/WpfApp1/WpfApp1.csproj b/samples/WpfApp1/WpfApp1.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Inkore.UI.WPF.Modern.Controls\iNKORE.UI.WPF.Modern.Controls.csproj" />
-    <ProjectReference Include="..\..\Inkore.UI.WPF.Modern\iNKORE.UI.WPF.Modern.csproj" />
+    <ProjectReference Include="..\..\source\Inkore.UI.WPF.Modern.Controls\iNKORE.UI.WPF.Modern.Controls.csproj" />
+    <ProjectReference Include="..\..\source\Inkore.UI.WPF.Modern\iNKORE.UI.WPF.Modern.csproj" />
   </ItemGroup>
 
   <ItemGroup>