From bb56b5ef4f80abead5c2ac9266203e68e4716d29 Mon Sep 17 00:00:00 2001 From: NotYoojun Date: Wed, 27 Dec 2023 17:08:07 +0800 Subject: [PATCH 01/27] Apply UI.WPF.Modern --- Ink Canvas/App.xaml | 18 +++++++++-- Ink Canvas/ChangeLogWindow.xaml | 2 +- Ink Canvas/CountdownTimerWindow.xaml | 2 +- Ink Canvas/CountdownTimerWindow.xaml.cs | 14 ++++----- Ink Canvas/Helpers/StoreHelper.cs | 16 +++++----- Ink Canvas/Ink Canvas.csproj | 6 ++-- Ink Canvas/MainWindow.xaml | 38 +++++++++++------------ Ink Canvas/MainWindow.xaml.cs | 15 ++++----- Ink Canvas/NamesInputWindow.xaml | 2 +- Ink Canvas/RandWindow.xaml | 2 +- Ink Canvas/RandWindow.xaml.cs | 2 +- Ink Canvas/Resources/Styles/Dark.xaml | 2 +- Ink Canvas/Resources/Styles/Light.xaml | 2 +- Ink Canvas/SettingsPage.xaml | 2 +- Ink Canvas/WelcomeWindow.xaml | 2 +- Ink Canvas/YesOrNoNotificationWindow.xaml | 2 +- 16 files changed, 71 insertions(+), 56 deletions(-) diff --git a/Ink Canvas/App.xaml b/Ink Canvas/App.xaml index 270a08c2..6237d2f8 100644 --- a/Ink Canvas/App.xaml +++ b/Ink Canvas/App.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Ink_Canvas" StartupUri="MainWindow.xaml" - xmlns:ui="http://schemas.modernwpf.com/2019"> + xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"> + + + + + + - + + + + + diff --git a/Ink Canvas/ChangeLogWindow.xaml b/Ink Canvas/ChangeLogWindow.xaml index 965d45d7..9b67299f 100644 --- a/Ink Canvas/ChangeLogWindow.xaml +++ b/Ink Canvas/ChangeLogWindow.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Ink_Canvas" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ShowInTaskbar="False" - xmlns:ui="http://schemas.modernwpf.com/2019" FontFamily="Microsoft YaHei UI" Topmost="True" + xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" FontFamily="Microsoft YaHei UI" Topmost="True" mc:Ignorable="d" ui:WindowHelper.UseModernWindowStyle="True" Loaded="Window_Loaded" Closed="Window_Closed" Title="" Height="390" Width="600"> diff --git a/Ink Canvas/CountdownTimerWindow.xaml b/Ink Canvas/CountdownTimerWindow.xaml index 2a4f244e..14f90673 100644 --- a/Ink Canvas/CountdownTimerWindow.xaml +++ b/Ink Canvas/CountdownTimerWindow.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Ink_Canvas" - xmlns:ui="http://schemas.modernwpf.com/2019" + xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:processbars="clr-namespace:Ink_Canvas.ProcessBars" ui:ThemeManager.RequestedTheme="Light" Topmost="True" Background="Transparent" mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True" diff --git a/Ink Canvas/CountdownTimerWindow.xaml.cs b/Ink Canvas/CountdownTimerWindow.xaml.cs index 72ceaa00..485e7818 100644 --- a/Ink Canvas/CountdownTimerWindow.xaml.cs +++ b/Ink Canvas/CountdownTimerWindow.xaml.cs @@ -48,7 +48,7 @@ private void Timer_Elapsed(object sender, ElapsedEventArgs e) TextBlockSecond.Text = "00"; timer.Stop(); isTimerRunning = false; - SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Play; + SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; BtnStartCover.Visibility = Visibility.Visible; TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F")); BorderStopTime.Visibility = Visibility.Collapsed; @@ -199,12 +199,12 @@ private void BtnFullscreen_MouseUp(object sender, MouseButtonEventArgs e) if (WindowState == WindowState.Normal) { WindowState = WindowState.Maximized; - SymbolIconFullscreen.Symbol = ModernWpf.Controls.Symbol.BackToWindow; + SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow; } else { WindowState = WindowState.Normal; - SymbolIconFullscreen.Symbol = ModernWpf.Controls.Symbol.FullScreen; + SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen; } } @@ -230,7 +230,7 @@ private void BtnReset_MouseUp(object sender, MouseButtonEventArgs e) BtnStartCover.Visibility = Visibility.Collapsed; BorderStopTime.Visibility = Visibility.Collapsed; TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F")); - SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Play; + SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; isTimerRunning = false; timer.Stop(); isPaused = false; @@ -280,7 +280,7 @@ private void BtnStart_MouseUp(object sender, MouseButtonEventArgs e) startTime += DateTime.Now - pauseTime; ProcessBarTime.IsPaused = false; TextBlockHour.Foreground = Brushes.Black; - SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Pause; + SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause; isPaused = false; timer.Start(); UpdateStopTime(); @@ -292,7 +292,7 @@ private void BtnStart_MouseUp(object sender, MouseButtonEventArgs e) pauseTime = DateTime.Now; ProcessBarTime.IsPaused = true; TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F")); - SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Play; + SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play; BorderStopTime.Visibility = Visibility.Collapsed; isPaused = true; timer.Stop(); @@ -304,7 +304,7 @@ private void BtnStart_MouseUp(object sender, MouseButtonEventArgs e) totalSeconds = ((hour * 60) + minute) * 60 + second; ProcessBarTime.IsPaused = false; TextBlockHour.Foreground = Brushes.Black; - SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Pause; + SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause; BtnResetCover.Visibility = Visibility.Collapsed; if (totalSeconds <= 10) diff --git a/Ink Canvas/Helpers/StoreHelper.cs b/Ink Canvas/Helpers/StoreHelper.cs index 04065e43..28390c86 100644 --- a/Ink Canvas/Helpers/StoreHelper.cs +++ b/Ink Canvas/Helpers/StoreHelper.cs @@ -8,15 +8,15 @@ public static bool IsStoreApp { try { - object GetCurrentPackage() - { - return Windows.ApplicationModel.Package.Current; - } + //object GetCurrentPackage() + //{ + // return Windows.ApplicationModel.Package.Current; + //} - if (GetCurrentPackage() != null) - { - return true; - } + //if (GetCurrentPackage() != null) + //{ + // return true; + //} return false; } catch diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj index 7f422747..6825c65d 100644 --- a/Ink Canvas/Ink Canvas.csproj +++ b/Ink Canvas/Ink Canvas.csproj @@ -290,6 +290,9 @@ 1.8.1 + + 0.9.25.1 + 15.0.4420.1018 @@ -319,9 +322,6 @@ --> - - 0.9.6 - 13.0.3 diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 95f7ffc9..8bbdab44 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Ink_Canvas" - xmlns:ui="http://schemas.modernwpf.com/2019" + xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:c="clr-namespace:Ink_Canvas.Converter" mc:Ignorable="d" AllowsTransparency="True" @@ -133,7 +133,7 @@ @@ -223,17 +223,17 @@ - + - + - + @@ -245,12 +245,12 @@ - + - + @@ -262,7 +262,7 @@ VerticalAlignment="Center" HorizontalAlignment="Center" FontFamily="Microsoft YaHei UI" FontSize="12"/> - + @@ -272,7 +272,7 @@ - + @@ -910,18 +910,18 @@ - + - + - + @@ -931,17 +931,17 @@ - + - + - + @@ -957,13 +957,13 @@ - + - + @@ -1082,7 +1082,7 @@ - @@ -1196,7 +1196,7 @@ - +