CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:PPT模块

Browse Source
This commit is contained in:
unknown
2025-07-20 21:14:59 +08:00
parent 476503338f
commit 15198c32ea
7 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/AssemblyInfo.cs
+2 -2
View File
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.1.5")]
[assembly: AssemblyFileVersion("1.7.1.5")]
[assembly: AssemblyVersion("1.7.1.6")]
[assembly: AssemblyFileVersion("1.7.1.6")]
Ink Canvas/MainWindow.xaml
+10
View File
@@ -1190,6 +1190,16 @@
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchSupportWPS_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/WPS.png" Margin="0,0,6,0" Width="28"
Height="28" VerticalAlignment="Center" />
<TextBlock Foreground="#fafafa" Text="WPP进程查杀（防止WPP残留进程）" VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchEnableWppProcessKill"
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchEnableWppProcessKill_Toggled" />
</ui:SimpleStackPanel>
<TextBlock Text="# 关闭后将不会自动查杀WPP残留进程，可能导致WPP关闭卡顿或无法彻底退出。" TextWrapping="Wrap" Foreground="#a1a1aa" />
<Border BorderBrush="#ef4444"
BorderThickness="2" Padding="8" CornerRadius="6" Background="#991b1b">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="4">
Ink Canvas/MainWindow_cs/MW_PPT.cs
+7
View File
@@ -1315,6 +1315,13 @@ namespace Ink_Canvas {
return;
}
if (!Settings.PowerPointSettings.EnableWppProcessKill)
{
LogHelper.WriteLogToFile("WPP进程查杀功能已被关闭，跳过查杀", LogHelper.LogType.Trace);
StopWppProcessCheckTimer();
return;
}
// 刷新进程状态
wppProcess.Refresh();
wppProcessCheckCount++;
Ink Canvas/MainWindow_cs/MW_Settings.cs
+6
View File
@@ -2159,5 +2159,11 @@ namespace Ink_Canvas {
dialog.Owner = this;
dialog.ShowDialog();
}
private void ToggleSwitchEnableWppProcessKill_Toggled(object sender, RoutedEventArgs e) {
if (!isLoaded) return;
Settings.PowerPointSettings.EnableWppProcessKill = ToggleSwitchEnableWppProcessKill.IsOn;
SaveSettingsToFile();
}
}
}
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+1 -1
View File
@@ -375,6 +375,7 @@ namespace Ink_Canvas {
ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn =
Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint;
ToggleSwitchEnableWppProcessKill.IsOn = Settings.PowerPointSettings.EnableWppProcessKill;
} else {
Settings.PowerPointSettings = new PowerPointSettings();
}
@@ -548,7 +549,6 @@ namespace Ink_Canvas {
// 初始化直线端点吸附相关设置
ToggleSwitchLineEndpointSnapping.IsOn = Settings.Canvas.LineEndpointSnapping;
LineEndpointSnappingThresholdSlider.Value = Settings.Canvas.LineEndpointSnappingThreshold;
} else {
Settings.Canvas = new Canvas();
}
Ink Canvas/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.1.5")]
[assembly: AssemblyFileVersion("1.7.1.5")]
[assembly: AssemblyVersion("1.7.1.6")]
[assembly: AssemblyFileVersion("1.7.1.6")]
Ink Canvas/Resources/Settings.cs
+2
View File
@@ -235,6 +235,8 @@ namespace Ink_Canvas
public bool IsEnableFingerGestureSlideShowControl { get; set; } = true;
[JsonProperty("isSupportWPS")]
public bool IsSupportWPS { get; set; } = true;
[JsonProperty("enableWppProcessKill")]
public bool EnableWppProcessKill { get; set; } = true;
}
public class Automation