From 091a256bccaf98544b2e7735ad46f08ec8bc75ad Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Mon, 22 Sep 2025 13:09:43 +0800
Subject: [PATCH] Revert "Replace SymbolIcon with FontIcon throughout UI"

This reverts commit 37a69032f6fe984cc29985e3289e87c33c28651c.
---
 Ink Canvas/MainWindow.xaml                     | 12 ++++++------
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs    |  6 +++---
 Ink Canvas/Windows/CountdownTimerWindow.xaml   | 18 +++++++++---------
 .../Windows/CountdownTimerWindow.xaml.cs       | 16 ++++++++--------
 Ink Canvas/Windows/OperatingGuideWindow.xaml   |  6 +++---
 .../Windows/OperatingGuideWindow.xaml.cs       |  6 +++---
 Ink Canvas/Windows/RandWindow.xaml             | 10 +++++-----
 Ink Canvas/Windows/RandWindow.xaml.cs          |  6 +++---
 .../Windows/YesOrNoNotificationWindow.xaml     |  4 ++--
 9 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 54c2636f..614d5a16 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -5655,7 +5655,7 @@
                                                         <Run Text="图形" />
                                                         <Run Text="(第一行支持长按保持选中)" FontSize="10" />
                                                     </TextBlock>
-                                                    <ui:FontIcon Margin="0,-20,8,15" Glyph="Pin"
+                                                    <ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin"
                                                                    MouseDown="Border_MouseDown"
                                                                    MouseUp="SymbolIconPinBorderDrawShape_MouseUp"
                                                                    Foreground="{DynamicResource FloatBarForeground}"
@@ -6379,7 +6379,7 @@
                             Width="50" Height="48" FontSize="26" Click="BtnWhiteBoardAdd_Click"
                             Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
                             Background="{Binding ElementName=BtnExit, Path=Background}">
-                        <ui:FontIcon Glyph="Add" />
+                        <ui:SymbolIcon Symbol="Add" />
                     </Button>
                     <Button Name="BtnWhiteBoardSwitchPrevious" FontFamily="Symbol"
                             Width="50" Height="48" FontSize="25" Click="BtnWhiteBoardSwitchPrevious_Click"
@@ -6452,7 +6452,7 @@
                             Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
                             Background="{Binding ElementName=BtnExit, Path=Background}"
                             IsEnabled="False">
-                        <ui:FontIcon Glyph="Delete" />
+                        <ui:SymbolIcon Symbol="Delete" />
                     </Button>
                 </ui:SimpleStackPanel>
             </Grid>
@@ -6566,7 +6566,7 @@
                         Background="{Binding ElementName=BtnExit, Path=Background}"
                         IsEnabled="False" Visibility="Collapsed" IsEnabledChanged="Btn_IsEnabledChanged">
                     <StackPanel Opacity="0.2">
-                        <ui:FontIcon Glyph="Undo" />
+                        <ui:SymbolIcon Symbol="Undo" />
                         <TextBlock Text="撤销" Margin="0,4,0,0" />
                     </StackPanel>
                 </Button>
@@ -6576,7 +6576,7 @@
                         Background="{Binding ElementName=BtnExit, Path=Background}"
                         IsEnabled="False" Visibility="Collapsed" IsEnabledChanged="Btn_IsEnabledChanged">
                     <StackPanel Opacity="0.2">
-                        <ui:FontIcon Glyph="Redo" />
+                        <ui:SymbolIcon Symbol="Redo" />
                         <TextBlock Text="恢复" Margin="0,4,0,0" />
                     </StackPanel>
                 </Button>
@@ -8438,7 +8438,7 @@
                                                 <Run Text="图形"/>
                                                 <Run Text="(第一行支持长按保持选中)" FontSize="10"/>
                                             </TextBlock>
-                                            <ui:FontIcon Margin="0,-20,8,15" Glyph="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Right"/>-->
+                                            <ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Right"/>-->
                                                 <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1"
                                                         CornerRadius="8,8,0,0" Background="#2563eb" Margin="-1,-1,-1,0"
                                                         Padding="1,1,1,0">
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index 576c250d..922111de 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Collections.Generic;
@@ -75,9 +75,9 @@ namespace Ink_Canvas
             ToggleSwitchDrawShapeBorderAutoHide.IsOn = !ToggleSwitchDrawShapeBorderAutoHide.IsOn;
 
             if (ToggleSwitchDrawShapeBorderAutoHide.IsOn)
