diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 6608f7b1..2dcfefff 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -485,7 +485,7 @@ namespace Ink_Canvas { RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed; LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed; RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed; - //进入黑板 + //進入黑板 /* if (Not_Enter_Blackboard_fir_Mouse_Click) {// BUG-Fixed_tmp：程序启动后直接进入白板会导致后续撤销功能、退出白板无法恢复墨迹 @@ -574,6 +574,15 @@ namespace Ink_Canvas { if (dopsc[2] == '2' && isDisplayingOrHidingBlackboard == false) AnimationsHelper.ShowWithFadeIn(LeftSidePanelForPPTNavigation); if (dopsc[3] == '2' && isDisplayingOrHidingBlackboard == false) AnimationsHelper.ShowWithFadeIn(RightSidePanelForPPTNavigation); } + // 修复PPT放映时点击白板按钮后翻页按钮不显示的问题 + if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) + { + // 强制显示PPT翻页按钮 + LeftBottomPanelForPPTNavigation.Visibility = Visibility.Visible; + RightBottomPanelForPPTNavigation.Visibility = Visibility.Visible; + LeftSidePanelForPPTNavigation.Visibility = Visibility.Visible; + RightSidePanelForPPTNavigation.Visibility = Visibility.Visible; + } if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true); diff --git a/Ink Canvas/Windows/RandWindow.xaml.cs b/Ink Canvas/Windows/RandWindow.xaml.cs index 631af792..9a895869 100644 --- a/Ink Canvas/Windows/RandWindow.xaml.cs +++ b/Ink Canvas/Windows/RandWindow.xaml.cs @@ -214,8 +214,8 @@ namespace Ink_Canvas { if (isIslandCallerFirstClick) { MessageBox.Show( - "首次使用ClassIsland点名功能，请确保已安装ClassIsland和Island caller插件。\n" + - "如未安装，请前往官网下载并安装后再使用。", + "使用ClassIsland点名功能，请确保已安装ClassIsland和Island caller插件。\n" + + "如未安装，请前往官网下载并安装后再使用。如果安装请再次点击此按钮。", "提示", MessageBoxButton.OK, MessageBoxImage.Information); isIslandCallerFirstClick = false; return; diff --git a/Ink Canvas/dist/Hardcodet.NotifyIcon.Wpf.dll b/Ink Canvas/dist/Hardcodet.NotifyIcon.Wpf.dll new file mode 100644 index 00000000..abf8e1db Binary files /dev/null and b/Ink Canvas/dist/Hardcodet.NotifyIcon.Wpf.dll differ diff --git a/Ink Canvas/dist/IACore.dll b/Ink Canvas/dist/IACore.dll new file mode 100644 index 00000000..fdef2ca7 Binary files /dev/null and b/Ink Canvas/dist/IACore.dll differ diff --git a/Ink Canvas/dist/IALoader.dll b/Ink Canvas/dist/IALoader.dll new file mode 100644 index 00000000..3ebd354c Binary files /dev/null and b/Ink Canvas/dist/IALoader.dll differ diff --git a/Ink Canvas/dist/IAWinFX.dll b/Ink Canvas/dist/IAWinFX.dll new file mode 100644 index 00000000..1ce450a8 Binary files /dev/null and b/Ink Canvas/dist/IAWinFX.dll differ diff --git a/Ink Canvas/dist/ICSharpCode.AvalonEdit.dll b/Ink Canvas/dist/ICSharpCode.AvalonEdit.dll new file mode 100644 index 00000000..3c29dd40 Binary files /dev/null and b/Ink Canvas/dist/ICSharpCode.AvalonEdit.dll differ diff --git a/Ink Canvas/dist/InkCanvasForClass.exe b/Ink Canvas/dist/InkCanvasForClass.exe new file mode 100644 index 00000000..21f1d981 Binary files /dev/null and b/Ink Canvas/dist/InkCanvasForClass.exe differ diff --git a/Ink Canvas/dist/InkCanvasForClass.exe.config b/Ink Canvas/dist/InkCanvasForClass.exe.config new file mode 100644 index 00000000..68044a5f --- /dev/null +++ b/Ink Canvas/dist/InkCanvasForClass.exe.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Ink Canvas/dist/MdXaml.Plugins.dll b/Ink Canvas/dist/MdXaml.Plugins.dll new file mode 100644 index 00000000..e274fd74 Binary files /dev/null and b/Ink Canvas/dist/MdXaml.Plugins.dll differ diff --git a/Ink Canvas/dist/MdXaml.dll b/Ink Canvas/dist/MdXaml.dll new file mode 100644 index 00000000..b0e233ad Binary files /dev/null and b/Ink Canvas/dist/MdXaml.dll differ diff --git a/Ink Canvas/dist/Microsoft.Office.Interop.PowerPoint.dll b/Ink Canvas/dist/Microsoft.Office.Interop.PowerPoint.dll new file mode 100644 index 00000000..db7bb90b Binary files /dev/null and b/Ink Canvas/dist/Microsoft.Office.Interop.PowerPoint.dll differ diff --git a/Ink Canvas/dist/NHotkey.Wpf.dll b/Ink Canvas/dist/NHotkey.Wpf.dll new file mode 100644 index 00000000..af4644ed Binary files /dev/null and b/Ink Canvas/dist/NHotkey.Wpf.dll differ diff --git a/Ink Canvas/dist/NHotkey.dll b/Ink Canvas/dist/NHotkey.dll new file mode 100644 index 00000000..cb8a538e Binary files /dev/null and b/Ink Canvas/dist/NHotkey.dll differ diff --git a/Ink Canvas/dist/Newtonsoft.Json.dll b/Ink Canvas/dist/Newtonsoft.Json.dll new file mode 100644 index 00000000..341d08fc Binary files /dev/null and b/Ink Canvas/dist/Newtonsoft.Json.dll differ diff --git a/Ink Canvas/dist/OSVersionExt.dll b/Ink Canvas/dist/OSVersionExt.dll new file mode 100644 index 00000000..542196f4 Binary files /dev/null and b/Ink Canvas/dist/OSVersionExt.dll differ diff --git a/Ink Canvas/dist/Office.dll b/Ink Canvas/dist/Office.dll new file mode 100644 index 00000000..1c829617 Binary files /dev/null and b/Ink Canvas/dist/Office.dll differ diff --git a/Ink Canvas/dist/System.ValueTuple.dll b/Ink Canvas/dist/System.ValueTuple.dll new file mode 100644 index 00000000..4ce28fde Binary files /dev/null and b/Ink Canvas/dist/System.ValueTuple.dll differ diff --git a/Ink Canvas/dist/iNKORE.UI.WPF.Modern.Controls.dll b/Ink Canvas/dist/iNKORE.UI.WPF.Modern.Controls.dll new file mode 100644 index 00000000..af47f777 Binary files /dev/null and b/Ink Canvas/dist/iNKORE.UI.WPF.Modern.Controls.dll differ diff --git a/Ink Canvas/dist/iNKORE.UI.WPF.Modern.dll b/Ink Canvas/dist/iNKORE.UI.WPF.Modern.dll new file mode 100644 index 00000000..343b280d Binary files /dev/null and b/Ink Canvas/dist/iNKORE.UI.WPF.Modern.dll differ diff --git a/Ink Canvas/dist/iNKORE.UI.WPF.dll b/Ink Canvas/dist/iNKORE.UI.WPF.dll new file mode 100644 index 00000000..416092e0 Binary files /dev/null and b/Ink Canvas/dist/iNKORE.UI.WPF.dll differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index f9524d04..0b5fd924 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache index 9d542157..a8dd42e8 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -cfae595a93b6c81be8a910a33f627301d3c3cf05ca24ac0f4e2d65c6094a6d68 +873bc7f43d75c362dfce6f35fc846d3cca2ed3663fa31937587b7276c474772f diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache index b69e6a9a..c6334c11 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache @@ -13,7 +13,7 @@ E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml 13173459795 56-1167124909 -461490143614 +46-47806484 MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml; False