Block WPS

This commit is contained in:
XY Wang 2021-09-22 12:38:09 +08:00
parent bd2c7c053e
commit b9f0fe9ec9
2 changed files with 19 additions and 11 deletions

View File

@ -46,10 +46,10 @@
Width="400" HorizontalAlignment="Center" Width="400" HorizontalAlignment="Center"
Margin="100" Visibility="Visible"> Margin="100" Visibility="Visible">
<Grid> <Grid>
<ScrollViewer VerticalScrollBarVisibility="Auto" <ScrollViewer Margin="0,60,0,0" VerticalScrollBarVisibility="Auto"
PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light" PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light"
ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback"> ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback">
<StackPanel Margin="20,70,20,20"> <StackPanel Margin="20,20,20,20">
<TextBlock FontSize="14" Margin="0,0,0,0" <TextBlock FontSize="14" Margin="0,0,0,0"
Text="*设置将自动保存,再次点击“设置”按钮将关闭此页面。"/> Text="*设置将自动保存,再次点击“设置”按钮将关闭此页面。"/>
<TextBlock FontSize="14" Margin="0,0,0,12" <TextBlock FontSize="14" Margin="0,0,0,12"
@ -102,7 +102,8 @@
</TextBlock> </TextBlock>
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
</GroupBox> </GroupBox>
<GroupBox Name="GroupBoxMASEZVersion" Visibility="Collapsed" <GroupBox Name="GroupBoxMASEZVersion"
Visibility="Collapsed"
Header="马鞍山二中专版说明"> Header="马鞍山二中专版说明">
<ui:SimpleStackPanel Spacing="12"> <ui:SimpleStackPanel Spacing="12">
<TextBlock Name="TextBlockMASEZNotice" FontSize="14" Margin="0,0,0,0"/> <TextBlock Name="TextBlockMASEZNotice" FontSize="14" Margin="0,0,0,0"/>
@ -116,8 +117,8 @@
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<Grid Background="White" Margin="10,0,10,0" Height="65" VerticalAlignment="Top"> <Grid Background="White" Margin="10,0,10,0" Height="60" VerticalAlignment="Top">
<Grid Margin="10,20,10,0"> <Grid Margin="10,20,10,-10">
<TextBlock Text="设置" FontSize="26" Margin="0,0,0,12"/> <TextBlock Text="设置" FontSize="26" Margin="0,0,0,12"/>
<!--<Viewbox Margin="0,-55,0,0" Height="60" HorizontalAlignment="Right"> <!--<Viewbox Margin="0,-55,0,0" Height="60" HorizontalAlignment="Right">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -125,7 +126,8 @@
<Image Source="text.png" Width="200"/> <Image Source="text.png" Width="200"/>
</StackPanel> </StackPanel>
</Viewbox>--> </Viewbox>-->
<Viewbox Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Margin="0,-58,0,0" Height="45" HorizontalAlignment="Right"> <Viewbox Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}"
Margin="0,-15,0,0" Height="45" HorizontalAlignment="Right">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Image Source="textCN.png" Width="200"/> <Image Source="textCN.png" Width="200"/>
<TextBlock Text="专版" FontSize="32" Foreground="#C30F2C" VerticalAlignment="Center"/> <TextBlock Text="专版" FontSize="32" Foreground="#C30F2C" VerticalAlignment="Center"/>

View File

@ -675,15 +675,21 @@ namespace Ink_Canvas
{ {
try try
{ {
Process[] processes = Process.GetProcessesByName("wpp");
if (processes.Length > 0)
{
return;
}
//processes = Process.GetProcessesByName("wps");
//if (processes.Length > 0)
//{
// return;
//}
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application"); pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
if (pptApplication != null) if (pptApplication != null)
{ {
if (pptApplication.Name.Contains("WPS Office"))
{
pptApplication = null;
return;
}
timerCheckPPT.Stop(); timerCheckPPT.Stop();
//获得演示文稿对象 //获得演示文稿对象
presentation = pptApplication.ActivePresentation; presentation = pptApplication.ActivePresentation;