diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..d122a445 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,15 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "features": { + "ghcr.io/devcontainers-extra/features/cosign:1": {}, + "ghcr.io/devcontainers/features/dotnet:2": {} + }, + "postCreateCommand": "dotnet restore", + "customizations": { + "vscode": { + "extensions": [ + "ms-dotnettools.csharp" + ] + } + } +} diff --git a/Ink Canvas/App.xaml b/Ink Canvas/App.xaml index aba31b16..77e1eeee 100644 --- a/Ink Canvas/App.xaml +++ b/Ink Canvas/App.xaml @@ -4,6 +4,7 @@ xmlns:local="clr-namespace:Ink_Canvas" xmlns:tb="http://www.hardcodet.net/taskbar" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" > @@ -13,9 +14,9 @@ - + - + @@ -34,9 +35,9 @@ - + - + @@ -54,9 +55,9 @@ - + - + @@ -64,8 +65,8 @@ - - + + @@ -87,9 +88,9 @@ - + - + @@ -97,8 +98,8 @@ - - + + @@ -132,9 +133,9 @@ - + - + @@ -142,8 +143,8 @@ - - + + @@ -163,9 +164,9 @@ - + - + @@ -173,8 +174,8 @@ - - + + @@ -195,9 +196,9 @@ - + - + @@ -205,8 +206,8 @@ - - + + diff --git a/Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs b/Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs index 54eb84bd..479387db 100644 --- a/Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs +++ b/Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs @@ -1,4 +1,4 @@ -using iNKORE.UI.WPF.Modern.Controls; +using iNKORE.UI.WPF.Controls; using System; using System.Windows; using System.Windows.Controls; diff --git a/Ink Canvas/Helpers/SecurityManager.cs b/Ink Canvas/Helpers/SecurityManager.cs index c24bf4ca..db501d7b 100644 --- a/Ink Canvas/Helpers/SecurityManager.cs +++ b/Ink Canvas/Helpers/SecurityManager.cs @@ -1,3 +1,4 @@ +using iNKORE.UI.WPF.Controls; using iNKORE.UI.WPF.Modern.Controls; using System; using System.Security.Cryptography; diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index 814181a8..cb704148 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -150,7 +150,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + + @@ -159,6 +160,7 @@ + @@ -168,7 +170,7 @@ - + {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} 1 @@ -197,6 +199,18 @@ True + + + libs\Interop.IWshRuntimeLibrary.dll + False + True + + + libs\Interop.stdole.dll + False + True + + @@ -685,4 +699,4 @@ - \ No newline at end of file + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 00f9b802..9f830a51 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -4,6 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" xmlns:c="clr-namespace:Ink_Canvas.Converter" xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation" xmlns:controls="clr-namespace:Ink_Canvas.Controls" @@ -477,7 +478,7 @@ - + - + @@ -536,19 +537,19 @@ - + - - + - - - + + + - + - + - - + + @@ -656,12 +657,12 @@ - + @@ -4632,12 +4633,12 @@ - + - + @@ -4704,67 +4705,67 @@ Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}"> - + - + - + - + - + - - + + - + - + - - + + - + - + - - + + @@ -4786,25 +4787,25 @@ VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-2,-2" Width="8" /> - + - + - + - + - + @@ -4816,16 +4817,16 @@ Visibility="Collapsed" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}"> - + - + - + - - + - - - + - + - - + + @@ -4893,25 +4894,25 @@ VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-3,-4" FontSize="11" /> - + - + - + - + - + @@ -5001,7 +5002,7 @@ - + @@ -5028,7 +5029,7 @@ Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}" /> - + @@ -5040,9 +5041,9 @@ VerticalAlignment="Bottom"> - + - + - @@ -5134,7 +5135,7 @@ - + @@ -5166,7 +5167,7 @@ x:Name="BtnLeftWhiteBoardSwitchNextLabel" /> - + - + @@ -5207,9 +5208,9 @@ - + - + - + @@ -5262,8 +5263,8 @@ - - + @@ -5293,8 +5294,8 @@ - - + - - + - - + - - + + - + @@ -5415,11 +5416,11 @@ HorizontalAlignment="Center" FontSize="12" /> - + - + - + - - - - - + - - - + + - - - + - - - + + - - + + - - + + - - + - + + @@ -5692,14 +5693,14 @@ VerticalAlignment="Bottom" Margin="10,0,0,4.5" FontSize="15" /> - + - + - + - + - - - + - + - + - + - - - + - + - + - + @@ -6391,7 +6392,7 @@ CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb" BorderThickness="1"> - + @@ -6408,7 +6409,7 @@ MouseUp="CloseBordertools_MouseUp" /> - @@ -6432,13 +6433,13 @@ FontFamily="Microsoft YaHei UI" /> - + - - - - + - - - + + - - - + - - - + + - + - + @@ -6615,7 +6616,7 @@ Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="5" Margin="-147,-286,-89,55"> - + @@ -6627,8 +6628,8 @@ MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Right" /> - - + - - - + + - - + @@ -6678,8 +6679,8 @@ Source="{DynamicResource DrawShapeImageSource.Coordinate4}" /> - - + - - + - - + @@ -6752,8 +6753,8 @@ - - + + @@ -6790,14 +6791,14 @@ - + - + @@ -6811,7 +6812,7 @@ - + @@ -6826,7 +6827,7 @@ - + - + @@ -6856,10 +6857,10 @@ - + - - + + @@ -6900,11 +6901,11 @@ HorizontalAlignment="Center" FontSize="12" Style="{StaticResource AutoFitFloatBarLabel12}" /> - + - + - + - - + - - + + - + - + - + - + - + - + - + - - + + - + @@ -684,14 +685,14 @@ - + - + - + - - + + - + diff --git a/Ink Canvas/Windows/CountdownTimerWindow.xaml b/Ink Canvas/Windows/CountdownTimerWindow.xaml index 63008641..0ab8ad45 100644 --- a/Ink Canvas/Windows/CountdownTimerWindow.xaml +++ b/Ink Canvas/Windows/CountdownTimerWindow.xaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" xmlns:processbars="clr-namespace:Ink_Canvas.ProcessBars" ui:ThemeManager.RequestedTheme="Light" Topmost="True" Background="Transparent" mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True" @@ -18,7 +19,7 @@ - - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + @@ -204,11 +205,11 @@ - + - + @@ -239,7 +240,7 @@ - + diff --git a/Ink Canvas/Windows/HasNewUpdateWindow.xaml b/Ink Canvas/Windows/HasNewUpdateWindow.xaml index bc7620b0..b09c3939 100644 --- a/Ink Canvas/Windows/HasNewUpdateWindow.xaml +++ b/Ink Canvas/Windows/HasNewUpdateWindow.xaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml" mc:Ignorable="d" ui:WindowHelper.UseModernWindowStyle="False" @@ -163,26 +164,26 @@ - + - + - + - + - - + + - + diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/UpdateCenterPanel.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsViews/UpdateCenterPanel.xaml.cs index 8d7828ef..382f5c05 100644 --- a/Ink Canvas/Windows/SettingsViews/SettingsViews/UpdateCenterPanel.xaml.cs +++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/UpdateCenterPanel.xaml.cs @@ -626,7 +626,7 @@ private async void RollbackButton_Click(object sender, RoutedEventArgs e) SecondaryButtonText = "取消" }; - var panel = new iNKORE.UI.WPF.Modern.Controls.SimpleStackPanel + var panel = new iNKORE.UI.WPF.Controls.SimpleStackPanel { Spacing = 16, Margin = new Thickness(0, 10, 0, 0) diff --git a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml index c633ae5c..1ba05f66 100644 --- a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml +++ b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml @@ -3,7 +3,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 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.inkore.net/lib/ui/wpf/modern" + xmlns:local="clr-namespace:Ink_Canvas" + xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" + xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True" ResizeMode="NoResize" Closed="Window_Closed" ui:ThemeManager.RequestedTheme="Light" Title="演示文档设置 - Ink Canvas For Class CE" Height="160" Width="450" FontFamily="Microsoft YaHei UI"> @@ -17,7 +19,7 @@ - +