-                ((FontIcon)sender).Glyph = "Pin";
+                ((SymbolIcon)sender).Symbol = Symbol.Pin;
             else
-                ((FontIcon)sender).Glyph = "UnPin";
+                ((SymbolIcon)sender).Symbol = Symbol.UnPin;
         }
 
         private object lastMouseDownSender;
diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml b/Ink Canvas/Windows/CountdownTimerWindow.xaml
index caf7e339..6fed4d88 100644
--- a/Ink Canvas/Windows/CountdownTimerWindow.xaml	
+++ b/Ink Canvas/Windows/CountdownTimerWindow.xaml	
@@ -1,4 +1,4 @@
-<Window x:Class="Ink_Canvas.CountdownTimerWindow"
+<Window x:Class="Ink_Canvas.CountdownTimerWindow"
         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"
@@ -114,7 +114,7 @@
                                     <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                                 </Border.Effect>
                                 <Viewbox Margin="5.5">
-                                    <ui:FontIcon Glyph="Save" Foreground="White"/>
+                                    <ui:SymbolIcon Symbol="Save" Foreground="White"/>
                                 </Viewbox>
                             </Border>
                         </Grid>
@@ -179,12 +179,12 @@
                         <Grid>
                             <Border x:Name="BtnStart" MouseUp="BtnStart_MouseUp" Background="#0066BF" Height="20" Width="20" CornerRadius="100">
                                 <Viewbox Margin="5">
-                                    <ui:FontIcon Name="SymbolIconStart" Glyph="Play" Foreground="White"/>
+                                    <ui:SymbolIcon Name="SymbolIconStart" Symbol="Play" Foreground="White"/>
                                 </Viewbox>
                             </Border>
                             <Border x:Name="BtnStartCover" Visibility="Collapsed" Background="#BFBFBF" Height="20" Width="20" CornerRadius="100">
                                 <Viewbox Margin="5">
-                                    <ui:FontIcon Glyph="{Binding ElementName=SymbolIconStart, Path=Glyph}" Foreground="White"/>
+                                    <ui:SymbolIcon Symbol="{Binding ElementName=SymbolIconStart, Path=Symbol}" Foreground="White"/>
                                 </Viewbox>
                             </Border>
                         </Grid>
@@ -194,12 +194,12 @@
                                     <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
                                 </Border.Effect>
                                 <Viewbox Margin="5.5">
-                                    <ui:FontIcon Glyph="Refresh" Foreground="Black"/>
+                                    <ui:SymbolIcon Symbol="Refresh" Foreground="Black"/>
                                 </Viewbox>
                             </Border>
                             <Border x:Name="BtnResetCover" Background="#F3F5F9" Height="20" Width="20" CornerRadius="100">
                                 <Viewbox Margin="5.5">
-                                    <ui:FontIcon Glyph="Refresh" Foreground="#9D9D9E"/>
+                                    <ui:SymbolIcon Symbol="Refresh" Foreground="#9D9D9E"/>
                                 </Viewbox>
                             </Border>
                         </Grid>
@@ -215,7 +215,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Name="SymbolIconMinimal" Glyph="HideBcc" Foreground="Black"/>
+                            <ui:SymbolIcon Name="SymbolIconMinimal" Symbol="HideBcc" Foreground="Black"/>
                         </Viewbox>
                     </Border>
                     <Border x:Name="BtnFullscreen" MouseUp="BtnFullscreen_MouseUp" HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -225,7 +225,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Name="SymbolIconFullscreen" Glyph="FullScreen" Foreground="Black"/>
+                            <ui:SymbolIcon Name="SymbolIconFullscreen" Symbol="FullScreen" Foreground="Black"/>
                         </Viewbox>
                     </Border>
                     <Border x:Name="BtnClose" MouseUp="BtnClose_MouseUp" HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -235,7 +235,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Glyph="Clear"  Foreground="White"/>
+                            <ui:SymbolIcon Symbol="Clear"  Foreground="White"/>
                         </Viewbox>
                     </Border>
                 </ui:SimpleStackPanel>
diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs b/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs
index 0fa48a5a..a90e6b1d 100644
--- a/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs	
+++ b/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs	
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Media;
 using System.Timers;
@@ -51,7 +51,7 @@ namespace Ink_Canvas
                     TextBlockSecond.Text = "00";
                     timer.Stop();
                     isTimerRunning = false;
