diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 6c377a93..1504a0bf 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -5641,7 +5641,7 @@ - - + @@ -6552,7 +6552,7 @@ Background="{Binding ElementName=BtnExit, Path=Background}" IsEnabled="False" Visibility="Collapsed" IsEnabledChanged="Btn_IsEnabledChanged"> - + @@ -6562,7 +6562,7 @@ Background="{Binding ElementName=BtnExit, Path=Background}" IsEnabled="False" Visibility="Collapsed" IsEnabledChanged="Btn_IsEnabledChanged"> - + @@ -8424,7 +8424,7 @@ - --> + --> diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs index 922111de..576c250d 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) - ((SymbolIcon)sender).Symbol = Symbol.Pin; + ((FontIcon)sender).Glyph = "Pin"; else - ((SymbolIcon)sender).Symbol = Symbol.UnPin; + ((FontIcon)sender).Glyph = "UnPin"; } private object lastMouseDownSender; diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml b/Ink Canvas/Windows/CountdownTimerWindow.xaml index 6fed4d88..caf7e339 100644 --- a/Ink Canvas/Windows/CountdownTimerWindow.xaml +++ b/Ink Canvas/Windows/CountdownTimerWindow.xaml @@ -1,4 +1,4 @@ - - + @@ -179,12 +179,12 @@ - + - + @@ -194,12 +194,12 @@ - + - + @@ -215,7 +215,7 @@ - + - + - + diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs b/Ink Canvas/Windows/CountdownTimerWindow.xaml.cs index a90e6b1d..0fa48a5a 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.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; + SymbolIconStart.Glyph = "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.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow; + SymbolIconFullscreen.Glyph = "BackToWindow"; } else { WindowState = WindowState.Normal; - SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen; + SymbolIconFullscreen.Glyph = "FullScreen"; } } @@ -232,7 +232,7 @@ namespace Ink_Canvas BtnStartCover.Visibility = Visibility.Collapsed; BorderStopTime.Visibility = Visibility.Collapsed; TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F")); - SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; + SymbolIconStart.Glyph = "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.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause; + SymbolIconStart.Glyph = "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.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; + SymbolIconStart.Glyph = "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.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause; + SymbolIconStart.Glyph = "Pause"; BtnResetCover.Visibility = Visibility.Collapsed; if (totalSeconds <= 10) diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml b/Ink Canvas/Windows/OperatingGuideWindow.xaml index 67c81734..581dfa4e 100644 --- a/Ink Canvas/Windows/OperatingGuideWindow.xaml +++ b/Ink Canvas/Windows/OperatingGuideWindow.xaml @@ -1,4 +1,4 @@ - - + - + diff --git a/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs b/Ink Canvas/Windows/OperatingGuideWindow.xaml.cs index 61c50f51..ca2fab3a 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.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow; + SymbolIconFullscreen.Glyph = "BackToWindow"; } else { WindowState = WindowState.Normal; - SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen; + SymbolIconFullscreen.Glyph = "FullScreen"; } } diff --git a/Ink Canvas/Windows/RandWindow.xaml b/Ink Canvas/Windows/RandWindow.xaml index f1bada9c..7fce00d0 100644 --- a/Ink Canvas/Windows/RandWindow.xaml +++ b/Ink Canvas/Windows/RandWindow.xaml @@ -1,4 +1,4 @@ - - + @@ -113,7 +113,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/Ink Canvas/Windows/RandWindow.xaml.cs b/Ink Canvas/Windows/RandWindow.xaml.cs index f8f568fe..7156351a 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.Symbol = Symbol.People; + SymbolIconStart.Glyph = "People"; BorderBtnAdd.Opacity = 1; BorderBtnMinus.Opacity = 1; } @@ -133,7 +133,7 @@ namespace Ink_Canvas LabelNumberCount.Text = TotalCount.ToString(); if (TotalCount == 1) { - SymbolIconStart.Symbol = Symbol.Contact; + SymbolIconStart.Glyph = "Contact"; } } diff --git a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml index c633ae5c..a7fe8d0e 100644 --- a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml +++ b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml @@ -1,4 +1,4 @@ - - +