-                    SymbolIconStart.Glyph = "Play";
+                    SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play;
                     BtnStartCover.Visibility = Visibility.Visible;
                     TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F"));
                     BorderStopTime.Visibility = Visibility.Collapsed;
@@ -202,12 +202,12 @@ namespace Ink_Canvas
             if (WindowState == WindowState.Normal)
             {
                 WindowState = WindowState.Maximized;
-                SymbolIconFullscreen.Glyph = "BackToWindow";
+                SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow;
             }
             else
             {
                 WindowState = WindowState.Normal;
-                SymbolIconFullscreen.Glyph = "FullScreen";
+                SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen;
             }
         }
 
@@ -232,7 +232,7 @@ namespace Ink_Canvas
                 BtnStartCover.Visibility = Visibility.Collapsed;
                 BorderStopTime.Visibility = Visibility.Collapsed;
                 TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F"));
-                SymbolIconStart.Glyph = "Play";
+                SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play;
                 isTimerRunning = false;
                 timer.Stop();
                 isPaused = false;
@@ -282,7 +282,7 @@ namespace Ink_Canvas
                 startTime += DateTime.Now - pauseTime;
                 ProcessBarTime.IsPaused = false;
                 TextBlockHour.Foreground = Brushes.Black;
-                SymbolIconStart.Glyph = "Pause";
+                SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause;
                 isPaused = false;
                 timer.Start();
                 UpdateStopTime();
@@ -294,7 +294,7 @@ namespace Ink_Canvas
                 pauseTime = DateTime.Now;
                 ProcessBarTime.IsPaused = true;
                 TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F"));
-                SymbolIconStart.Glyph = "Play";
+                SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play;
                 BorderStopTime.Visibility = Visibility.Collapsed;
                 isPaused = true;
                 timer.Stop();
@@ -306,7 +306,7 @@ namespace Ink_Canvas
                 totalSeconds = ((hour * 60) + minute) * 60 + second;
                 ProcessBarTime.IsPaused = false;
                 TextBlockHour.Foreground = Brushes.Black;
-                SymbolIconStart.Glyph = "Pause";
+                SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause;
                 BtnResetCover.Visibility = Visibility.Collapsed;
 
                 if (totalSeconds <= 10)
diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml b/Ink Canvas/Windows/OperatingGuideWindow.xaml
index 581dfa4e..67c81734 100644
--- a/Ink Canvas/Windows/OperatingGuideWindow.xaml	
+++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml	
@@ -1,4 +1,4 @@
-<Window x:Class="Ink_Canvas.OperatingGuideWindow"
+<Window x:Class="Ink_Canvas.OperatingGuideWindow"
         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"
@@ -80,7 +80,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Name="SymbolIconFullscreen" Glyph="FullScreen" Foreground="Black"/>
+                            <ui:SymbolIcon Name="SymbolIconFullscreen" Symbol="FullScreen" Foreground="Black"/>
                         </Viewbox>
                     </Border>
                     <Border x:Name="BtnClose" MouseUp="BtnClose_MouseUp" HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -90,7 +90,7 @@
                             <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                         </Border.Effect>
                         <Viewbox Margin="5.5">
-                            <ui:FontIcon Glyph="Clear"  Foreground="White"/>
+                            <ui:SymbolIcon Symbol="Clear"  Foreground="White"/>
                         </Viewbox>
                     </Border>
                 </ui:SimpleStackPanel>
diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs
index ca2fab3a..61c50f51 100644
--- a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs	
+++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs	
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System.Windows;
 using System.Windows.Input;
 
@@ -30,12 +30,12 @@ namespace Ink_Canvas
             if (WindowState == WindowState.Normal)
             {
                 WindowState = WindowState.Maximized;
-                SymbolIconFullscreen.Glyph = "BackToWindow";
+                SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow;
             }
             else
             {
                 WindowState = WindowState.Normal;
-                SymbolIconFullscreen.Glyph = "FullScreen";
+                SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen;
             }
         }
 
diff --git a/Ink Canvas/Windows/RandWindow.xaml b/Ink Canvas/Windows/RandWindow.xaml
index 7fce00d0..f1bada9c 100644
--- a/Ink Canvas/Windows/RandWindow.xaml	
+++ b/Ink Canvas/Windows/RandWindow.xaml	
@@ -1,4 +1,4 @@
-<Window x:Class="Ink_Canvas.RandWindow"
+<Window x:Class="Ink_Canvas.RandWindow"
         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"
@@ -98,7 +98,7 @@
                     <Border x:Name="BorderBtnRand" MouseUp="BorderBtnRand_MouseUp" Background="#0066BF" Height="70" Width="200" CornerRadius="35">
                         <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
                             <Viewbox Margin="0,20">
-                                <ui:FontIcon Name="SymbolIconStart" Glyph="Contact" Foreground="White"/>
+                                <ui:SymbolIcon Name="SymbolIconStart" Symbol="Contact" Foreground="White"/>
                             </Viewbox>
                             <TextBlock Text="开抽" Foreground="White" FontSize="32" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
                         </ui:SimpleStackPanel>
@@ -113,7 +113,7 @@
                         <Border x:Name="BorderBtnExternalCaller" MouseUp="BorderBtnExternalCaller_MouseUp" Background="#00B894" Height="50" Width="120" CornerRadius="25">
                             <ui:SimpleStackPanel Margin="3,0" Spacing="8" Orientation="Horizontal" HorizontalAlignment="Center">
                                 <Viewbox Margin="0,10">
-                                    <ui:FontIcon Glyph="Globe" Foreground="White"/>
+                                    <ui:SymbolIcon Symbol="Globe" Foreground="White"/>
                                 </Viewbox>
                                 <TextBlock Text="外部点名" Foreground="White" FontSize="16" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
                             </ui:SimpleStackPanel>
@@ -127,7 +127,7 @@
                 </Border.Effect>
                 <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                     <Viewbox Margin="15,12">
-                        <ui:FontIcon Glyph="People" Foreground="Black"/>
+                        <ui:SymbolIcon Symbol="People" Foreground="Black"/>
                     </Viewbox>
                     <TextBlock Margin="-5,12,15,12" Name="TextBlockPeopleCount" Text="点击此处以导入名单" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 </ui:SimpleStackPanel>
@@ -137,7 +137,7 @@
                     <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                 </Border.Effect>
                 <Viewbox Margin="14">
-                    <ui:FontIcon Glyph="Clear" Foreground="White"/>
+                    <ui:SymbolIcon Symbol="Clear" Foreground="White"/>
                 </Viewbox>
             </Border>
         </Canvas>
diff --git a/Ink Canvas/Windows/RandWindow.xaml.cs b/Ink Canvas/Windows/RandWindow.xaml.cs
index 7156351a..f8f568fe 100644
--- a/Ink Canvas/Windows/RandWindow.xaml.cs	
+++ b/Ink Canvas/Windows/RandWindow.xaml.cs	
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
 using Microsoft.VisualBasic;
 using System;
@@ -121,7 +121,7 @@ namespace Ink_Canvas
             if (RandMaxPeopleOneTime != -1 && TotalCount >= RandMaxPeopleOneTime) return;
             TotalCount++;
             LabelNumberCount.Text = TotalCount.ToString();
-            SymbolIconStart.Glyph = "People";
+            SymbolIconStart.Symbol = Symbol.People;
             BorderBtnAdd.Opacity = 1;
             BorderBtnMinus.Opacity = 1;
         }
@@ -133,7 +133,7 @@ namespace Ink_Canvas
             LabelNumberCount.Text = TotalCount.ToString();
             if (TotalCount == 1)
             {
-                SymbolIconStart.Glyph = "Contact";
+                SymbolIconStart.Symbol = Symbol.Contact;
             }
         }
 
diff --git a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml
index a7fe8d0e..c633ae5c 100644
--- a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml	
+++ b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml	
@@ -1,4 +1,4 @@
-<Window x:Class="Ink_Canvas.YesOrNoNotificationWindow"
+<Window x:Class="Ink_Canvas.YesOrNoNotificationWindow"
         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"
@@ -14,7 +14,7 @@
                 <RowDefinition Height="40"/>
             </Grid.RowDefinitions>
             <Viewbox HorizontalAlignment="Left" Margin="10" Height="30">
-                <ui:FontIcon Glyph="SlideShow" Foreground="{Binding ElementName=Label, Path=Foreground}"/>
+                <ui:SymbolIcon Symbol="SlideShow" Foreground="{Binding ElementName=Label, Path=Foreground}"/>
             </Viewbox>
             <TextBlock TextWrapping="Wrap" Name="Label" Margin="60,0,10,0" VerticalAlignment="Center"/>
             <ui:SimpleStackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal" Spacing="10">